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

hapylestat pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new aba871e  AMBARI-25457 Hive 3 Grafana dashboards showing outdated 
metrics (#3168)
aba871e is described below

commit aba871ed111c1131bde75226470b21c16df99fd9
Author: payert <35402259+pay...@users.noreply.github.com>
AuthorDate: Fri Jan 17 08:16:14 2020 +0100

    AMBARI-25457 Hive 3 Grafana dashboards showing outdated metrics (#3168)
    
    Some of the metrics' name has been changed in Hive 3.
    Due to this change many graphs shows no data on Hive Home, HiveServer2
    and HiveMetastore dashboards.
---
 .../conf/unix/metrics_whitelist                    |  17 +-
 .../conf/windows/metrics_whitelist                 |  17 +-
 .../main/resources/metrics_def/HIVEMETASTORE.dat   |  35 ++--
 .../src/main/resources/metrics_def/HIVESERVER2.dat |   6 +-
 .../test/resources/test_data/full_whitelist.dat    |  27 +++-
 .../HDP/grafana-hive-hivemetastore.json            |  20 +--
 .../HDP/grafana-hive-hiverserver2.json             | 178 +--------------------
 .../grafana-dashboards/HDP/grafana-hive-home.json  |  30 ++--
 .../0.1.0/package/files/service-metrics/HIVE.txt   |  13 +-
 9 files changed, 103 insertions(+), 240 deletions(-)

diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
index 8fcb485..3209164 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
@@ -63,8 +63,9 @@ default.General.active_calls_api_hs2_operation_INITIALIZED
 default.General.active_calls_api_hs2_operation_PENDING
 default.General.active_calls_api_hs2_operation_RUNNING
 default.General.api_create_table_count
-default.General.api_get_all_databases_75thpercentile
-default.General.api_get_all_databases_999thpercentile
+default.General.api_create_table_req_count
+default.General.api_get_databases_75thpercentile
+default.General.api_get_databases_999thpercentile
 default.General.api_get_partitions_by_names_75thpercentile
 default.General.api_get_partitions_by_names_999thpercentile
 default.General.api_hs2_operation_INITIALIZED_count
@@ -72,16 +73,22 @@ default.General.create_total_count_partitions
 default.General.hs2_completed_operation_CLOSED
 default.General.hs2_completed_operation_ERROR
 default.General.hs2_completed_operation_FINISHED
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.total_count_dbs
+default.General.total_count_partitions
+default.General.total_count_tables
 default.General.jvm.pause.extraSleepTime
 default.General.memory.heap.committed
+default.General.heap.committed
 default.General.memory.heap.max
+default.General.heap.max
 default.General.memory.heap.used
+default.General.heap.used
 default.General.memory.non-heap.committed
+default.General.non-heap.committed
 default.General.memory.non-heap.max
+default.General.non-heap.max
 default.General.memory.non-heap.used
+default.General.non-heap.used
 dfs.FSNamesystem.CapacityTotalGB
 dfs.FSNamesystem.CapacityUsedGB
 dfs.FSNamesystem.ExpiredHeartbeats
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
index 689fd0d..da783e0 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
@@ -63,8 +63,9 @@ default.General.active_calls_api_hs2_operation_INITIALIZED
 default.General.active_calls_api_hs2_operation_PENDING
 default.General.active_calls_api_hs2_operation_RUNNING
 default.General.api_create_table_count
-default.General.api_get_all_databases_75thpercentile
-default.General.api_get_all_databases_999thpercentile
+default.General.api_create_table_req_count
+default.General.api_get_databases_75thpercentile
+default.General.api_get_databases_999thpercentile
 default.General.api_get_partitions_by_names_75thpercentile
 default.General.api_get_partitions_by_names_999thpercentile
 default.General.api_hs2_operation_INITIALIZED_count
@@ -72,16 +73,22 @@ default.General.create_total_count_partitions
 default.General.hs2_completed_operation_CLOSED
 default.General.hs2_completed_operation_ERROR
 default.General.hs2_completed_operation_FINISHED
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.total_count_dbs
+default.General.total_count_partitions
+default.General.total_count_tables
 default.General.jvm.pause.extraSleepTime
 default.General.memory.heap.committed
+default.General.heap.committed
 default.General.memory.heap.max
+default.General.heap.max
 default.General.memory.heap.used
+default.General.heap.used
 default.General.memory.non-heap.committed
+default.General.non-heap.committed
 default.General.memory.non-heap.max
+default.General.non-heap.max
 default.General.memory.non-heap.used
+default.General.non-heap.used
 dfs.FSNamesystem.CapacityTotalGB
 dfs.FSNamesystem.CapacityUsedGB
 dfs.FSNamesystem.ExpiredHeartbeats
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVEMETASTORE.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVEMETASTORE.dat
index 8b7a893..ffea098 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVEMETASTORE.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVEMETASTORE.dat
@@ -13,7 +13,7 @@ default.General.api_create_table_95thpercentile
 default.General.api_create_table_98thpercentile
 default.General.api_create_table_999thpercentile
 default.General.api_create_table_99thpercentile
-default.General.api_create_table_count
+default.General.api_create_table_req_count
 default.General.api_create_table_max
 default.General.api_create_table_mean
 default.General.api_create_table_mean_rate
@@ -38,10 +38,12 @@ default.General.api_drop_table_stddev
 default.General.api_get_all_databases_15min_rate
 default.General.api_get_all_databases_1min_rate
 default.General.api_get_all_databases_5min_rate
-default.General.api_get_all_databases_75thpercentile
+default.General.api_get_databases_75thpercentile
 default.General.api_get_all_databases_95thpercentile
 default.General.api_get_all_databases_98thpercentile
-default.General.api_get_all_databases_999thpercentile
+default.General.api_get_databases_999thpercentile
+default.General.api_get_partitions_by_names_75thpercentile
+default.General.api_get_partitions_by_names_999thpercentile
 default.General.api_get_all_databases_99thpercentile
 default.General.api_get_all_databases_count
 default.General.api_get_all_databases_max
@@ -118,26 +120,27 @@ default.General.buffers.mapped.count
 default.General.buffers.mapped.used
 default.General.classLoading.loaded
 default.General.classLoading.unloaded
+default.General.create_total_count_partitions
 default.General.create_total_count_tables
 default.General.delete_total_count_tables
 default.General.gc.PS-MarkSweep.count
 default.General.gc.PS-MarkSweep.time
 default.General.gc.PS-Scavenge.count
 default.General.gc.PS-Scavenge.time
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.total_count_dbs
+default.General.total_count_partitions
+default.General.total_count_tables
 default.General.jvm.pause.extraSleepTime
-default.General.memory.heap.committed
-default.General.memory.heap.init
-default.General.memory.heap.max
-default.General.memory.heap.usage
-default.General.memory.heap.used
-default.General.memory.non-heap.committed
-default.General.memory.non-heap.init
-default.General.memory.non-heap.max
-default.General.memory.non-heap.usage
-default.General.memory.non-heap.used
+default.General.heap.committed
+default.General.heap.init
+default.General.heap.max
+default.General.heap.usage
+default.General.heap.used
+default.General.non-heap.committed
+default.General.non-heap.init
+default.General.non-heap.max
+default.General.non-heap.usage
+default.General.non-heap.used
 default.General.memory.pools.Code-Cache.usage
 default.General.memory.pools.Compressed-Class-Space.usage
 default.General.memory.pools.Metaspace.usage
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVESERVER2.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVESERVER2.dat
index c48b512..55dce65 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVESERVER2.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HIVESERVER2.dat
@@ -60,9 +60,9 @@ default.General.gc.PS-MarkSweep.count
 default.General.gc.PS-MarkSweep.time
 default.General.gc.PS-Scavenge.count
 default.General.gc.PS-Scavenge.time
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.total_count_dbs
+default.General.total_count_partitions
+default.General.total_count_tables
 default.General.jvm.pause.extraSleepTime
 default.General.memory.heap.committed
 default.General.memory.heap.init
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
index 0e36c7b..df6c935 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
@@ -1263,6 +1263,7 @@ default.General.api_create_table_98thpercentile
 default.General.api_create_table_999thpercentile
 default.General.api_create_table_99thpercentile
 default.General.api_create_table_count
+default.General.api_create_table_req_count
 default.General.api_create_table_max
 default.General.api_create_table_mean
 default.General.api_create_table_mean_rate
@@ -1287,10 +1288,12 @@ default.General.api_drop_table_stddev
 default.General.api_get_all_databases_15min_rate
 default.General.api_get_all_databases_1min_rate
 default.General.api_get_all_databases_5min_rate
-default.General.api_get_all_databases_75thpercentile
+default.General.api_get_databases_75thpercentile
 default.General.api_get_all_databases_95thpercentile
 default.General.api_get_all_databases_98thpercentile
-default.General.api_get_all_databases_999thpercentile
+default.General.api_get_databases_999thpercentile
+default.General.api_get_partitions_by_names_75thpercentile
+default.General.api_get_partitions_by_names_999thpercentile
 default.General.api_get_all_databases_99thpercentile
 default.General.api_get_all_databases_count
 default.General.api_get_all_databases_max
@@ -1367,26 +1370,40 @@ default.General.buffers.mapped.count
 default.General.buffers.mapped.used
 default.General.classLoading.loaded
 default.General.classLoading.unloaded
+default.General.create_total_count_partitions
 default.General.create_total_count_tables
 default.General.delete_total_count_tables
+default.General.active_calls_api_hs2_operation_INITIALIZED
+default.General.active_calls_api_hs2_operation_PENDING
+default.General.active_calls_api_hs2_operation_RUNNING
+default.General.api_hs2_operation_INITIALIZED_count
+default.General.hs2_completed_operation_CLOSED
+default.General.hs2_completed_operation_ERROR
+default.General.hs2_completed_operation_FINISHED
 default.General.gc.PS-MarkSweep.count
 default.General.gc.PS-MarkSweep.time
 default.General.gc.PS-Scavenge.count
 default.General.gc.PS-Scavenge.time
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.total_count_dbs
+default.General.total_count_partitions
+default.General.total_count_tables
 default.General.jvm.pause.extraSleepTime
 default.General.memory.heap.committed
+default.General.heap.committed
 default.General.memory.heap.init
 default.General.memory.heap.max
+default.General.heap.max
 default.General.memory.heap.usage
 default.General.memory.heap.used
+default.General.heap.used
 default.General.memory.non-heap.committed
+default.General.non-heap.committed
 default.General.memory.non-heap.init
 default.General.memory.non-heap.max
+default.General.non-heap.max
 default.General.memory.non-heap.usage
 default.General.memory.non-heap.used
+default.General.non-heap.used
 default.General.memory.pools.Code-Cache.usage
 default.General.memory.pools.Compressed-Class-Space.usage
 default.General.memory.pools.Metaspace.usage
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json
index dd32192..fe1e96f 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hivemetastore.json
@@ -87,7 +87,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.api_get_all_databases_75thpercentile",
+              "metric": "default.General.api_get_databases_75thpercentile",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
@@ -98,7 +98,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": 
"default.General.api_get_all_databases_999thpercentile",
+              "metric": "default.General.api_get_databases_999thpercentile",
               "precision": "default",
               "refId": "B",
               "templatedHost": ""
@@ -106,7 +106,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "API call times - Health Check roundtrip 
(get_all_databases)",
+          "title": "API call times - Health Check roundtrip (get_databases)",
           "tooltip": {
             "shared": true,
             "value_type": "cumulative"
@@ -329,7 +329,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.heap.max",
+              "metric": "default.General.heap.max",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
@@ -340,7 +340,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.heap.used",
+              "metric": "default.General.heap.used",
               "precision": "default",
               "refId": "B",
               "templatedHost": ""
@@ -351,7 +351,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.heap.committed",
+              "metric": "default.General.heap.committed",
               "precision": "default",
               "refId": "C",
               "templatedHost": ""
@@ -421,7 +421,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.non-heap.max",
+              "metric": "default.General.non-heap.max",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
@@ -432,7 +432,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.non-heap.used",
+              "metric": "default.General.non-heap.used",
               "precision": "default",
               "refId": "B",
               "templatedHost": ""
@@ -443,7 +443,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.non-heap.committed",
+              "metric": "default.General.non-heap.committed",
               "precision": "default",
               "refId": "C",
               "templatedHost": ""
@@ -571,7 +571,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 18,
+  "version": 19,
   "links": [
     {
       "asDropdown": true,
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json
index 91ab4ae..b33a608 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-hiverserver2.json
@@ -33,180 +33,6 @@
       "title": "New row"
     },
     {
-      "collapse": false,
-      "editable": true,
-      "height": "250px",
-      "panels": [
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": null,
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "leftLogBase": 1,
-            "leftMax": null,
-            "leftMin": 0,
-            "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": 9,
-          "isNew": true,
-          "leftYAxisLabel": "",
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "aggregator": "avg",
-              "alias": "typical",
-              "app": "hiveserver2",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": "default.General.api_get_all_databases_75thpercentile",
-              "precision": "default",
-              "refId": "A",
-              "templatedHost": ""
-            },
-            {
-              "aggregator": "max",
-              "alias": "max",
-              "app": "hiveserver2",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": 
"default.General.api_get_all_databases_999thpercentile",
-              "precision": "default",
-              "refId": "B",
-              "templatedHost": ""
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "API call times - Health Check roundtrip 
(get_all_databases)",
-          "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "x-axis": true,
-          "y-axis": true,
-          "y_formats": [
-            "ms",
-            "short"
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": null,
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "leftLogBase": 1,
-            "leftMax": null,
-            "leftMin": 0,
-            "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": 19,
-          "isNew": true,
-          "leftYAxisLabel": "",
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "aggregator": "avg",
-              "alias": "typical",
-              "app": "hiveserver2",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": 
"default.General.api_get_partitions_by_names_75thpercentile",
-              "precision": "default",
-              "refId": "C",
-              "templatedHost": ""
-            },
-            {
-              "aggregator": "max",
-              "alias": "max",
-              "app": "hiveserver2",
-              "downsampleAggregator": "avg",
-              "errors": {},
-              "metric": 
"default.General.api_get_partitions_by_names_999thpercentile",
-              "precision": "default",
-              "refId": "D",
-              "templatedHost": ""
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "API call times - Moderate size call 
(get_partitions_by_names)",
-          "tooltip": {
-            "shared": true,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "x-axis": true,
-          "y-axis": true,
-          "y_formats": [
-            "ms",
-            "short"
-          ]
-        }
-      ],
-      "showTitle": true,
-      "title": "API Times"
-    },
-    {
       "collapse": true,
       "editable": true,
       "height": "250px",
@@ -433,7 +259,7 @@
               "app": "hiveserver2",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.memory.non-heap.used",
+                "metric": "default.General.memory.non-heap.used",
               "precision": "default",
               "refId": "B",
               "templatedHost": ""
@@ -777,7 +603,7 @@
   },
   "refresh": false,
   "schemaVersion": 8,
-  "version": 52,
+  "version": 53,
   "links": [
     {
       "asDropdown": true,
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-home.json
index 9cc50a6..44b0b68 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-home.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hive-home.json
@@ -75,7 +75,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.init_total_count_dbs",
+              "metric": "default.General.total_count_dbs",
               "precision": "default",
               "refId": "A"
             }
@@ -131,7 +131,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.init_total_count_tables",
+              "metric": "default.General.total_count_tables",
               "precision": "default",
               "refId": "A"
             }
@@ -187,7 +187,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.init_total_count_partitions",
+              "metric": "default.General.total_count_partitions",
               "precision": "default",
               "refId": "A"
             }
@@ -263,7 +263,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.api_create_table_count",
+              "metric": "default.General.api_create_table_req_count",
               "precision": "default",
               "refId": "B"
             },
@@ -433,7 +433,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.heap.max",
+              "metric": "default.General.heap.max",
               "precision": "default",
               "refId": "A"
             },
@@ -444,7 +444,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.heap.used",
+              "metric": "default.General.heap.used",
               "precision": "default",
               "refId": "B"
             },
@@ -455,7 +455,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.heap.committed",
+              "metric": "default.General.heap.committed",
               "precision": "default",
               "refId": "C"
             }
@@ -621,7 +621,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.non-heap.max",
+              "metric": "default.General.non-heap.max",
               "precision": "default",
               "refId": "A"
             },
@@ -632,7 +632,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.non-heap.used",
+              "metric": "default.General.non-heap.used",
               "precision": "default",
               "refId": "B"
             },
@@ -643,7 +643,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "hosts": "",
-              "metric": "default.General.memory.non-heap.committed",
+              "metric": "default.General.non-heap.committed",
               "precision": "default",
               "refId": "C"
             }
@@ -954,7 +954,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "default.General.api_get_all_databases_75thpercentile",
+              "metric": "default.General.api_get_databases_75thpercentile",
               "precision": "default",
               "refId": "A"
             },
@@ -964,7 +964,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": 
"default.General.api_get_all_databases_999thpercentile",
+              "metric": "default.General.api_get_databases_999thpercentile",
               "precision": "default",
               "refId": "B"
             }
@@ -1033,7 +1033,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": 
"default.General.api_get_partitions_by_names_75thpercentile",
+              "metric": "default.General.api_get_partitions_75thpercentile",
               "precision": "default",
               "refId": "A"
             },
@@ -1043,7 +1043,7 @@
               "app": "hivemetastore",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": 
"default.General.api_get_partitions_by_names_999thpercentile",
+              "metric": "default.General.api_get_partitions_999thpercentile",
               "precision": "default",
               "refId": "B"
             }
@@ -1105,7 +1105,7 @@
     "list": []
   },
   "schemaVersion": 8,
-  "version": 51,
+  "version": 52,
   "links": [
     {
       "asDropdown": true,
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt
index 8b7a893..c5c72a3 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt
@@ -38,10 +38,8 @@ default.General.api_drop_table_stddev
 default.General.api_get_all_databases_15min_rate
 default.General.api_get_all_databases_1min_rate
 default.General.api_get_all_databases_5min_rate
-default.General.api_get_all_databases_75thpercentile
 default.General.api_get_all_databases_95thpercentile
 default.General.api_get_all_databases_98thpercentile
-default.General.api_get_all_databases_999thpercentile
 default.General.api_get_all_databases_99thpercentile
 default.General.api_get_all_databases_count
 default.General.api_get_all_databases_max
@@ -118,15 +116,20 @@ default.General.buffers.mapped.count
 default.General.buffers.mapped.used
 default.General.classLoading.loaded
 default.General.classLoading.unloaded
+default.General.create_total_count_partitions
 default.General.create_total_count_tables
 default.General.delete_total_count_tables
 default.General.gc.PS-MarkSweep.count
 default.General.gc.PS-MarkSweep.time
 default.General.gc.PS-Scavenge.count
 default.General.gc.PS-Scavenge.time
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
+default.General.active_calls_api_hs2_operation_INITIALIZED
+default.General.active_calls_api_hs2_operation_PENDING
+default.General.active_calls_api_hs2_operation_RUNNING
+default.General.api_hs2_operation_INITIALIZED_count
+default.General.hs2_completed_operation_CLOSED
+default.General.hs2_completed_operation_ERROR
+default.General.hs2_completed_operation_FINISHED
 default.General.jvm.pause.extraSleepTime
 default.General.memory.heap.committed
 default.General.memory.heap.init

Reply via email to