Commit 25d7b8d0 by Torkel Ödegaard

feat(cloudwatch): resumed work on cloudwath datasource, #684, #2445

parent f467cb8c
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'kbn', 'app/core/utils/datemath',
'moment', 'moment',
'./queryCtrl', './queryCtrl',
'./directives', './directives',
'aws-sdk', 'aws-sdk',
], ],
function (angular, _, kbn) { function (angular, _, dateMath) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
...@@ -543,7 +543,7 @@ function (angular, _, kbn) { ...@@ -543,7 +543,7 @@ function (angular, _, kbn) {
} }
function convertToCloudWatchTime(date) { function convertToCloudWatchTime(date) {
return Math.round(kbn.parseDate(date).getTime() / 1000); return date.valueOf() / 1000;
} }
function convertDimensionFormat(dimensions) { function convertDimensionFormat(dimensions) {
......
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
Metric Metric
</li> </li>
<li> <li>
<metric-segment segment="regionSegment" get-alt-segments="getRegions()" on-value-changed="regionChanged()"></metric-segment> <metric-segment segment="regionSegment" get-options="getRegions()" on-change="regionChanged()"></metric-segment>
</li> </li>
<li> <li>
<metric-segment segment="namespaceSegment" get-alt-segments="getNamespaces()" on-value-changed="namespaceChanged()"></metric-segment> <metric-segment segment="namespaceSegment" get-options="getNamespaces()" on-change="namespaceChanged()"></metric-segment>
</li> </li>
<li> <li>
<metric-segment segment="metricSegment" get-alt-segments="getMetrics()" on-value-changed="metricChanged()"></metric-segment> <metric-segment segment="metricSegment" get-options="getMetrics()" on-change="metricChanged()"></metric-segment>
</li> </li>
</ul> </ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment