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

Merge branch 'v4.4.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-07-31 22:33:36 +02:00
commit 73a1a262ef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/grafana_app.ts
View File

@ -192,7 +192,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
// hide search
if (body.find('.search-container').length > 0) {
if (target.parents('.search-container').length === 0) {
if (target.parents('.search-results-container').length === 0) {
scope.$apply(function() {
scope.appEvent('hide-dash-search');
});

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

@ -219,12 +219,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?([^,]+?)\)/);