Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
25d7b8d0
Commit
25d7b8d0
authored
Sep 23, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(cloudwatch): resumed work on cloudwath datasource, #684, #2445
parent
f467cb8c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
public/app/plugins/datasource/cloudwatch/datasource.js
+3
-3
public/app/plugins/datasource/cloudwatch/partials/query.editor.html
+3
-3
public/app/plugins/datasource/cloudwatch/plugin.json
+0
-0
No files found.
public/app/plugins/datasource/cloudwatch/datasource.js
View file @
25d7b8d0
...
...
@@ -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
)
{
...
...
public/app/plugins/datasource/cloudwatch/partials/query.editor.html
View file @
25d7b8d0
...
...
@@ -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>
...
...
public/app/plugins/datasource/cloudwatch/
_
plugin.json
→
public/app/plugins/datasource/cloudwatch/plugin.json
View file @
25d7b8d0
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment