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

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-09-23 21:13:19 +02:00
parent f467cb8cd2
commit 25d7b8d08d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
define([
'angular',
'lodash',
'kbn',
'app/core/utils/datemath',
'moment',
'./queryCtrl',
'./directives',
'aws-sdk',
],
function (angular, _, kbn) {
function (angular, _, dateMath) {
'use strict';
var module = angular.module('grafana.services');
@ -543,7 +543,7 @@ function (angular, _, kbn) {
}
function convertToCloudWatchTime(date) {
return Math.round(kbn.parseDate(date).getTime() / 1000);
return date.valueOf() / 1000;
}
function convertDimensionFormat(dimensions) {

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

@ -37,13 +37,13 @@
Metric
</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>
<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>
<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>
</ul>

0
public/app/plugins/datasource/cloudwatch/_plugin.json → public/app/plugins/datasource/cloudwatch/plugin.json
View File