IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudwatch): fixed limiting of cloudwatch period so it works for long time ranges in all cases, fixes #3086

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-29 16:46:58 +01:00
parent 13760b1bdd
commit 34e3683ded
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
* **Elasticsearch**: Support for dynamic daily indices for annotations, closes [#3061](https://github.com/grafana/grafana/issues/3061)
### Bug Fixes
* **cloudwatch**: fix for handling of period for long time ranges, fixes [#3086](https://github.com/grafana/grafana/issues/3086)
* **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
* **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067)

6
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@ -36,12 +36,12 @@ function (angular, _) {
query.metricName = templateSrv.replace(target.metricName, options.scopedVars);
query.dimensions = convertDimensionFormat(target.dimensions, options.scopedVars);
query.statistics = target.statistics;
query.period = parseInt(target.period, 10);
var range = end - start;
// CloudWatch limit datapoints up to 1440
query.period = parseInt(target.period, 10) || 60;
if (range / query.period >= 1440) {
query.period = Math.floor(range / 1440 / 60) * 60;
query.period = Math.ceil(range / 1440 / 60) * 60;
}
queries.push(query);

3
public/app/plugins/datasource/cloudwatch/partials/query.editor.html
View File

@ -80,9 +80,10 @@
</li>
<li class="tight-form-item query-keyword">
Period
<tip>Interval between points in seconds</tip>
</li>
<li>
<input type="text" class="input-mini tight-form-input" ng-model="target.period" spellcheck='false' placeholder="period" ng-model-onblur ng-change="refreshMetricData()" />
<input type="text" class="input-mini tight-form-input" ng-model="target.period" spellcheck='false' placeholder="auto" ng-model-onblur ng-change="refreshMetricData()" />
</li>
</ul>

2
public/app/plugins/datasource/cloudwatch/query_ctrl.js
View File

@ -15,7 +15,7 @@ function (angular, _) {
target.metricName = target.metricName || '';
target.statistics = target.statistics || ['Average'];
target.dimensions = target.dimensions || {};
target.period = target.period || 60;
target.period = target.period || '';
target.region = target.region || $scope.datasource.getDefaultRegion();
$scope.aliasSyntax = '{{metric}} {{stat}} {{namespace}} {{region}} {{<dimension name>}}';