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
0fcc8701
Commit
0fcc8701
authored
Jul 31, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: cloudwatch fix for templating namespace argument to metrics tempalting function, fixes #8965
parent
34cda659
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
public/app/plugins/datasource/cloudwatch/datasource.js
+2
-2
No files found.
public/app/plugins/datasource/cloudwatch/datasource.js
View file @
0fcc8701
...
...
@@ -210,12 +210,12 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
var
metricNameQuery
=
query
.
match
(
/^metrics
\(([^\)]
+
?)(
,
\s?([^
,
]
+
?))?\)
/
);
if
(
metricNameQuery
)
{
return
this
.
getMetrics
(
metricNameQuery
[
1
],
metricNameQuery
[
3
]
);
return
this
.
getMetrics
(
templateSrv
.
replace
(
metricNameQuery
[
1
]),
templateSrv
.
replace
(
metricNameQuery
[
3
])
);
}
var
dimensionKeysQuery
=
query
.
match
(
/^dimension_keys
\(([^\)]
+
?)(
,
\s?([^
,
]
+
?))?\)
/
);
if
(
dimensionKeysQuery
)
{
return
this
.
getDimensionKeys
(
dimensionKeysQuery
[
1
],
dimensionKeysQuery
[
3
]
);
return
this
.
getDimensionKeys
(
templateSrv
.
replace
(
dimensionKeysQuery
[
1
]),
templateSrv
.
replace
(
dimensionKeysQuery
[
3
])
);
}
var
dimensionValuesQuery
=
query
.
match
(
/^dimension_values
\(([^
,
]
+
?)
,
\s?([^
,
]
+
?)
,
\s?([^
,
]
+
?)
,
\s?([^
,
]
+
?)\)
/
);
...
...
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