From 4747512666ba92bdf3dbff0ec9988368432f0cab Mon Sep 17 00:00:00 2001 From: skumar34 Date: Fri, 28 Feb 2025 20:02:10 +0530 Subject: [PATCH] AMBARI-26313: Change metrics names in grafana dashboards as per the GC used in JDK17 --- .../AMBARI_METRICS/3.0.0/metrics.json | 32 +- .../BIGTOP/grafana-hbase-regionservers.json | 12 +- .../BIGTOP/grafana-hdfs-datanodes.json | 365 ++++++++++++++---- .../BIGTOP/grafana-hdfs-namenodes.json | 30 +- .../default/grafana-ambari-server.json | 18 +- .../grafana-ams-hbase-regionservers.json | 18 +- .../files/service-metrics/AMBARI_METRICS.txt | 8 +- .../package/files/service-metrics/HBASE.txt | 16 +- .../package/files/service-metrics/HDFS.txt | 8 +- .../BIGTOP/3.2.0/services/HBASE/metrics.json | 64 +-- .../BIGTOP/3.2.0/services/HDFS/metrics.json | 88 ++--- .../BIGTOP/3.2.0/services/HDFS/widgets.json | 12 +- .../resources/hbase_hbasemaster_jmx_2.json | 4 +- .../data/widget_layouts/HDFS_SUMMARY.json | 4 +- .../addon-services/ONEFS/1.0.0/metrics.json | 16 +- 15 files changed, 463 insertions(+), 232 deletions(-) diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json index 7b7563b5d96..639b338cb7d 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metrics.json @@ -150,13 +150,13 @@ "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/hbase/jvm/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/hbase/jvm/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -165,13 +165,13 @@ "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/hbase/jvm/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/hbase/jvm/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -1384,13 +1384,13 @@ "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/hbase/jvm/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/hbase/jvm/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -1399,13 +1399,13 @@ "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/hbase/jvm/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/hbase/jvm/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/hbase/jvm/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hbase-regionservers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hbase-regionservers.json index 5434358dfb2..d15107f4e69 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hbase-regionservers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hbase-regionservers.json @@ -8567,7 +8567,7 @@ "app": "hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcCountParNew", + "metric": "jvm.RegionServer.JvmMetrics.GcCountG1 Young Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -8637,7 +8637,7 @@ "app": "hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep", + "metric": "jvm.RegionServer.JvmMetrics.GcCountG1 Old Generation", "precision": "minutes", "refId": "A", "transform": "rate", @@ -8786,7 +8786,7 @@ "app": "hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisParNew", + "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Young Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -8795,7 +8795,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Times ParNew /s", + "title": "GC Times G1 Young Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" @@ -8856,7 +8856,7 @@ "app": "hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Old Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -8865,7 +8865,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Times CMS /s", + "title": "GC Times G1 Old Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-datanodes.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-datanodes.json index 6b4254192b5..e4e9dfd9643 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-datanodes.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-datanodes.json @@ -786,7 +786,7 @@ "title": "Packet Round Trip" }, { - "collapse": true, + "collapse": false, "editable": true, "height": "250px", "panels": [ @@ -800,7 +800,7 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": 0, + "leftMin": null, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -809,7 +809,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 6, + "id": 15, "isNew": true, "legend": { "avg": false, @@ -839,16 +839,15 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "dfs.datanode.DatanodeNetworkErrors", + "metric": "rpc.rpc.RpcQueueTimeAvgTime", "precision": "default", "refId": "A", - "templatedHost": "", - "transform": "rate" + "templatedHost": "" } ], "timeFrom": null, "timeShift": null, - "title": "Network Errors", + "title": "RPC Service Port Queue Time", "tooltip": { "shared": false, "value_type": "cumulative" @@ -857,7 +856,7 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", "short" ] }, @@ -880,7 +879,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 11, + "id": 16, "isNew": true, "legend": { "avg": false, @@ -910,16 +909,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcCount", + "metric": "rpc.rpc.RpcQueueTimeNumOps", "precision": "default", "refId": "A", - "templatedHost": "", - "transform": "rate" + "transform": "rate", + "templatedHost": "" } ], "timeFrom": null, "timeShift": null, - "title": "GC Count", + "title": "RPC Service Port Queue Num Ops", "tooltip": { "shared": false, "value_type": "cumulative" @@ -934,10 +933,10 @@ } ], "showTitle": true, - "title": "Network Errors / GC Count" + "title": "RPC Service Port Queue & Num Ops" }, { - "collapse": true, + "collapse": false, "editable": true, "height": "250px", "panels": [ @@ -951,7 +950,7 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": 0, + "leftMin": null, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -960,7 +959,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 12, + "id": 17, "isNew": true, "legend": { "avg": false, @@ -990,16 +989,15 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcTimeMillis", + "metric": "rpc.rpc.RpcProcessingTimeAvgTime", "precision": "default", "refId": "A", - "templatedHost": "", - "transform": "rate" + "templatedHost": "" } ], "timeFrom": null, "timeShift": null, - "title": "GC Time", + "title": "RPC Service Port Processing Time", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1031,7 +1029,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 13, + "id": 18, "isNew": true, "legend": { "avg": false, @@ -1061,16 +1059,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metric": "rpc.rpc.RpcProcessingTimeNumOps", "precision": "default", "refId": "A", - "templatedHost": "", - "transform": "rate" + "transform": "rate", + "templatedHost": "" } ], "timeFrom": null, "timeShift": null, - "title": "GC Time ParNew", + "title": "RPC Service Port Processing Num Ops", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1079,13 +1077,13 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "ms", + "short", "short" ] } ], "showTitle": true, - "title": "GC Time / GC Time ParNew" + "title": "RPC Service Port Processing Time & Num Ops" }, { "collapse": false, @@ -1111,7 +1109,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 17, + "id": 19, "isNew": true, "legend": { "avg": false, @@ -1141,7 +1139,7 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.RpcQueueTimeAvgTime", + "metric": "rpc.rpc.CallQueueLength", "precision": "default", "refId": "A", "templatedHost": "" @@ -1149,7 +1147,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Queue Time", + "title": "RPC Service Port Call Queue Length", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1158,7 +1156,7 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "ms", + "short", "short" ] }, @@ -1172,7 +1170,7 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": 0, + "leftMin": null, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -1181,7 +1179,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 18, + "id": 20, "isNew": true, "legend": { "avg": false, @@ -1211,16 +1209,15 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.RpcQueueTimeNumOps", + "metric": "rpc.rpc.RpcSlowCalls", "precision": "default", "refId": "A", - "transform": "rate", "templatedHost": "" } ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Queue Num Ops", + "title": "RPC Service Port Slow Calls", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1235,10 +1232,10 @@ } ], "showTitle": true, - "title": "RPC Service Port Queue & Num Ops" + "title": "RPC Service Port Call Queue Length & Slow Calls" }, { - "collapse": false, + "collapse": true, "editable": true, "height": "250px", "panels": [ @@ -1252,7 +1249,7 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": null, + "leftMin": 0, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -1261,7 +1258,87 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 19, + "id": 6, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "max": false, + "min": false, + "show": false, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 12, + "stack": false, + "steppedLine": false, + "targets": [ + { + "aggregator": "avg", + "app": "datanode", + "downsampleAggregator": "avg", + "errors": {}, + "metric": "dfs.datanode.DatanodeNetworkErrors", + "precision": "default", + "refId": "A", + "templatedHost": "", + "transform": "rate" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Network Errors", + "tooltip": { + "shared": false, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ] + } + ], + "showTitle": true, + "title": "Network Errors" + }, + { + "collapse": true, + "editable": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 0, + "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": 11, "isNew": true, "legend": { "avg": false, @@ -1291,15 +1368,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.RpcProcessingTimeAvgTime", + "metric": "jvm.JvmMetrics.GcCount", "precision": "default", "refId": "A", - "templatedHost": "" + "templatedHost": "", + "transform": "rate" } ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Processing Time", + "title": "GC Count", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1308,7 +1386,7 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "ms", + "short", "short" ] }, @@ -1331,7 +1409,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 20, + "id": 12, "isNew": true, "legend": { "avg": false, @@ -1361,16 +1439,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.RpcProcessingTimeNumOps", + "metric": "jvm.JvmMetrics.GcTimeMillis", "precision": "default", "refId": "A", - "transform": "rate", - "templatedHost": "" + "templatedHost": "", + "transform": "rate" } ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Processing Num Ops", + "title": "GC Time", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1379,16 +1457,16 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", "short" ] } ], "showTitle": true, - "title": "RPC Service Port Processing Time & Num Ops" + "title": "GC Count & GC Time" }, { - "collapse": false, + "collapse": true, "editable": true, "height": "250px", "panels": [ @@ -1402,7 +1480,7 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": null, + "leftMin": 0, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -1411,7 +1489,7 @@ "threshold2": null, "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 21, + "id": 13, "isNew": true, "legend": { "avg": false, @@ -1441,15 +1519,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.CallQueueLength", + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "precision": "default", "refId": "A", - "templatedHost": "" + "templatedHost": "", + "transform": "rate" } ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Call Queue Length", + "title": "GC Count Young Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1458,7 +1537,7 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", "short" ] }, @@ -1472,7 +1551,87 @@ "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": 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": 21, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "max": false, + "min": false, + "show": false, + "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", + "app": "datanode", + "downsampleAggregator": "avg", + "errors": {}, + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", + "precision": "default", + "refId": "A", + "templatedHost": "", + "transform": "rate" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "GC Time Young Generation", + "tooltip": { + "shared": false, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "ms", + "short" + ] + } + ], + "showTitle": true, + "title": "GC Young Generation" + }, + { + "collapse": true, + "editable": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 0, + "grid": { + "leftLogBase": 1, + "leftMax": null, + "leftMin": 0, "rightLogBase": 1, "rightMax": null, "rightMin": null, @@ -1511,15 +1670,16 @@ "app": "datanode", "downsampleAggregator": "avg", "errors": {}, - "metric": "rpc.rpc.RpcSlowCalls", + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "precision": "default", "refId": "A", - "templatedHost": "" + "templatedHost": "", + "transform": "rate" } ], "timeFrom": null, "timeShift": null, - "title": "RPC Service Port Slow Calls", + "title": "GC Count Old Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -1528,13 +1688,84 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", + "short" + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": null, + "editable": true, + "error": false, + "fill": 0, + "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": 23, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "max": false, + "min": false, + "show": false, + "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", + "app": "datanode", + "downsampleAggregator": "avg", + "errors": {}, + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", + "precision": "default", + "refId": "A", + "templatedHost": "", + "transform": "rate" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "GC Time Old Generation", + "tooltip": { + "shared": false, + "value_type": "cumulative" + }, + "type": "graph", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "ms", "short" ] } ], "showTitle": true, - "title": "RPC Service Port Call Queue Length & Slow Calls" + "title": "GC Old Generation" } ], "time": { @@ -1755,7 +1986,7 @@ }, "refresh": false, "schemaVersion": 8, - "version": 7, + "version": 6, "links": [ { "asDropdown": true, @@ -1768,4 +1999,4 @@ "type": "dashboards" } ] -} +} \ No newline at end of file diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-namenodes.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-namenodes.json index 62c1c27a02e..4e3dbf270b5 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-namenodes.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/BIGTOP/grafana-hdfs-namenodes.json @@ -482,7 +482,7 @@ } ], "showTitle": true, - "title": "GC Count & Time" + "title": "GC Count & GC Time" }, { "collapse": false, @@ -538,7 +538,7 @@ "app": "namenode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcCountParNew", + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -547,7 +547,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Count ParNew", + "title": "GC Count Young Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -556,7 +556,7 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", "short" ] }, @@ -609,7 +609,7 @@ "app": "namenode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -618,7 +618,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Time ParNew", + "title": "GC Time Young Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -633,7 +633,7 @@ } ], "showTitle": true, - "title": "GC Par New" + "title": "GC Young Generation" }, { "collapse": false, @@ -689,7 +689,7 @@ "app": "namenode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcTotalExtraSleepTime", + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -698,7 +698,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Extra Sleep Time", + "title": "GC Count Old Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -760,7 +760,7 @@ "app": "namenode", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.JvmMetrics.GcNumWarnThresholdExceeded", + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "precision": "default", "refId": "A", "transform": "rate", @@ -769,7 +769,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Warning Threshold Exceeded Count", + "title": "GC Time Old Generation", "tooltip": { "shared": false, "value_type": "cumulative" @@ -778,13 +778,13 @@ "x-axis": true, "y-axis": true, "y_formats": [ - "short", + "ms", "short" ] } ], "showTitle": true, - "title": "GC Extra Sleep & Warning Threshold Exceeded" + "title": "GC Old Generation" }, { "collapse": false, @@ -1480,7 +1480,7 @@ "list": [] }, "schemaVersion": 8, - "version": 87, + "version": 86, "links": [ { "asDropdown": true, @@ -1493,4 +1493,4 @@ "type": "dashboards" } ] -} +} \ No newline at end of file diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json index 96b47411059..7c12a2a82d6 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ambari-server.json @@ -284,7 +284,7 @@ "app": "ambari_server", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.gc.ParNew.count", + "metric": "jvm.gc.G1-Young-Generation.count", "precision": "default", "refId": "A", "seriesAggregator": "none", @@ -293,7 +293,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Count Par New /s", + "title": "GC Count Young Generation /s", "tooltip": { "shared": true, "value_type": "cumulative" @@ -354,7 +354,7 @@ "app": "ambari_server", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.gc.ParNew.time", + "metric": "jvm.gc.G1-Young-Generation.time", "precision": "default", "refId": "A", "seriesAggregator": "none", @@ -363,7 +363,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Time Par New /s", + "title": "GC Time Young Generation /s", "tooltip": { "shared": true, "value_type": "cumulative" @@ -424,7 +424,7 @@ "app": "ambari_server", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.gc.ConcurrentMarkSweep.count", + "metric": "jvm.gc.G1-Old-Generation.count", "precision": "default", "refId": "A", "seriesAggregator": "none", @@ -433,7 +433,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Count CMS /s", + "title": "GC Count Old Generation /s", "tooltip": { "shared": true, "value_type": "cumulative" @@ -494,7 +494,7 @@ "app": "ambari_server", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.gc.ConcurrentMarkSweep.time", + "metric": "jvm.gc.G1-Old-Generation.time", "precision": "default", "refId": "A", "seriesAggregator": "none", @@ -503,7 +503,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Time CMS /s", + "title": "GC Time Old Generation /s", "tooltip": { "shared": true, "value_type": "cumulative" @@ -714,7 +714,7 @@ "name": "cluster", "options": [], "query": "cluster", - "refresh": 1, + "refresh": true, "regex": "", "type": "query" }, diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json index c05af139dd6..fb5f0d7742f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/grafana-dashboards/default/grafana-ams-hbase-regionservers.json @@ -8567,7 +8567,7 @@ "app": "ams-hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcCountParNew", + "metric": "jvm.RegionServer.JvmMetrics.GcCountG1 Young Generation", "precision": "default", "refId": "A", "templatedHost": "", @@ -8576,7 +8576,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Count ParNew /s", + "title": "GC Count G1 Young Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" @@ -8637,7 +8637,7 @@ "app": "ams-hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep", + "metric": "jvm.RegionServer.JvmMetrics.GcCountG1 Old Generation", "precision": "minutes", "refId": "A", "templatedHost": "", @@ -8646,7 +8646,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Count CMS /s", + "title": "GC Count Old Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" @@ -8786,7 +8786,7 @@ "app": "ams-hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisParNew", + "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Young Generation", "precision": "default", "refId": "A", "templatedHost": "", @@ -8795,7 +8795,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Times ParNew /s", + "title": "GC Times G1 Young Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" @@ -8856,7 +8856,7 @@ "app": "ams-hbase", "downsampleAggregator": "avg", "errors": {}, - "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metric": "jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Old Generation", "precision": "default", "refId": "A", "templatedHost": "", @@ -8865,7 +8865,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "GC Times CMS /s", + "title": "GC Times G1 Old Generation /s", "tooltip": { "shared": false, "value_type": "cumulative" @@ -9028,7 +9028,7 @@ "name": "cluster", "options": [], "query": "cluster", - "refresh": 1, + "refresh": true, "regex": "", "type": "query" }, diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt index 9c0e20bb4b5..456a28f7dee 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/AMBARI_METRICS.txt @@ -3,8 +3,8 @@ regionserver.WAL.SyncTime_num_ops regionserver.WAL.appendCount regionserver.WAL.slowAppendCount jvm.JvmMetrics.GcTimeMillis -jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep -jvm.JvmMetrics.GcTimeMillisParNew +jvm.JvmMetrics.GcTimeMillisG1 Old Generation +jvm.JvmMetrics.GcTimeMillisG1 Young Generation ugi.UgiMetrics.GetGroupsAvgTime ugi.UgiMetrics.GetGroupsNumOps ugi.UgiMetrics.LoginFailureNumOps @@ -196,7 +196,7 @@ regionserver.Server.checkMutateFailedCount regionserver.Server.checkMutatePassedCount regionserver.Server.compactionQueueLength regionserver.Server.flushQueueLength -jvm.JvmMetrics.GcCountConcurrentMarkSweep +jvm.JvmMetrics.GcCountG1 Old Generation regionserver.Server.hlogFileCount regionserver.Server.hlogFileSize regionserver.Server.memStoreSize @@ -227,7 +227,7 @@ regionserver.WAL.AppendSize_max regionserver.WAL.AppendSize_mean regionserver.WAL.AppendSize_median regionserver.WAL.SyncTime_median -jvm.JvmMetrics.GcCountParNew +jvm.JvmMetrics.GcCountG1 Young Generation regionserver.WAL.AppendSize_min regionserver.WAL.AppendSize_num_ops regionserver.WAL.SyncTime_max diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt index dbbd706a394..a65a4e4ab13 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HBASE.txt @@ -3,8 +3,8 @@ regionserver.WAL.SyncTime_num_ops regionserver.WAL.appendCount regionserver.WAL.slowAppendCount jvm.JvmMetrics.GcTimeMillis -jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep -jvm.JvmMetrics.GcTimeMillisParNew +jvm.JvmMetrics.GcTimeMillisG1 Old Generation +jvm.JvmMetrics.GcTimeMillisG1 Young Generation ugi.UgiMetrics.GetGroupsAvgTime ugi.UgiMetrics.GetGroupsNumOps ugi.UgiMetrics.LoginFailureNumOps @@ -196,7 +196,7 @@ regionserver.Server.checkMutateFailedCount regionserver.Server.checkMutatePassedCount regionserver.Server.compactionQueueLength regionserver.Server.flushQueueLength -jvm.JvmMetrics.GcCountConcurrentMarkSweep +jvm.JvmMetrics.GcCountG1 Old Generation regionserver.Server.hlogFileCount regionserver.Server.hlogFileSize regionserver.Server.memStoreSize @@ -227,7 +227,7 @@ regionserver.WAL.AppendSize_max regionserver.WAL.AppendSize_mean regionserver.WAL.AppendSize_median regionserver.WAL.SyncTime_median -jvm.JvmMetrics.GcCountParNew +jvm.JvmMetrics.GcCountG1 Young Generation regionserver.WAL.AppendSize_min regionserver.WAL.AppendSize_num_ops regionserver.WAL.SyncTime_max @@ -266,7 +266,7 @@ regionserver.WAL.SyncTime_mean regionserver.WAL.AppendSize_99th_percentile jvm.JvmMetrics.GcTimeMillis regionserver.WAL.AppendSize_75th_percentile -jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep +jvm.JvmMetrics.GcTimeMillisG1 Old Generation regionserver.WAL.SyncTime_max regionserver.Server.Increment_median regionserver.Server.updatesBlockedTime @@ -276,7 +276,7 @@ regionserver.WAL.lowReplicaRollRequest ugi.UgiMetrics.GetGroupsNumOps regionserver.Server.storeFileSize regionserver.Server.Increment_95th_percentile -jvm.JvmMetrics.GcTimeMillisParNew +jvm.JvmMetrics.GcTimeMillisG1 Young Generation ugi.UgiMetrics.LoginFailureAvgTime ugi.UgiMetrics.LoginFailureNumOps regionserver.Server.storeFileCount @@ -566,7 +566,7 @@ regionserver.Server.compactionQueueLength regionserver.Server.flushedCellsSize regionserver.Server.memStoreSize regionserver.Server.mutationsWithoutWALSize -jvm.JvmMetrics.GcCountConcurrentMarkSweep +jvm.JvmMetrics.GcCountG1 Old Generation regionserver.Server.regionServerStartTime regionserver.Server.slowDeleteCount regionserver.Server.slowIncrementCount @@ -584,5 +584,5 @@ regionserver.Server.Replay_95th_percentile regionserver.WAL.AppendTime_95th_percentile regionserver.WAL.AppendTime_median regionserver.WAL.AppendTime_max -jvm.JvmMetrics.GcCountParNew +jvm.JvmMetrics.GcCountG1 Young Generation regionserver.WAL.AppendTime_mean diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt index 14956caafc6..738a9b39a62 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/package/files/service-metrics/HDFS.txt @@ -193,13 +193,13 @@ dfs.namenode.TransactionsAvgTime dfs.namenode.TransactionsBatchedInSync dfs.namenode.TransactionsNumOps jvm.JvmMetrics.GcCount -jvm.JvmMetrics.GcCountConcurrentMarkSweep -jvm.JvmMetrics.GcCountParNew +jvm.JvmMetrics.GcCountG1 Old Generation +jvm.JvmMetrics.GcCountG1 Young Generation jvm.JvmMetrics.GcNumInfoThresholdExceeded jvm.JvmMetrics.GcNumWarnThresholdExceeded jvm.JvmMetrics.GcTimeMillis -jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep -jvm.JvmMetrics.GcTimeMillisParNew +jvm.JvmMetrics.GcTimeMillisG1 Old Generation +jvm.JvmMetrics.GcTimeMillisG1 Young Generation jvm.JvmMetrics.GcTotalExtraSleepTime jvm.JvmMetrics.LogError jvm.JvmMetrics.LogFatal diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metrics.json b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metrics.json index 42cdbe970be..0ee4b8949b2 100755 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metrics.json +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metrics.json @@ -683,23 +683,23 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -2272,23 +2272,23 @@ "pointInTime": false, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": false, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": false, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": false, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": false, "temporal": true }, @@ -3547,23 +3547,23 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric":"jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric":"jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric":"jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric":"jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric":"jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric":"jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric":"jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric":"jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -6599,23 +6599,23 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric":"jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric":"jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric":"jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric":"jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric":"jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric":"jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric":"jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric":"jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metrics.json b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metrics.json index 3b80462ab66..36f181f6e62 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metrics.json +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metrics.json @@ -1027,13 +1027,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -1047,13 +1047,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -1976,13 +1976,13 @@ "pointInTime": true, "temporal": false }, - "metrics/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/GcTimeMillisG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": false }, - "metrics/jvm/GcCountConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/GcCountG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": false }, @@ -2565,13 +2565,13 @@ "pointInTime": false, "temporal": true }, - "metrics/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": false, "temporal": true }, - "metrics/jvm/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": false, "temporal": true }, @@ -3047,13 +3047,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -3067,13 +3067,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -3921,13 +3921,13 @@ "pointInTime": true, "temporal": false }, - "metrics/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/GcTimeMillisG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": false }, - "metrics/jvm/GcCountConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/GcCountG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": false }, @@ -4646,13 +4646,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -4666,13 +4666,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -5503,13 +5503,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcCountParNew": { - "metric": "jvm.JvmMetrics.GcCountParNew", + "metrics/jvm/JvmMetrics/GcCountG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcCountG1 Young Generation", "pointInTime": true, "temporal": true }, @@ -5523,13 +5523,13 @@ "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep": { - "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": true }, - "metrics/jvm/JvmMetrics/GcTimeMillisParNew": { - "metric": "jvm.JvmMetrics.GcTimeMillisParNew", + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Young Generation": { + "metric": "jvm.JvmMetrics.GcTimeMillisG1 Young Generation", "pointInTime": true, "temporal": true }, diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/widgets.json b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/widgets.json index 57d11b868b7..7e85ba49e9b 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/widgets.json +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/widgets.json @@ -19,8 +19,8 @@ "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" }, { - "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate", - "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep._rate", + "name": "jvm.JvmMetrics.GcCountG1 Old Generation._rate", + "metric_path": "metrics/jvm/GcCountG1 Old Generation._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -33,7 +33,7 @@ }, { "name": "GC count of type major collection", - "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}" + "value": "${jvm.JvmMetrics.GcCountG1 Old Generation._rate}" } ], "properties": { @@ -48,8 +48,8 @@ "is_visible": true, "metrics": [ { - "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate", - "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep._rate", + "name": "jvm.JvmMetrics.GcTimeMillisG1 Old Generation._rate", + "metric_path": "metrics/jvm/GcTimeMillisG1 Old Generation._rate", "service_name": "HDFS", "component_name": "NAMENODE", "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" @@ -58,7 +58,7 @@ "values": [ { "name": "GC time in major collection", - "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}" + "value": "${jvm.JvmMetrics.GcTimeMillisG1 Old Generation._rate}" } ], "properties": { diff --git a/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json b/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json index 372d12c80aa..4e73ed4ecca 100644 --- a/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json +++ b/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json @@ -327,8 +327,8 @@ "MemMaxM" : 1021.9375, "GcCountCopy" : 32, "GcTimeMillisCopy" : 190, - "GcCountConcurrentMarkSweep" : 0, - "GcTimeMillisConcurrentMarkSweep" : 0, + "GcCountG1 Old Generation" : 0, + "GcTimeMillisG1 Old Generation" : 0, "GcCount" : 32, "GcTimeMillis" : 190, "ThreadsNew" : 0, diff --git a/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json b/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json index c76737fc661..c1ec2369dec 100644 --- a/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json +++ b/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json @@ -15,7 +15,7 @@ { "WidgetInfo" : { "id" : 4, - "metrics" : "[{\"name\":\"jvm.JvmMetrics.GcCount\",\"metric_path\":\"metrics/jvm/gcCount\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"},{\"name\":\"jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep\",\"metric_path\":\"metrics/jvm/GcTimeMillisConcurrentMarkSweep\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"},{\"name\":\"jvm.JvmMetrics.GcCountConcurrentMarkSweep\",\"metric_path\":\"metrics/jvm/GcCountConcurrentMarkSweep\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"}]", + "metrics" : "[{\"name\":\"jvm.JvmMetrics.GcCount\",\"metric_path\":\"metrics/jvm/gcCount\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"},{\"name\":\"jvm.JvmMetrics.GcTimeMillisG1 Old Generation\",\"metric_path\":\"metrics/jvm/GcTimeMillisG1 Old Generation\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"},{\"name\":\"jvm.JvmMetrics.GcCountG1 Old Generation\",\"metric_path\":\"metrics/jvm/GcCountG1 Old Generation\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"}]", "author" : "ambari", "description" : "This widget shows JVM Garbage collection statistics for Active NameNode", "scope" : "CLUSTER", @@ -24,7 +24,7 @@ "widget_type" : "GRAPH", "time_created" : 1429906622107, "display_name" : "GC Statistics", - "values" : "[{\"name\":\"GC total count\",\"value\":\"${jvm.JvmMetrics.GcCount}\"},{\"name\":\"GC time in major collection\",\"value\":\"${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}\"},{\"name\":\"GC count of type major collection\",\"value\":\"${jvm.JvmMetrics.GcCountConcurrentMarkSweep}\"}]", + "values" : "[{\"name\":\"GC total count\",\"value\":\"${jvm.JvmMetrics.GcCount}\"},{\"name\":\"GC time in major collection\",\"value\":\"${jvm.JvmMetrics.GcTimeMillisG1 Old Generation}\"},{\"name\":\"GC count of type major collection\",\"value\":\"${jvm.JvmMetrics.GcCountG1 Old Generation}\"}]", "cluster_name" : "c1" } }, diff --git a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metrics.json b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metrics.json index c0647f308a6..03ab5c585fa 100644 --- a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metrics.json +++ b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/metrics.json @@ -58,13 +58,13 @@ "pointInTime": true, "temporal": false }, - "metrics/jvm/GcTimeMillisConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisConcurrentMarkSweep", + "metrics/jvm/GcTimeMillisG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcTimeMillisG1 Old Generation", "pointInTime": true, "temporal": false }, - "metrics/jvm/GcCountConcurrentMarkSweep": { - "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountConcurrentMarkSweep", + "metrics/jvm/GcCountG1 Old Generation": { + "metric": "Hadoop:service=NameNode,name=JvmMetrics.GcCountG1 Old Generation", "pointInTime": true, "temporal": false }, @@ -125,10 +125,10 @@ "temporal": true, "amsHostMetric" : true }, - "metrics/jvm/JvmMetrics/GcCountConcurrentMarkSweep" : { + "metrics/jvm/JvmMetrics/GcCountG1 Old Generation" : { "temporal" : true, "pointInTime" : true, - "metric" : "jvm.JvmMetrics.GcCountConcurrentMarkSweep" + "metric" : "jvm.JvmMetrics.GcCountG1 Old Generation" }, "metrics/cpu/cpu_nice" : { "temporal" : true, @@ -230,10 +230,10 @@ "pointInTime" : false, "metric" : "rpc.rpc.RpcProcessingTimeAvgTime" }, - "metrics/jvm/JvmMetrics/GcTimeMillisConcurrentMarkSweep" : { + "metrics/jvm/JvmMetrics/GcTimeMillisG1 Old Generation" : { "temporal" : true, "pointInTime" : true, - "metric" : "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep" + "metric" : "jvm.JvmMetrics.GcTimeMillisG1 Old Generation" }, "metrics/memory/swap_total" : { "temporal" : true,