Merge pull request #11 from ishanbha/AMBARI-24910-master
[AMBARI-24910] Grafana: Fix for Storm Components and Storm Kafka Offse…
diff --git a/ambari-metrics-grafana/ambari-metrics/datasource.js b/ambari-metrics-grafana/ambari-metrics/datasource.js
index c6885da..dd64566 100644
--- a/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -642,8 +642,8 @@
//Templatized Dashboards for Storm Components
if (templateSrv.variables[0].query === "topologies" && templateSrv.variables[1] &&
templateSrv.variables[1].name === "component") {
- var selectedTopology = templateSrv._values.topologies;
- var selectedComponent = templateSrv._values.component;
+ var selectedTopology = templateSrv.index.topologies.options[0].value || "";
+ var selectedComponent = templateSrv.index.component.options[0] ? templateSrv.index.component.options[0].value : "";
metricsPromises.push(_.map(options.targets, function (target) {
target.sTopology = selectedTopology;
target.sComponent = selectedComponent;
@@ -655,8 +655,8 @@
//Templatized Dashboard for Storm Kafka Offset
if (templateSrv.variables[0].query === "topologies" && templateSrv.variables[1] &&
templateSrv.variables[1].name === "topic") {
- var selectedTopology = templateSrv._values.topologies;
- var selectedTopic = templateSrv._values.topic;
+ var selectedTopology = templateSrv.index.topologies.options[0].value || "";
+ var selectedTopic = templateSrv.index.topic.options[0] ? templateSrv.index.topic.options[0].value : "";
metricsPromises.push(_.map(options.targets, function (target) {
target.sTopology = selectedTopology;
target.sTopic = selectedTopic;