You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2018/04/12 16:03:47 UTC

[ambari] branch trunk updated: AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969)

This is an automated email from the ASF dual-hosted git repository.

swagle pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ad6c7b0  AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969)
ad6c7b0 is described below

commit ad6c7b0ee632d8d5d78150aaea8bb738065aba12
Author: kasakrisz <33...@users.noreply.github.com>
AuthorDate: Thu Apr 12 18:03:45 2018 +0200

    AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969)
---
 .../ambari-metrics/datasource.js                   | 158 ++++---
 ...es.json => grafana-infra-solr-collections.json} | 505 ++++++++++-----------
 .../HDP/grafana-infra-solr-cores.json              | 250 +++++-----
 .../HDP/grafana-infra-solr-hosts.json              | 335 +++++++++-----
 4 files changed, 705 insertions(+), 543 deletions(-)

diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index 4a6a77c..65b834b 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -343,18 +343,31 @@ define([
           };
 
             // Infra Solr Calls
-            var getSolrCoreData = function(target) {
-                var instanceId = typeof target.templatedCluster == 'undefined'  ? '' : '&instanceId=' + target.templatedCluster;
-                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.sCoreMetric + metricTransform + instanceId
-                + metricAggregator + '&appId=ambari-infra-solr&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then(
-                    allHostMetricsData(target)
-                );
-            };
+          var getSolrCoreData = function(target) {
+              var instanceId = typeof target.templatedCluster == 'undefined'  ? '' : '&instanceId=' + target.templatedCluster;
+              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.sCoreMetric + metricTransform + instanceId
+              + metricAggregator + '&appId=ambari-infra-solr&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then(
+                  allHostMetricsData(target)
+              );
+          };
+
+          var getSolrCollectionData = function(target) {
+              var instanceId = typeof target.templatedCluster == 'undefined'  ? '' : '&instanceId=' + target.templatedCluster;
+              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.sCollectionMetric + metricTransform + instanceId
+              + metricAggregator + '&appId=ambari-infra-solr&startTime=' + from + '&endTime=' + to + precision + seriesAggregator }).then(
+                  allHostMetricsData(target)
+              );
+          };
 
           // Druid calls.
           var getDruidData = function(target) {
@@ -473,22 +486,39 @@ define([
               });
             }
 
-              //Templatized Dashboard for Infra Solr Cores
-              if (templateSrv.variables[0].query === "infra_solr_core") {
-                  var allCores = templateSrv.variables.filter(function(variable) { return variable.query === "infra_solr_core";});
-                  var selectedCores = (_.isEmpty(allCores)) ? "" : allCores[0].options.filter(function(core)
-                  { return core.selected; }).map(function(coreName) { return coreName.value; });
-                  selectedCores = templateSrv._values.Cores.lastIndexOf('}') > 0 ? templateSrv._values.Cores.slice(1,-1) :
-                      templateSrv._values.Cores;
-                  var selectedCore= selectedCores.split(',');
-                  _.forEach(selectedCore, function(processCore) {
-                      metricsPromises.push(_.map(options.targets, function(target) {
-                          target.sCore = processCore;
-                          target.sCoreMetric = target.metric.replace('*', target.sCore);
-                          return getSolrCoreData(target);
-                      }));
-                  });
-              }
+            //Templatized Dashboard for Infra Solr Cores
+            if (templateSrv.variables[0].query === "infra_solr_core") {
+                var allCores = templateSrv.variables.filter(function(variable) { return variable.query === "infra_solr_core";});
+                var selectedCores = (_.isEmpty(allCores)) ? "" : allCores[0].options.filter(function(core)
+                { return core.selected; }).map(function(coreName) { return coreName.value; });
+                selectedCores = templateSrv._values.Cores.lastIndexOf('}') > 0 ? templateSrv._values.Cores.slice(1,-1) :
+                    templateSrv._values.Cores;
+                var selectedCore= selectedCores.split(',');
+                _.forEach(selectedCore, function(processCore) {
+                    metricsPromises.push(_.map(options.targets, function(target) {
+                        target.sCore = processCore;
+                        target.sCoreMetric = target.metric.replace('*', target.sCore);
+                        return getSolrCoreData(target);
+                    }));
+                });
+            }
+
+            //Templatized Dashboard for Infra Solr Collections
+            if (templateSrv.variables[0].query === "infra_solr_collection") {
+                var allCollections = templateSrv.variables.filter(function(variable) { return variable.query === "infra_solr_collection";});
+                var selectedCollections = (_.isEmpty(allCollections)) ? "" : allCollections[0].options.filter(function(collection)
+                { return collection.selected; }).map(function(collectionsName) { return collectionsName.value; });
+                selectedCollections = templateSrv._values.Collections.lastIndexOf('}') > 0 ? templateSrv._values.Collections.slice(1,-1) :
+                    templateSrv._values.Collections;
+                var selectedCollection= selectedCollections.split(',');
+                _.forEach(selectedCollection, function(processCollection) {
+                    metricsPromises.push(_.map(options.targets, function(target) {
+                        target.sCollection = processCollection;
+                        target.sCollectionMetric = target.metric.replace('*', target.sCollection);
+                        return getSolrCollectionData(target);
+                    }));
+                });
+            }
 
             //Templatized Dashboard for Storm Topologies
             if (templateSrv.variables[0].query === "topologies" && !templateSrv.variables[1]) {
@@ -710,30 +740,54 @@ define([
               });
           }
 
-            var cores = [];
-            //Templated Variables for Infra Solr Cores
-            if (interpolated === "infra_solr_core") {
-                return this.initMetricAppidMapping()
-                    .then(function () {
-                        var solrMetrics = allMetrics["ambari-infra-solr"];
-                        var extractCores = solrMetrics.filter(/./.test.bind(new
-                        RegExp("^infra.solr.core.", 'g')));
-                        _.map(extractCores, function (core) {
-                            // Core naming convention is infra.solr.core.<collection_name>.<shard>.<replica>.<metric_name>
-                            // coreName should be <collection_name>.<shard>.<replica>
-                            core = core.split('.');
-                            var coreName = core.slice(3,6).join(".");
-                            if (cores.indexOf(coreName) < 0) {
-                                cores.push(coreName);
-                            }
-                        });
-                        return _.map(cores, function (cores) {
-                                return {
-                                    text: cores
-                                };
-                            });
-                        });
-            }
+          var cores = [];
+          //Templated Variables for Infra Solr Cores
+          if (interpolated === "infra_solr_core") {
+              return this.initMetricAppidMapping()
+                  .then(function () {
+                      var solrMetrics = allMetrics["ambari-infra-solr"];
+                      var extractCores = solrMetrics.filter(/./.test.bind(new
+                      RegExp("^infra.solr.core.", 'g')));
+                      _.map(extractCores, function (core) {
+                          // Core naming convention is infra.solr.core.<collection_name>.<shard>.<replica>.<metric_name>
+                          // coreName should be <collection_name>.<shard>.<replica>
+                          core = core.split('.');
+                          var coreName = core.slice(3,6).join(".");
+                          if (cores.indexOf(coreName) < 0) {
+                              cores.push(coreName);
+                          }
+                      });
+                      return _.map(cores, function (cores) {
+                              return {
+                                  text: cores
+                              };
+                          });
+                      });
+          }
+
+          var collections = [];
+          //Templated Variables for Infra Solr Collections
+          if (interpolated === "infra_solr_collection") {
+              return this.initMetricAppidMapping()
+                  .then(function () {
+                      var solrMetrics = allMetrics["ambari-infra-solr"];
+                      var extractCollections = solrMetrics.filter(/./.test.bind(new
+                      RegExp("^infra.solr.core.", 'g')));
+                      _.map(extractCollections, function (core) {
+                          // Core naming convention is infra.solr.core.<collection_name>.<shard>.<replica>.<metric_name>
+                          core = core.split('.');
+                          var collection = core[3];
+                          if (collections.indexOf(collection) < 0) {
+                              collections.push(collection);
+                          }
+                      });
+                      return _.map(collections, function (collections) {
+                              return {
+                                  text: collections
+                              };
+                          });
+                      });
+          }
 
           var topologies = {};
           //Templated Variables for Storm Topologies
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-collections.json
similarity index 76%
copy from ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json
copy to ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-collections.json
index 5032a82..09c004c 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-collections.json
@@ -1,7 +1,7 @@
 {
-  "id": 45,
-  "title": "Infra Solr Cores",
-  "originalTitle": "Infra Solr Cores",
+  "id": 46,
+  "title": "Infra Solr Collections",
+  "originalTitle": "Infra Solr Collections",
   "tags": [
     "builtin",
     "2.7.0",
@@ -44,7 +44,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -63,22 +63,24 @@
           "targets": [
             {
               "aggregator": "none",
-              "alias": "size in bytes",
+              "alias": "size",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.INDEX.sizeInBytes",
+              "metric": "infra.solr.core.*.%.INDEX.sizeInBytes",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.INDEX.sizeInBytes",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.INDEX.sizeInBytes",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.INDEX.sizeInBytes",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Index Size In Bytes",
+          "title": "Index Size",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -117,7 +119,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -140,12 +142,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE.updateHandler.adds",
+              "metric": "infra.solr.core.*.%.UPDATE.updateHandler.adds",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE.updateHandler.adds",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE.updateHandler.adds",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE.updateHandler.adds",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
@@ -190,7 +194,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -213,12 +217,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE.updateHandler.deletesById",
+              "metric": "infra.solr.core.*.%.UPDATE.updateHandler.deletesById",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE.updateHandler.deletesById",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE.updateHandler.deletesById",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE.updateHandler.deletesById",
+              "seriesAggregator": "sum",
               "transform": "none"
             },
             {
@@ -227,12 +233,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE.updateHandler.deletesByQuery",
+              "metric": "infra.solr.core.*.%.UPDATE.updateHandler.deletesByQuery",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE.updateHandler.deletesByQuery",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE.updateHandler.deletesByQuery",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE.updateHandler.deletesByQuery",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
@@ -277,7 +285,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -300,12 +308,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE.updateHandler.errors",
+              "metric": "infra.solr.core.*.%.UPDATE.updateHandler.errors",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE.updateHandler.errors",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE.updateHandler.errors",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE.updateHandler.errors",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
@@ -350,7 +360,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -373,12 +383,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE.updateHandler.docsPending",
+              "metric": "infra.solr.core.*.%.UPDATE.updateHandler.docsPending",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE.updateHandler.docsPending",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE.updateHandler.docsPending",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE.updateHandler.docsPending",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
@@ -423,7 +435,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -442,30 +454,18 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./select.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./select.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
-              "alias": "average requests per sec",
+              "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./select.requestTimes.avgRequestsPerSecond",
+              "metric": "infra.solr.core.*.%.QUERY./select.requestTimes.avgRequestsPerSecond",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./select.requestTimes.avgRequestsPerSecond",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./select.requestTimes.avgRequestsPerSecond",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./select.requestTimes.avgRequestsPerSecond",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -510,7 +510,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -533,12 +533,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./select.requestTimes.avgTimePerRequest",
+              "metric": "infra.solr.core.*.%.QUERY./select.requestTimes.avgTimePerRequest",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./select.requestTimes.avgTimePerRequest",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./select.requestTimes.avgTimePerRequest",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./select.requestTimes.avgTimePerRequest",
+              "seriesAggregator": "avg",
               "transform": "none"
             },
             {
@@ -547,12 +549,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./select.requestTimes.medianRequestTime",
+              "metric": "infra.solr.core.*.%.QUERY./select.requestTimes.medianRequestTime",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./select.requestTimes.medianRequestTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./select.requestTimes.medianRequestTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./select.requestTimes.medianRequestTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -567,8 +571,8 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
-            "short"
+            "ns",
+            "none"
           ]
         },
         {
@@ -597,7 +601,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -616,30 +620,18 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.UPDATE./update.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE./update.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE./update.requestTimes.avgRequestsPerSecond",
+              "metric": "infra.solr.core.*.%.UPDATE./update.requestTimes.avgRequestsPerSecond",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE./update.requestTimes.avgRequestsPerSecond",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE./update.requestTimes.avgRequestsPerSecond",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE./update.requestTimes.avgRequestsPerSecond",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -684,7 +676,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -707,12 +699,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE./update.requestTimes.avgTimePerRequest",
+              "metric": "infra.solr.core.*.%.UPDATE./update.requestTimes.avgTimePerRequest",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE./update.requestTimes.avgTimePerRequest",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE./update.requestTimes.avgTimePerRequest",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE./update.requestTimes.avgTimePerRequest",
+              "seriesAggregator": "avg",
               "transform": "none"
             },
             {
@@ -721,12 +715,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.UPDATE./update.requestTimes.medianRequestTime",
+              "metric": "infra.solr.core.*.%.UPDATE./update.requestTimes.medianRequestTime",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE./update.requestTimes.medianRequestTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.UPDATE./update.requestTimes.medianRequestTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.UPDATE./update.requestTimes.medianRequestTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -741,8 +737,8 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
-            "short"
+            "ns",
+            "none"
           ]
         },
         {
@@ -771,7 +767,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -790,30 +786,18 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "metric": "infra.solr.core.*.%.QUERY./get.requestTimes.avgRequestsPerSecond",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.avgRequestsPerSecond",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -858,7 +842,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -881,12 +865,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requestTimes.avgTimePerRequest",
+              "metric": "infra.solr.core.*.%.QUERY./get.requestTimes.avgTimePerRequest",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.avgTimePerRequest",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./get.requestTimes.avgTimePerRequest",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.avgTimePerRequest",
+              "seriesAggregator": "avg",
               "transform": "none"
             },
             {
@@ -895,12 +881,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requestTimes.medianRequestTime",
+              "metric": "infra.solr.core.*.%.QUERY./get.requestTimes.medianRequestTime",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.medianRequestTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./get.requestTimes.medianRequestTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.medianRequestTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -915,8 +903,8 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
-            "short"
+            "ns",
+            "none"
           ]
         },
         {
@@ -945,7 +933,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -964,32 +952,20 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.ADMIN./admin/luke.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.ADMIN./admin/luke.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "cluster": "",
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "infra.solr.core.*.ADMIN./admin/luke.requestTimes.avgRequestsPerSecond",
+              "metric": "infra.solr.core.*.%.ADMIN./admin/luke.requestTimes.avgRequestsPerSecond",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.ADMIN./admin/luke.requestTimes.avgRequestsPerSecond",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.ADMIN./admin/luke.requestTimes.avgRequestsPerSecond",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.ADMIN./admin/luke.requestTimes.avgRequestsPerSecond",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1034,7 +1010,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1052,31 +1028,35 @@
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "avg",
+              "aggregator": "none",
               "alias": "average time per request",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.ADMIN./admin/luke.requestTimes.avgTimePerRequest",
+              "metric": "infra.solr.core.*.%.ADMIN./admin/luke.requestTimes.avgTimePerRequest",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.ADMIN./admin/luke.requestTimes.avgTimePerRequest",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.ADMIN./admin/luke.requestTimes.avgTimePerRequest",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.ADMIN./admin/luke.requestTimes.avgTimePerRequest",
+              "seriesAggregator": "avg",
               "transform": "none"
             },
             {
-              "aggregator": "avg",
+              "aggregator": "none",
               "alias": "median request time",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.ADMIN./admin/luke.requestTimes.medianRequestTime",
+              "metric": "infra.solr.core.*.%.ADMIN./admin/luke.requestTimes.medianRequestTime",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.ADMIN./admin/luke.requestTimes.medianRequestTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.ADMIN./admin/luke.requestTimes.medianRequestTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.ADMIN./admin/luke.requestTimes.medianRequestTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1091,8 +1071,8 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
-            "short"
+            "ns",
+            "none"
           ]
         },
         {
@@ -1121,7 +1101,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1140,30 +1120,18 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "metric": "infra.solr.core.*.%.QUERY./get.requestTimes.avgRequestsPerSecond",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.avgRequestsPerSecond",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.avgRequestsPerSecond",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1208,7 +1176,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1234,8 +1202,10 @@
               "metric": "infra.solr.core.*.QUERY./get.requestTimes.avgTimePerRequest",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.avgTimePerRequest",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.QUERY./get.requestTimes.avgTimePerRequest",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.avgTimePerRequest",
               "seriesAggregator": "none",
               "transform": "none"
             },
@@ -1248,8 +1218,10 @@
               "metric": "infra.solr.core.*.QUERY./get.requestTimes.medianRequestTime",
               "precision": "default",
               "refId": "B",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requestTimes.medianRequestTime",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.QUERY./get.requestTimes.medianRequestTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.QUERY./get.requestTimes.medianRequestTime",
               "seriesAggregator": "none",
               "transform": "none"
             }
@@ -1265,8 +1237,8 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
-            "short"
+            "ns",
+            "none"
           ]
         }
       ],
@@ -1304,7 +1276,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1323,16 +1295,18 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "hitratio",
+              "alias": "hit ratio",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.filterCache.hitratio",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.filterCache.hitratio",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.filterCache.hitratio",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.filterCache.hitratio",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.filterCache.hitratio",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1377,7 +1351,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1400,12 +1374,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.filterCache.size",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.filterCache.size",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.filterCache.size",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.filterCache.size",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.filterCache.size",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1450,7 +1426,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1473,12 +1449,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.documentCache.warmupTime",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.documentCache.warmupTime",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.documentCache.warmupTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.documentCache.warmupTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.documentCache.warmupTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1523,7 +1501,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1546,12 +1524,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.documentCache.hitratio",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.documentCache.hitratio",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.documentCache.hitratio",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.documentCache.hitratio",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.documentCache.hitratio",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1596,7 +1576,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1619,12 +1599,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.documentCache.size",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.documentCache.size",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.documentCache.size",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.documentCache.size",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.documentCache.size",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1669,7 +1651,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1694,12 +1676,14 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "infra.solr.core.*.CACHE.searcher.documentCache.warmupTime",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.documentCache.warmupTime",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.documentCache.warmupTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.documentCache.warmupTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.documentCache.warmupTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1744,7 +1728,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1767,12 +1751,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.queryResultCache.hitratio",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.queryResultCache.hitratio",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.queryResultCache.hitratio",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.queryResultCache.hitratio",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.queryResultCache.hitratio",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1817,7 +1803,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1840,12 +1826,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.queryResultCache.size",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.queryResultCache.size",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.queryResultCache.size",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.queryResultCache.size",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.queryResultCache.size",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1890,7 +1878,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1913,12 +1901,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.searcher.queryResultCache.warmupTime",
+              "metric": "infra.solr.core.*.%.CACHE.searcher.queryResultCache.warmupTime",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.searcher.queryResultCache.warmupTime",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.searcher.queryResultCache.warmupTime",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.searcher.queryResultCache.warmupTime",
+              "seriesAggregator": "avg",
               "transform": "none"
             }
           ],
@@ -1963,7 +1953,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1986,12 +1976,14 @@
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.core.*.CACHE.core.fieldCache.entries_count",
+              "metric": "infra.solr.core.*.%.CACHE.core.fieldCache.entries_count",
               "precision": "default",
               "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.CACHE.core.fieldCache.entries_count",
-              "seriesAggregator": "none",
+              "sCollection": "hadoop_logs",
+              "sCollectionMetric": "infra.solr.core.hadoop_logs.%.CACHE.core.fieldCache.entries_count",
+              "sCore": "audit_logs.shard0.replica_n1",
+              "sCoreMetric": "infra.solr.core.audit_logs.shard0.replica_n1.CACHE.core.fieldCache.entries_count",
+              "seriesAggregator": "sum",
               "transform": "none"
             }
           ],
@@ -2016,7 +2008,7 @@
     }
   ],
   "time": {
-    "from": "now-30m",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -2050,48 +2042,37 @@
       {
         "allFormat": "glob",
         "current": {
-          "text": "All",
-          "value": "{audit_logs.shard0.replica_n1,audit_logs.shard0.replica_n2,hadoop_logs.shard0.replica_n1,hadoop_logs.shard0.replica_n2,history.shard1.replica_n1}"
+          "text": "hadoop_logs",
+          "value": "hadoop_logs"
         },
         "datasource": null,
         "includeAll": true,
-        "label": "",
         "multi": true,
         "multiFormat": "glob",
-        "name": "Cores",
+        "name": "Collections",
         "options": [
           {
+            "selected": false,
             "text": "All",
-            "value": "{audit_logs.shard0.replica_n1,audit_logs.shard0.replica_n2,hadoop_logs.shard0.replica_n1,hadoop_logs.shard0.replica_n2,history.shard1.replica_n1}",
-            "selected": true
-          },
-          {
-            "text": "audit_logs.shard0.replica_n1",
-            "value": "audit_logs.shard0.replica_n1",
-            "selected": false
-          },
-          {
-            "text": "audit_logs.shard0.replica_n2",
-            "value": "audit_logs.shard0.replica_n2",
-            "selected": false
+            "value": "{audit_logs,hadoop_logs,history}"
           },
           {
-            "text": "hadoop_logs.shard0.replica_n1",
-            "value": "hadoop_logs.shard0.replica_n1",
-            "selected": false
+            "selected": false,
+            "text": "audit_logs",
+            "value": "audit_logs"
           },
           {
-            "text": "hadoop_logs.shard0.replica_n2",
-            "value": "hadoop_logs.shard0.replica_n2",
-            "selected": false
+            "selected": true,
+            "text": "hadoop_logs",
+            "value": "hadoop_logs"
           },
           {
-            "text": "history.shard1.replica_n1",
-            "value": "history.shard1.replica_n1",
-            "selected": false
+            "selected": false,
+            "text": "history",
+            "value": "history"
           }
         ],
-        "query": "infra_solr_core",
+        "query": "infra_solr_collection",
         "refresh": true,
         "type": "query"
       }
@@ -2102,6 +2083,6 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 5,
+  "version": 56,
   "links": []
 }
\ No newline at end of file
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json
index 5032a82..9500638 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-cores.json
@@ -1,5 +1,5 @@
 {
-  "id": 45,
+  "id": 49,
   "title": "Infra Solr Cores",
   "originalTitle": "Infra Solr Cores",
   "tags": [
@@ -44,7 +44,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -63,7 +63,7 @@
           "targets": [
             {
               "aggregator": "none",
-              "alias": "size in bytes",
+              "alias": "size",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -78,7 +78,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Index Size In Bytes",
+          "title": "Index Size",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -117,7 +117,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -190,7 +190,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -277,7 +277,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -350,7 +350,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -423,7 +423,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -442,21 +442,7 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./select.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./select.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
-              "alias": "average requests per sec",
+              "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -510,7 +496,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -567,7 +553,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ns",
             "short"
           ]
         },
@@ -597,7 +583,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -616,20 +602,6 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.UPDATE./update.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.UPDATE./update.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
@@ -684,7 +656,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -741,7 +713,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ns",
             "short"
           ]
         },
@@ -771,7 +743,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -790,20 +762,6 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
@@ -858,7 +816,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -915,7 +873,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ns",
             "short"
           ]
         },
@@ -945,7 +903,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -964,20 +922,6 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.ADMIN./admin/luke.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.ADMIN./admin/luke.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "cluster": "",
@@ -1034,7 +978,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1091,7 +1035,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ns",
             "short"
           ]
         },
@@ -1121,7 +1065,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1140,20 +1084,6 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "requests",
-              "app": "ambari-infra-solr",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "infra.solr.core.*.QUERY./get.requests",
-              "precision": "default",
-              "refId": "A",
-              "sCore": "history.shard1.replica_n1",
-              "sCoreMetric": "infra.solr.core.history.shard1.replica_n1.QUERY./get.requests",
-              "seriesAggregator": "none",
-              "transform": "none"
-            },
-            {
-              "aggregator": "avg",
               "alias": "average requests per second",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
@@ -1208,7 +1138,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1265,7 +1195,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "ns",
             "short"
           ]
         }
@@ -1304,7 +1234,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1323,7 +1253,7 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "hitratio",
+              "alias": "hit ratio",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
@@ -1377,7 +1307,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1450,7 +1380,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1523,7 +1453,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1596,7 +1526,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1669,7 +1599,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1744,7 +1674,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1817,7 +1747,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1890,7 +1820,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -1963,7 +1893,7 @@
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -2016,7 +1946,7 @@
     }
   ],
   "time": {
-    "from": "now-30m",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -2050,8 +1980,9 @@
       {
         "allFormat": "glob",
         "current": {
+          "tags": [],
           "text": "All",
-          "value": "{audit_logs.shard0.replica_n1,audit_logs.shard0.replica_n2,hadoop_logs.shard0.replica_n1,hadoop_logs.shard0.replica_n2,history.shard1.replica_n1}"
+          "value": "{audit_logs.ADMIN./admin/luke,audit_logs.CACHE.core,audit_logs.CACHE.searcher,audit_logs.INDEX.sizeInBytes,audit_logs.QUERY./get,audit_logs.QUERY./select,audit_logs.UPDATE./update,audit_logs.UPDATE.updateHandler,audit_logs.shard0.replica_n1,audit_logs.shard1.replica_n2,audit_logs.shard2.replica_n4,audit_logs.shard3.replica_n6,audit_logs.shard4.replica_n7,hadoop_logs.QUERY./get,hadoop_logs.shard0.replica_n1,hadoop_logs.shard1.replica_n2,hadoop_logs.shard2.replica_n4,ha [...]
         },
         "datasource": null,
         "includeAll": true,
@@ -2061,34 +1992,109 @@
         "name": "Cores",
         "options": [
           {
+            "selected": true,
             "text": "All",
-            "value": "{audit_logs.shard0.replica_n1,audit_logs.shard0.replica_n2,hadoop_logs.shard0.replica_n1,hadoop_logs.shard0.replica_n2,history.shard1.replica_n1}",
-            "selected": true
+            "value": "{audit_logs.ADMIN./admin/luke,audit_logs.CACHE.core,audit_logs.CACHE.searcher,audit_logs.INDEX.sizeInBytes,audit_logs.QUERY./get,audit_logs.QUERY./select,audit_logs.UPDATE./update,audit_logs.UPDATE.updateHandler,audit_logs.shard0.replica_n1,audit_logs.shard1.replica_n2,audit_logs.shard2.replica_n4,audit_logs.shard3.replica_n6,audit_logs.shard4.replica_n7,hadoop_logs.QUERY./get,hadoop_logs.shard0.replica_n1,hadoop_logs.shard1.replica_n2,hadoop_logs.shard2.replica_n4, [...]
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.ADMIN./admin/luke",
+            "value": "audit_logs.ADMIN./admin/luke"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.CACHE.core",
+            "value": "audit_logs.CACHE.core"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.CACHE.searcher",
+            "value": "audit_logs.CACHE.searcher"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.INDEX.sizeInBytes",
+            "value": "audit_logs.INDEX.sizeInBytes"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.QUERY./get",
+            "value": "audit_logs.QUERY./get"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.QUERY./select",
+            "value": "audit_logs.QUERY./select"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.UPDATE./update",
+            "value": "audit_logs.UPDATE./update"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.UPDATE.updateHandler",
+            "value": "audit_logs.UPDATE.updateHandler"
           },
           {
+            "selected": false,
             "text": "audit_logs.shard0.replica_n1",
-            "value": "audit_logs.shard0.replica_n1",
-            "selected": false
+            "value": "audit_logs.shard0.replica_n1"
           },
           {
-            "text": "audit_logs.shard0.replica_n2",
-            "value": "audit_logs.shard0.replica_n2",
-            "selected": false
+            "selected": false,
+            "text": "audit_logs.shard1.replica_n2",
+            "value": "audit_logs.shard1.replica_n2"
           },
           {
+            "selected": false,
+            "text": "audit_logs.shard2.replica_n4",
+            "value": "audit_logs.shard2.replica_n4"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.shard3.replica_n6",
+            "value": "audit_logs.shard3.replica_n6"
+          },
+          {
+            "selected": false,
+            "text": "audit_logs.shard4.replica_n7",
+            "value": "audit_logs.shard4.replica_n7"
+          },
+          {
+            "selected": false,
+            "text": "hadoop_logs.QUERY./get",
+            "value": "hadoop_logs.QUERY./get"
+          },
+          {
+            "selected": false,
             "text": "hadoop_logs.shard0.replica_n1",
-            "value": "hadoop_logs.shard0.replica_n1",
-            "selected": false
+            "value": "hadoop_logs.shard0.replica_n1"
+          },
+          {
+            "selected": false,
+            "text": "hadoop_logs.shard1.replica_n2",
+            "value": "hadoop_logs.shard1.replica_n2"
+          },
+          {
+            "selected": false,
+            "text": "hadoop_logs.shard2.replica_n4",
+            "value": "hadoop_logs.shard2.replica_n4"
+          },
+          {
+            "selected": false,
+            "text": "hadoop_logs.shard3.replica_n6",
+            "value": "hadoop_logs.shard3.replica_n6"
           },
           {
-            "text": "hadoop_logs.shard0.replica_n2",
-            "value": "hadoop_logs.shard0.replica_n2",
-            "selected": false
+            "selected": false,
+            "text": "hadoop_logs.shard4.replica_n8",
+            "value": "hadoop_logs.shard4.replica_n8"
           },
           {
+            "selected": false,
             "text": "history.shard1.replica_n1",
-            "value": "history.shard1.replica_n1",
-            "selected": false
+            "value": "history.shard1.replica_n1"
           }
         ],
         "query": "infra_solr_core",
@@ -2102,6 +2108,6 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 5,
+  "version": 9,
   "links": []
 }
\ No newline at end of file
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-hosts.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-hosts.json
index 3e1e380..a89af18 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-hosts.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-infra-solr-hosts.json
@@ -1,5 +1,5 @@
 {
-  "id": 45,
+  "id": 47,
   "title": "Infra Solr Host",
   "originalTitle": "Infra Solr Host",
   "tags": [
@@ -46,7 +46,7 @@
             "max": true,
             "min": false,
             "rightSide": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": true
           },
@@ -79,16 +79,74 @@
               "templatedCluster": "",
               "templatedHost": "%",
               "transform": "none"
-            },
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Infra Solr Process CPU Utilization",
+          "tooltip": {
+            "shared": true,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "x-axis": true,
+          "y-axis": true,
+          "y_formats": [
+            "percentunit",
+            "short"
+          ]
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "datasource": null,
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {
+            "leftLogBase": 1,
+            "leftMax": null,
+            "leftMin": null,
+            "rightLogBase": 1,
+            "rightMax": null,
+            "rightMin": null,
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "id": 13,
+          "isNew": true,
+          "legend": {
+            "avg": true,
+            "current": false,
+            "max": true,
+            "min": false,
+            "show": false,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 6,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
             {
-              "aggregator": "none",
+              "aggregator": "avg",
               "alias": "OS CPU utilization",
-              "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "infra.solr.jvm.os.systemCpuLoad",
               "precision": "default",
-              "refId": "B",
+              "refId": "A",
               "seriesAggregator": "none",
               "templatedCluster": "",
               "templatedHost": "%",
@@ -97,7 +155,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Infra Solr CPU Utilization",
+          "title": "Infra Solr OS CPU Utilization",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -106,7 +164,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "percentunit",
+            "percent",
             "short"
           ]
         },
@@ -136,7 +194,7 @@
             "current": false,
             "max": true,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": true
           },
@@ -166,16 +224,74 @@
               "templatedCluster": "",
               "templatedHost": "%",
               "transform": "none"
-            },
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Infra Solr Heap Memory Utilization",
+          "tooltip": {
+            "shared": true,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "x-axis": true,
+          "y-axis": true,
+          "y_formats": [
+            "bytes",
+            "short"
+          ]
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "datasource": null,
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {
+            "leftLogBase": 1,
+            "leftMax": null,
+            "leftMin": null,
+            "rightLogBase": 1,
+            "rightMax": null,
+            "rightMin": null,
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "id": 14,
+          "isNew": true,
+          "legend": {
+            "avg": true,
+            "current": false,
+            "max": true,
+            "min": false,
+            "show": false,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 6,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
             {
-              "aggregator": "none",
+              "aggregator": "avg",
               "alias": "Non-Heap memory",
-              "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "infra.solr.jvm.memory.non-heap.used",
               "precision": "default",
-              "refId": "B",
+              "refId": "A",
               "seriesAggregator": "none",
               "templatedCluster": "",
               "templatedHost": "%",
@@ -184,7 +300,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Infra Solr Memory Utilization",
+          "title": "Infra Solr Non-Heap Memory Utilization",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -232,7 +348,7 @@
             "current": true,
             "max": true,
             "min": true,
-            "show": true,
+            "show": false,
             "total": false,
             "values": true
           },
@@ -307,16 +423,16 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 4,
+          "id": 8,
           "isNew": true,
           "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
+            "avg": true,
+            "current": true,
+            "max": true,
+            "min": true,
+            "show": false,
             "total": false,
-            "values": false
+            "values": true
           },
           "lines": true,
           "linewidth": 2,
@@ -327,17 +443,17 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "count",
+              "alias": "Open file descriptors",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.ParNew.count",
+              "metric": "infra.solr.jvm.os.openFileDescriptorCount",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -348,7 +464,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "GC Count Par New /s",
+          "title": "Open File Descriptors",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -360,7 +476,16 @@
             "short",
             "short"
           ]
-        },
+        }
+      ],
+      "showTitle": true,
+      "title": "FILE DESCRIPTORS"
+    },
+    {
+      "collapse": true,
+      "editable": true,
+      "height": "250px",
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
@@ -380,14 +505,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 5,
+          "id": 4,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -406,11 +531,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "time",
+              "alias": "count",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.ParNew.time",
+              "metric": "infra.solr.jvm.gc.ParNew.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -421,7 +546,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "GC Time Par New /s",
+          "title": "GC Count Par New /s",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -430,7 +555,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "none",
+            "short",
             "short"
           ]
         },
@@ -453,14 +578,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 6,
+          "id": 5,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -479,11 +604,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "count",
+              "alias": "time",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.ConcurrentMarkSweep.count",
+              "metric": "infra.solr.jvm.gc.ParNew.time",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -494,7 +619,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "GC Count CMS /s",
+          "title": "GC Time Par New /s",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -503,7 +628,7 @@
           "x-axis": true,
           "y-axis": true,
           "y_formats": [
-            "short",
+            "none",
             "short"
           ]
         },
@@ -526,14 +651,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 7,
+          "id": 6,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -552,11 +677,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "time",
+              "alias": "count",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.ConcurrentMarkSweep.time",
+              "metric": "infra.solr.jvm.gc.ConcurrentMarkSweep.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -567,7 +692,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "GC Time CMS /s",
+          "title": "GC Count CMS /s",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -579,16 +704,7 @@
             "short",
             "short"
           ]
-        }
-      ],
-      "showTitle": true,
-      "title": "JVM - CMS GC STATS"
-    },
-    {
-      "collapse": false,
-      "editable": true,
-      "height": "250px",
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
@@ -608,14 +724,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 9,
+          "id": 7,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -634,11 +750,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "count",
+              "alias": "time",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.G1-Young-Generation.count",
+              "metric": "infra.solr.jvm.gc.ConcurrentMarkSweep.time",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -649,7 +765,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "G1 GC Young Generation Count",
+          "title": "GC Time CMS /s",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -661,7 +777,16 @@
             "short",
             "short"
           ]
-        },
+        }
+      ],
+      "showTitle": true,
+      "title": "JVM - CMS GC STATS"
+    },
+    {
+      "collapse": true,
+      "editable": true,
+      "height": "250px",
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
@@ -681,14 +806,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 10,
+          "id": 9,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -707,11 +832,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "time",
+              "alias": "count",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.G1-Young-Generation.time",
+              "metric": "infra.solr.jvm.gc.G1-Young-Generation.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -722,7 +847,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "G1 GC Young Generation Time",
+          "title": "G1 GC Young Generation Count",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -754,14 +879,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 11,
+          "id": 10,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -780,11 +905,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "count",
+              "alias": "time",
               "app": "ambari-infra-solr",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.gc.G1-Old-Generation.count",
+              "metric": "infra.solr.jvm.gc.G1-Young-Generation.time",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -795,7 +920,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "G1 GC Old Generation Count",
+          "title": "G1 GC Young Generation Time",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -827,14 +952,14 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 12,
+          "id": 11,
           "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
             "max": false,
             "min": false,
-            "show": true,
+            "show": false,
             "total": false,
             "values": false
           },
@@ -853,13 +978,11 @@
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "time",
+              "alias": "count",
               "app": "ambari-infra-solr",
-              "cluster": "",
               "downsampleAggregator": "avg",
               "errors": {},
-              "hosts": "",
-              "metric": "infra.solr.jvm.gc.G1-Old-Generation.time",
+              "metric": "infra.solr.jvm.gc.G1-Old-Generation.count",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -870,7 +993,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "G1 GC Old Generation Time",
+          "title": "G1 GC Old Generation Count",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -882,16 +1005,7 @@
             "short",
             "short"
           ]
-        }
-      ],
-      "showTitle": true,
-      "title": "JVM - G1 GC STATS"
-    },
-    {
-      "collapse": false,
-      "editable": true,
-      "height": "250px",
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
@@ -911,16 +1025,16 @@
             "threshold2": null,
             "threshold2Color": "rgba(234, 112, 112, 0.22)"
           },
-          "id": 8,
+          "id": 12,
           "isNew": true,
           "legend": {
-            "avg": true,
-            "current": true,
-            "max": true,
-            "min": true,
-            "show": true,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": false,
             "total": false,
-            "values": true
+            "values": false
           },
           "lines": true,
           "linewidth": 2,
@@ -931,17 +1045,19 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 12,
+          "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "aggregator": "avg",
-              "alias": "Open file descriptors",
+              "alias": "time",
               "app": "ambari-infra-solr",
+              "cluster": "",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "infra.solr.jvm.os.openFileDescriptorCount",
+              "hosts": "",
+              "metric": "infra.solr.jvm.gc.G1-Old-Generation.time",
               "precision": "default",
               "refId": "A",
               "seriesAggregator": "none",
@@ -952,7 +1068,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Open File Descriptors",
+          "title": "G1 GC Old Generation Time",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -967,11 +1083,11 @@
         }
       ],
       "showTitle": true,
-      "title": "FILE DESCRIPTORS"
+      "title": "JVM - G1 GC STATS"
     }
   ],
   "time": {
-    "from": "now-3h",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -1028,7 +1144,7 @@
         "allFormat": "glob",
         "current": {
           "text": "All",
-          "value": "{solr}"
+          "value": "{kkasa-infra-solr-demo-1.c.pramod-thangali.internal,kkasa-infra-solr-demo-2.c.pramod-thangali.internal}"
         },
         "datasource": null,
         "includeAll": true,
@@ -1038,14 +1154,19 @@
         "name": "hosts",
         "options": [
           {
+            "selected": true,
             "text": "All",
-            "value": "{solr}",
-            "selected": true
+            "value": "{kkasa-infra-solr-demo-1.c.pramod-thangali.internal,kkasa-infra-solr-demo-2.c.pramod-thangali.internal}"
+          },
+          {
+            "selected": false,
+            "text": "kkasa-infra-solr-demo-1.c.pramod-thangali.internal",
+            "value": "kkasa-infra-solr-demo-1.c.pramod-thangali.internal"
           },
           {
-            "text": "solr",
-            "value": "solr",
-            "selected": false
+            "selected": false,
+            "text": "kkasa-infra-solr-demo-2.c.pramod-thangali.internal",
+            "value": "kkasa-infra-solr-demo-2.c.pramod-thangali.internal"
           }
         ],
         "query": "hosts.$cluster",
@@ -1058,6 +1179,6 @@
     "list": []
   },
   "schemaVersion": 8,
-  "version": 17,
+  "version": 23,
   "links": []
 }
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
swagle@apache.org.