Repository: ambari Updated Branches: refs/heads/trunk a55af8122 -> 85ef37064
AMBARI-20896 - Provide ability to visualize per cluster data from Grafana dashboards (rzang) Change-Id: I6db64f2dea36c2284073689bfa97046366aeb153 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85ef3706 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85ef3706 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85ef3706 Branch: refs/heads/trunk Commit: 85ef37064ec53a2eb117a3f603e39c2a56ccc17c Parents: a55af81 Author: Richard Zang <rz...@apache.org> Authored: Fri Apr 28 16:35:49 2017 -0700 Committer: Richard Zang <rz...@apache.org> Committed: Fri Apr 28 16:36:18 2017 -0700 ---------------------------------------------------------------------- .../ambari-metrics/datasource.js | 162 ++++++++----------- .../ambari-metrics/partials/query.editor.html | 14 +- .../ambari-metrics/queryCtrl.js | 9 +- .../HDP/grafana-hbase-misc.json | 18 ++- .../HDP/grafana-hbase-regionservers.json | 17 +- .../HDP/grafana-hdfs-datanodes.json | 18 ++- .../HDP/grafana-hdfs-home.json | 18 ++- .../HDP/grafana-hdfs-namenodes.json | 18 ++- .../HDP/grafana-hdfs-topn.json | 18 ++- .../HDP/grafana-hive-hivemetastore.json | 18 ++- .../HDP/grafana-hive-hiverserver2.json | 18 ++- .../HDP/grafana-kafka-hosts.json | 18 ++- .../HDP/grafana-llapdaemon-daemons.json | 17 +- .../HDP/grafana-llapdaemon-heatmaps.json | 17 +- .../HDP/grafana-solr-cores-dashboard.json | 18 ++- .../HDP/grafana-solr-hosts-dashboard.json | 18 ++- .../HDP/grafana-yarn-nodemanagers.json | 18 ++- .../HDP/grafana-yarn-resourcemanagers.json | 18 ++- .../default/grafana-ambari-server-database.json | 19 ++- .../default/grafana-ambari-server-topn.json | 18 ++- .../default/grafana-ambari-server.json | 18 ++- .../default/grafana-ams-hbase-misc.json | 18 ++- .../grafana-ams-hbase-regionservers.json | 17 +- .../default/grafana-system-servers.json | 18 ++- 24 files changed, 441 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js index 97de6e7..72e64e2 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js @@ -84,7 +84,6 @@ define([ * AMS Datasource Query */ AmbariMetricsDatasource.prototype.query = function (options) { - var emptyData = function (metric) { var legend = metric.alias ? metric.alias : metric.metric; return { @@ -221,12 +220,16 @@ define([ var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform + - metricAggregator + "&hostname=" + target.hosts + '&appId=' + target.app + '&startTime=' + from + - '&endTime=' + to + precision + seriesAggregator }).then( - getMetricsData(target) + metricAggregator + "&hostname=" + target.hosts + '&appId=' + target.app + '&instanceId=' + target.cluster + '&startTime=' + from + + '&endTime=' + to + precision + seriesAggregator }).then( + getMetricsData(target) ); }; //Check if it's a templated dashboard. + var templatedClusters = templateSrv.variables.filter(function(o) { return o.name === "cluster"}); + var templatedCluster = (_.isEmpty(templatedClusters)) ? '' : templatedClusters[0].options.filter(function(cluster) + { return cluster.selected; }).map(function(clusterName) { return clusterName.value; }); + var templatedHosts = templateSrv.variables.filter(function(o) { return o.name === "hosts"}); var templatedHost = (_.isEmpty(templatedHosts)) ? '' : templatedHosts[0].options.filter(function(host) { return host.selected; }).map(function(hostName) { return hostName.value; }); @@ -236,14 +239,15 @@ define([ var tComponent = _.isEmpty(tComponents) ? '' : tComponents[0].current.value; var getServiceAppIdData = function(target) { + var tCluster = (_.isEmpty(templateSrv.variables))? templatedCluster : ''; var tHost = (_.isEmpty(templateSrv.variables)) ? templatedHost : target.templatedHost; - var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '&precision=' + var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '&precision=' + target.precision; var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform - + metricAggregator + '&hostname=' + tHost + '&appId=' + target.app + '&startTime=' + from + + + metricAggregator + '&hostname=' + tHost + '&appId=' + target.app + '&instanceId=' + tCluster + '&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( getMetricsData(target) ); @@ -265,8 +269,8 @@ define([ var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; var templatedComponent = (_.isEmpty(tComponent)) ? target.app : tComponent; return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform - + metricAggregator + '&hostname=' + target.templatedHost + '&appId=' + templatedComponent + '&startTime=' + from + - '&endTime=' + to + precision + topN + seriesAggregator }).then( + + metricAggregator + '&hostname=' + target.templatedHost + '&appId=' + templatedComponent + '&instanceId=' + target.templatedCluster + + '&startTime=' + from + '&endTime=' + to + precision + topN + seriesAggregator }).then( allHostMetricsData(target) ); }; @@ -277,7 +281,7 @@ define([ var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.queue + metricTransform - + metricAggregator + '&appId=resourcemanager&startTime=' + from + + + metricAggregator + '&appId=resourcemanager&startTime=' + + '&instanceId=' + target.templatedCluster + from + '&endTime=' + to + precision + seriesAggregator }).then( getMetricsData(target) ); @@ -286,7 +290,7 @@ define([ var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '&precision=' + target.precision; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; - return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.hbMetric + '&appId=hbase&startTime=' + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.hbMetric + + '&instanceId=' + target.templatedCluster + '&appId=hbase&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( allHostMetricsData(target) ); @@ -298,7 +302,7 @@ define([ var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; - return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.kbMetric + metricTransform + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.kbMetric + metricTransform + + '&instanceId=' + target.templatedCluster + metricAggregator + '&appId=kafka_broker&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( getMetricsData(target) @@ -310,7 +314,7 @@ define([ var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; - return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.nnMetric + metricTransform + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.nnMetric + metricTransform + '&instanceId=' + target.templatedCluster + metricAggregator + '&appId=namenode&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( allHostMetricsData(target) ); @@ -323,7 +327,7 @@ define([ var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; - return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sTopoMetric + metricTransform + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sTopoMetric + metricTransform + '&instanceId=' + target.templatedCluster + metricAggregator + '&appId=nimbus&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( allHostMetricsData(target) ); @@ -336,7 +340,7 @@ define([ var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator; - return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sDataSourceMetric + metricTransform + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sDataSourceMetric + metricTransform + '&instanceId=' + target.templatedCluster + metricAggregator + '&appId=druid&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then( allHostMetricsData(target) ); @@ -471,7 +475,6 @@ define([ target.sTopology = selectedTopology; target.sComponent = selectedComponent; target.sTopoMetric = target.metric.replace('*', target.sTopology).replace('*', target.sComponent); - debugger; return getStormData(target); })); } @@ -507,14 +510,14 @@ define([ })); }); } - // To speed up querying on templatized dashboards. - if (templateSrv.variables[1] && templateSrv.variables[1].name === "hosts") { + if (templateSrv.variables[2] && templateSrv.variables[2].name === "hosts") { var allHosts = templateSrv._values.hosts.lastIndexOf('}') > 0 ? templateSrv._values.hosts.slice(1,-1) : templateSrv._values.hosts; allHosts = templateSrv._texts.hosts === "All" ? '%' : allHosts; metricsPromises.push(_.map(options.targets, function(target) { - target.templatedHost = allHosts; + target.templatedHost = allHosts? allHosts : ''; + target.templatedCluster = templatedCluster; return getAllHostData(target); })); } @@ -558,14 +561,19 @@ define([ AmbariMetricsDatasource.prototype.metricFindQuery = function (query) { var interpolated; try { - interpolated = templateSrv.replace(query); + interpolated = query.split('.')[0]; } catch (err) { return $q.reject(err); } + var templatedClusters = templateSrv.variables.filter(function(o) { return o.name === "cluster"}); + var templatedCluster = (_.isEmpty(templatedClusters)) ? '' : templatedClusters[0].options.filter(function(cluster) + { return cluster.selected; }).map(function(clusterName) { return clusterName.value; }); + var tComponents = _.isEmpty(templateSrv.variables) ? '' : templateSrv.variables.filter(function(variable) { return variable.name === "components"}); var tComponent = _.isEmpty(tComponents) ? '' : tComponents[0].current.value; + // Templated Variable for HBase Users // It will search the cluster and populate the HBase Users. if(interpolated === "hbase-users") { @@ -837,58 +845,11 @@ define([ }); } - // Templated Variable that will populate all hosts on the cluster. - // The variable needs to be set to "hosts". - if (!tComponent){ - return this.doAmbariRequest({ - method: 'GET', - url: '/ws/v1/timeline/metrics/' + interpolated - }) - .then(function (results) { - //Remove fakehostname from the list of hosts on the cluster. - var fake = "fakehostname"; delete results.data[fake]; - return _.map(_.keys(results.data), function (hostName) { - return { - text: hostName, - expandable: hostName.expandable ? true : false - }; - }); - }); - } else { - // Create a dropdown in templated dashboards for single components. - // This will check for the component set and show hosts only for the - // selected component. - return this.doAmbariRequest({ - method: 'GET', - url: '/ws/v1/timeline/metrics/hosts' - }) - .then(function(results) { - var compToHostMap = {}; - //Remove fakehostname from the list of hosts on the cluster. - var fake = "fakehostname"; - delete results.data[fake]; - //Query hosts based on component name - _.forEach(results.data, function(comp, hostName) { - comp.forEach(function(component) { - if (!compToHostMap[component]) { - compToHostMap[component] = []; - } - compToHostMap[component].push(hostName); - }); - }); - var compHosts = compToHostMap[tComponent]; - compHosts = _.map(compHosts, function(host) { - return { - text: host, - expandable: host.expandable ? true : false - }; - }); - compHosts = _.sortBy(compHosts, function(i) { - return i.text.toLowerCase(); - }); - return $q.when(compHosts); - }); - } + if (interpolated == 'hosts') { + return this.suggestHosts(tComponent, templatedCluster); + } else if (interpolated == 'cluster') { + return this.suggestClusters(tComponent) + } }; /** @@ -941,34 +902,47 @@ define([ return $q.when(keys); }; + AmbariMetricsDatasource.prototype.suggestClusters = function(app) { + if (!app) { app = ''; } + return this.doAmbariRequest({ + method: 'GET', + url: '/ws/v1/timeline/metrics/instances?' + 'appId=' + app + }).then(function(response) { + var clusters = []; + var data = response.data; + for (var cluster in data) { + if (data[cluster].hasOwnProperty(app)) { + clusters.push({text: cluster}); + } + } + return $q.when(clusters); + }); + }; + /** * AMS Datasource - Suggest Hosts. * * Query Hosts on the cluster. */ - AmbariMetricsDatasource.prototype.suggestHosts = function (query, app) { - console.log(query); - return this.doAmbariRequest({method: 'GET', url: '/ws/v1/timeline/metrics/hosts'}) - .then(function (results) { - var compToHostMap = {}; - //Remove fakehostname from the list of hosts on the cluster. - var fake = "fakehostname"; delete results.data[fake]; - //Query hosts based on component name - _.forEach(results.data, function (comp, hostName) { - comp.forEach(function (component) { - if (!compToHostMap[component]){ - compToHostMap[component] = []; - } - compToHostMap[component].push(hostName); - }); - }); - var compHosts = compToHostMap[app]; - compHosts = _.map(compHosts, function (h) { - return {text: h}; - }); - compHosts = _.sortBy(compHosts, function (i) { return i.text.toLowerCase(); }); - return $q.when(compHosts); - }); + AmbariMetricsDatasource.prototype.suggestHosts = function (app, cluster) { + if (!app) { app = ''; } + if (!cluster) { cluster = ''; } + return this.doAmbariRequest({ + method: 'GET', + url: '/ws/v1/timeline/metrics/instances?' + 'appId=' + app + '&instanceId=' + cluster + }).then(function (response) { + var hosts = []; + var data = response.data; + for (var cluster in data) { + var appHosts = data[cluster][app]; + if (appHosts) { + for (var index in appHosts) { + hosts.push({text: appHosts[index]}); + } + } + } + return $q.when(hosts); + }); }; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html index 3f322c1..7e78cc0 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html @@ -81,6 +81,18 @@ </a> </li> + <li class="tight-form-item" style="width: 86px" ng-hide="dashboard.templating.list.length > 0"> + Cluster + </li> + <li ng-hide="dashboard.templating.list.length > 0"> + <input type="text" class="input-large tight-form-input" ng-model="target.cluster" + spellcheck='false' bs-typeahead="suggestClusters" placeholder="cluster name" data-min-length=0 data-items=100 + ng-blur="targetBlur()"> + </input> + <a bs-tooltip="target.errors.metric" style="color: rgb(229, 189, 28)" ng-show="target.errors.metric"> + <i class="fa fa-warning"></i> + </a> + </li> <li class="tight-form-item" style="width: 86px" ng-hide="dashboard.templating.list.length > 0"> Hosts @@ -95,8 +107,6 @@ </a> </li> - - <li class="tight-form-item"> Aggregator </li> http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js index a26e7d0..02b5813 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js @@ -55,6 +55,7 @@ define([ if (newValue === '') { $scope.target.metric = ''; $scope.target.hosts = ''; + $scope.target.cluster = ''; } }); if (!$scope.target.downsampleAggregator) { @@ -86,8 +87,14 @@ define([ .then(callback); }; + $scope.suggestClusters = function(query, callback) { + $scope.datasource.suggestClusters($scope.target.app) + .then($scope.getTextValues) + .then(callback); + }; + $scope.suggestHosts = function(query, callback) { - $scope.datasource.suggestHosts(query, $scope.target.app) + $scope.datasource.suggestHosts($scope.target.app, $scope.target.cluster) .then($scope.getTextValues) .then(callback); }; http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json index 6f53b84..a58a87a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json @@ -1636,6 +1636,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1653,7 +1668,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-regionservers.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-regionservers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-regionservers.json index c7a5777..3184357 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-regionservers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-regionservers.json @@ -9019,6 +9019,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": ""}, @@ -9035,7 +9050,7 @@ "selected": true } ], - "query": "hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-datanodes.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-datanodes.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-datanodes.json index ffcddea..6e9777c 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-datanodes.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-datanodes.json @@ -1146,6 +1146,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1162,7 +1177,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-home.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-home.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-home.json index 09929ec..47005e2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-home.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-home.json @@ -697,6 +697,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -713,7 +728,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-namenodes.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-namenodes.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-namenodes.json index ebf7a4c..4c03abe 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-namenodes.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-namenodes.json @@ -1886,6 +1886,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1902,7 +1917,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json index 90fd37c..500d75a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hdfs-topn.json @@ -802,6 +802,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -818,7 +833,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json index caaa86a..dd32192 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json @@ -526,6 +526,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -542,7 +557,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query", http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json index baca5bb..91ab4ae 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json @@ -732,6 +732,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -748,7 +763,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query", http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-kafka-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-kafka-hosts.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-kafka-hosts.json index 533a169..02b61e5 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-kafka-hosts.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-kafka-hosts.json @@ -1832,6 +1832,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1848,7 +1863,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json index 849f296..32c957b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json @@ -2114,6 +2114,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "", @@ -2132,7 +2147,7 @@ "selected": true } ], - "query": "hosts", + "query": "hosts.$cluster", "refresh": true, "type": "query" } http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-heatmaps.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-heatmaps.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-heatmaps.json index ab2434f..1ed770e 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-heatmaps.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-heatmaps.json @@ -304,6 +304,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -321,7 +336,7 @@ "selected": true } ], - "query": "hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json index 9b79663..1cd603f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-cores-dashboard.json @@ -1554,6 +1554,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { }, "datasource": null, @@ -1564,7 +1579,8 @@ "options": [ ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json index 35d2bd7..58d3d48 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-solr-hosts-dashboard.json @@ -242,6 +242,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { }, "datasource": null, @@ -252,7 +267,8 @@ "options": [ ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-nodemanagers.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-nodemanagers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-nodemanagers.json index abbf221..52999a2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-nodemanagers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-nodemanagers.json @@ -1652,6 +1652,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1668,7 +1683,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-resourcemanagers.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-resourcemanagers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-resourcemanagers.json index b861862..00a68d7 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-resourcemanagers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-yarn-resourcemanagers.json @@ -898,6 +898,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -914,7 +929,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json index 229db83..a472dba 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-database.json @@ -880,6 +880,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "datasource": null, "includeAll": false, "multi": false, @@ -887,8 +902,8 @@ "name": "hosts", "options": [ ], - "query": "hosts", - "refresh": true, + "label": "Hosts", + "query": "hosts.$cluster", "type": "query" } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json index 2c98e8d..f919f27 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server-topn.json @@ -300,6 +300,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "datasource": null, "includeAll": false, "multi": false, @@ -307,7 +322,8 @@ "name": "hosts", "options": [ ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "type": "query" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server.json index c458931..5453c85 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ambari-server.json @@ -705,6 +705,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "datasource": null, "includeAll": false, "multi": false, @@ -712,7 +727,8 @@ "name": "hosts", "options": [ ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "type": "query" } http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json index 4820ae3..a79c715 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json @@ -1636,6 +1636,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -1653,7 +1668,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json index 4ec784e..b822521 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json @@ -9019,6 +9019,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -9036,7 +9051,7 @@ "selected": true } ], - "query": "hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query" http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef3706/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-system-servers.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-system-servers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-system-servers.json index 4776ff0..499e284 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-system-servers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-system-servers.json @@ -2437,6 +2437,21 @@ }, { "allFormat": "glob", + "current": null, + "datasource": null, + "includeAll": false, + "label": "Cluster", + "multi": false, + "multiFormat": "glob", + "name": "cluster", + "options": [], + "query": "cluster", + "refresh": true, + "regex": "", + "type": "query" + }, + { + "allFormat": "glob", "current": { "text": "All", "value": "" @@ -2453,7 +2468,8 @@ "selected": true } ], - "query": "hosts", + "label": "Hosts", + "query": "hosts.$cluster", "refresh": true, "regex": "", "type": "query"