Skip to content

Commit 8be1fe4

Browse files
sandeep318kumarsandeep318kumar
committed
AMBARI-26313: Change metrics names in grafana dashboards as per the GC used in JDK17
1 parent 796d071 commit 8be1fe4

File tree

11 files changed

+59
-58
lines changed

11 files changed

+59
-58
lines changed

‎ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ jvm.Master.JvmMetrics.ThreadsTerminated
55
jvm.Master.JvmMetrics.ThreadsTimedWaiting
66
jvm.Master.JvmMetrics.ThreadsWaiting
77
jvm.RegionServer.JvmMetrics.GcCount
8-
jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep
9-
jvm.RegionServer.JvmMetrics.GcCountParNew
8+
jvm.RegionServer.JvmMetrics.GcCountG1 Old Generation
9+
jvm.RegionServer.JvmMetrics.GcCountG1 Young Generation
1010
jvm.RegionServer.JvmMetrics.GcTimeMillis
11-
jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep
12-
jvm.RegionServer.JvmMetrics.GcTimeMillisParNew
11+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Old Generation
12+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Young Generation
1313
jvm.RegionServer.JvmMetrics.MemHeapCommittedM
1414
jvm.RegionServer.JvmMetrics.MemHeapMaxM
1515
jvm.RegionServer.JvmMetrics.MemHeapUsedM

‎ambari-metrics-timelineservice/conf/unix/metrics_whitelist

+12-12
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ io.IOMetrics.PercentileDecodingTime_30s99thPercentileLatency
202202
ipc.client.org.apache.hadoop.ipc.DecayRpcScheduler.Caller(*).Priority
203203
ipc.client.org.apache.hadoop.ipc.DecayRpcScheduler.Caller(*).Volume
204204
jvm.JvmMetrics.GcCount
205-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
206-
jvm.JvmMetrics.GcCountParNew
205+
jvm.JvmMetrics.GcCountG1 Old Generation
206+
jvm.JvmMetrics.GcCountG1 Young Generation
207207
jvm.JvmMetrics.GcNumWarnThresholdExceeded
208208
jvm.JvmMetrics.GcTimeMillis
209-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
210-
jvm.JvmMetrics.GcTimeMillisParNew
209+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
210+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
211211
jvm.JvmMetrics.GcTotalExtraSleepTime
212212
jvm.JvmMetrics.LogError
213213
jvm.JvmMetrics.LogFatal
@@ -234,11 +234,11 @@ jvm.Master.JvmMetrics.ThreadsTerminated
234234
jvm.Master.JvmMetrics.ThreadsTimedWaiting
235235
jvm.Master.JvmMetrics.ThreadsWaiting
236236
jvm.RegionServer.JvmMetrics.GcCount
237-
jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep
238-
jvm.RegionServer.JvmMetrics.GcCountParNew
237+
jvm.RegionServer.JvmMetrics.GcCountG1 Old Generation
238+
jvm.RegionServer.JvmMetrics.GcCountG1 Young Generation
239239
jvm.RegionServer.JvmMetrics.GcTimeMillis
240-
jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep
241-
jvm.RegionServer.JvmMetrics.GcTimeMillisParNew
240+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Old Generation
241+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Young Generation
242242
jvm.RegionServer.JvmMetrics.MemHeapCommittedM
243243
jvm.RegionServer.JvmMetrics.MemHeapMaxM
244244
jvm.RegionServer.JvmMetrics.MemHeapUsedM
@@ -253,10 +253,10 @@ jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting
253253
jvm.RegionServer.JvmMetrics.ThreadsWaiting
254254
jvm.daemon_thread_count
255255
jvm.file_descriptor_usage
256-
jvm.gc.ConcurrentMarkSweep.count
257-
jvm.gc.ConcurrentMarkSweep.time
258-
jvm.gc.ParNew.count
259-
jvm.gc.ParNew.time
256+
jvm.gc.G1 Old Generation.count
257+
jvm.gc.G1 Old Generation.time
258+
jvm.gc.G1 Young Generation.count
259+
jvm.gc.G1 Young Generation.time
260260
jvm.heap_usage
261261
jvm.memory.heap.committed
262262
jvm.memory.heap.max

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/AMBARI_SERVER.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jvm.buffers.mapped.capacity
55
jvm.buffers.mapped.count
66
jvm.buffers.mapped.used
77
jvm.file.open.descriptor.ratio
8-
jvm.gc.ConcurrentMarkSweep.count
9-
jvm.gc.ConcurrentMarkSweep.time
10-
jvm.gc.ParNew.count
11-
jvm.gc.ParNew.time
8+
jvm.gc.G1 Old Generation.count
9+
jvm.gc.G1 Old Generation.time
10+
jvm.gc.G1 Young Generation.count
11+
jvm.gc.G1 Young Generation.time
1212
jvm.memory.heap.committed
1313
jvm.memory.heap.init
1414
jvm.memory.heap.max

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ regionserver.WAL.SyncTime_min
22
regionserver.WAL.SyncTime_num_ops
33
regionserver.WAL.appendCount
44
regionserver.WAL.slowAppendCount
5-
jvm.JvmMetrics.GcCountParNew
5+
jvm.JvmMetrics.GcCountG1 Young Generation
66
jvm.JvmMetrics.GcTimeMillis
7-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
8-
jvm.JvmMetrics.GcTimeMillisParNew
7+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
8+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
99
ugi.UgiMetrics.GetGroupsAvgTime
1010
ugi.UgiMetrics.GetGroupsNumOps
1111
ugi.UgiMetrics.LoginFailureNumOps
@@ -197,7 +197,7 @@ regionserver.Server.checkMutateFailedCount
197197
regionserver.Server.checkMutatePassedCount
198198
regionserver.Server.compactionQueueLength
199199
regionserver.Server.flushQueueLength
200-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
200+
jvm.JvmMetrics.GcCountG1 Old Generation
201201
regionserver.Server.hlogFileCount
202202
regionserver.Server.hlogFileSize
203203
regionserver.Server.memStoreSize

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/DATANODE.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ dfs.datanode.WriteBlockOpNumOps
9595
dfs.datanode.WritesFromLocalClient
9696
dfs.datanode.WritesFromRemoteClient
9797
jvm.JvmMetrics.GcCount
98-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
99-
jvm.JvmMetrics.GcCountParNew
98+
jvm.JvmMetrics.GcCountG1 Old Generation
99+
jvm.JvmMetrics.GcCountG1 Young Generation
100100
jvm.JvmMetrics.GcNumInfoThresholdExceeded
101101
jvm.JvmMetrics.GcNumWarnThresholdExceeded
102102
jvm.JvmMetrics.GcTimeMillis
103-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
104-
jvm.JvmMetrics.GcTimeMillisParNew
103+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
104+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
105105
jvm.JvmMetrics.GcTotalExtraSleepTime
106106
jvm.JvmMetrics.LogError
107107
jvm.JvmMetrics.LogFatal

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ ipc.IPC.queueSize
2626
ipc.IPC.receivedBytes
2727
ipc.IPC.sentBytes
2828
jvm.Master.JvmMetrics.GcCount
29-
jvm.Master.JvmMetrics.GcCountConcurrentMarkSweep
30-
jvm.Master.JvmMetrics.GcCountParNew
29+
jvm.Master.JvmMetrics.GcCountG1 Old Generation
30+
jvm.Master.JvmMetrics.GcCountG1 Young Generation
3131
jvm.Master.JvmMetrics.GcTimeMillis
32-
jvm.Master.JvmMetrics.GcTimeMillisConcurrentMarkSweep
33-
jvm.Master.JvmMetrics.GcTimeMillisParNew
32+
jvm.Master.JvmMetrics.GcTimeMillisG1 Old Generation
33+
jvm.Master.JvmMetrics.GcTimeMillisG1 Young Generation
3434
jvm.Master.JvmMetrics.LogError
3535
jvm.Master.JvmMetrics.LogFatal
3636
jvm.Master.JvmMetrics.LogInfo

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_REGIONSERVER.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ ipc.IPC.queueSize
2626
ipc.IPC.receivedBytes
2727
ipc.IPC.sentBytes
2828
jvm.RegionServer.JvmMetrics.GcCount
29-
jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep
30-
jvm.RegionServer.JvmMetrics.GcCountParNew
29+
jvm.RegionServer.JvmMetrics.GcCountG1 Old Generation
30+
jvm.RegionServer.JvmMetrics.GcCountG1 Young Generation
3131
jvm.RegionServer.JvmMetrics.GcTimeMillis
32-
jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep
33-
jvm.RegionServer.JvmMetrics.GcTimeMillisParNew
32+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Old Generation
33+
jvm.RegionServer.JvmMetrics.GcTimeMillisG1 Young Generation
3434
jvm.RegionServer.JvmMetrics.LogError
3535
jvm.RegionServer.JvmMetrics.LogFatal
3636
jvm.RegionServer.JvmMetrics.LogInfo

‎ambari-metrics-timelineservice/src/main/resources/metrics_def/NAMENODE.dat

+4-4
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ dfs.namenode.TransactionsAvgTime
267267
dfs.namenode.TransactionsBatchedInSync
268268
dfs.namenode.TransactionsNumOps
269269
jvm.JvmMetrics.GcCount
270-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
271-
jvm.JvmMetrics.GcCountParNew
270+
jvm.JvmMetrics.GcCountG1 Old Generation
271+
jvm.JvmMetrics.GcCountG1 Young Generation
272272
jvm.JvmMetrics.GcNumInfoThresholdExceeded
273273
jvm.JvmMetrics.GcNumWarnThresholdExceeded
274274
jvm.JvmMetrics.GcTimeMillis
275-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
276-
jvm.JvmMetrics.GcTimeMillisParNew
275+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
276+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
277277
jvm.JvmMetrics.GcTotalExtraSleepTime
278278
jvm.JvmMetrics.LogError
279279
jvm.JvmMetrics.LogFatal

‎ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat

+16-16
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ regionserver.WAL.SyncTime_num_ops
6060
regionserver.WAL.appendCount
6161
regionserver.WAL.slowAppendCount
6262
jvm.JvmMetrics.GcTimeMillis
63-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
64-
jvm.JvmMetrics.GcTimeMillisParNew
63+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
64+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
6565
ugi.UgiMetrics.GetGroupsAvgTime
6666
ugi.UgiMetrics.GetGroupsNumOps
6767
ugi.UgiMetrics.LoginFailureNumOps
@@ -253,7 +253,7 @@ regionserver.Server.checkMutateFailedCount
253253
regionserver.Server.checkMutatePassedCount
254254
regionserver.Server.compactionQueueLength
255255
regionserver.Server.flushQueueLength
256-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
256+
jvm.JvmMetrics.GcCountG1 Old Generation
257257
regionserver.Server.hlogFileCount
258258
regionserver.Server.hlogFileSize
259259
regionserver.Server.memStoreSize
@@ -284,7 +284,7 @@ regionserver.WAL.AppendSize_max
284284
regionserver.WAL.AppendSize_mean
285285
regionserver.WAL.AppendSize_median
286286
regionserver.WAL.SyncTime_median
287-
jvm.JvmMetrics.GcCountParNew
287+
jvm.JvmMetrics.GcCountG1 Young Generation
288288
regionserver.WAL.AppendSize_min
289289
regionserver.WAL.AppendSize_num_ops
290290
regionserver.WAL.SyncTime_max
@@ -322,8 +322,8 @@ regionserver.WAL.SyncTime_num_ops
322322
regionserver.WAL.appendCount
323323
regionserver.WAL.slowAppendCount
324324
jvm.JvmMetrics.GcTimeMillis
325-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
326-
jvm.JvmMetrics.GcTimeMillisParNew
325+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
326+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
327327
ugi.UgiMetrics.GetGroupsAvgTime
328328
ugi.UgiMetrics.GetGroupsNumOps
329329
ugi.UgiMetrics.LoginFailureNumOps
@@ -515,7 +515,7 @@ regionserver.Server.checkMutateFailedCount
515515
regionserver.Server.checkMutatePassedCount
516516
regionserver.Server.compactionQueueLength
517517
regionserver.Server.flushQueueLength
518-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
518+
jvm.JvmMetrics.GcCountG1 Old Generation
519519
regionserver.Server.hlogFileCount
520520
regionserver.Server.hlogFileSize
521521
regionserver.Server.memStoreSize
@@ -546,7 +546,7 @@ regionserver.WAL.AppendSize_max
546546
regionserver.WAL.AppendSize_mean
547547
regionserver.WAL.AppendSize_median
548548
regionserver.WAL.SyncTime_median
549-
jvm.JvmMetrics.GcCountParNew
549+
jvm.JvmMetrics.GcCountG1 Young Generation
550550
regionserver.WAL.AppendSize_min
551551
regionserver.WAL.AppendSize_num_ops
552552
regionserver.WAL.SyncTime_max
@@ -585,7 +585,7 @@ regionserver.WAL.SyncTime_mean
585585
regionserver.WAL.AppendSize_99th_percentile
586586
jvm.JvmMetrics.GcTimeMillis
587587
regionserver.WAL.AppendSize_75th_percentile
588-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
588+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
589589
regionserver.WAL.SyncTime_max
590590
regionserver.Server.Increment_median
591591
regionserver.Server.updatesBlockedTime
@@ -595,7 +595,7 @@ regionserver.WAL.lowReplicaRollRequest
595595
ugi.UgiMetrics.GetGroupsNumOps
596596
regionserver.Server.storeFileSize
597597
regionserver.Server.Increment_95th_percentile
598-
jvm.JvmMetrics.GcTimeMillisParNew
598+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
599599
ugi.UgiMetrics.LoginFailureAvgTime
600600
ugi.UgiMetrics.LoginFailureNumOps
601601
regionserver.Server.storeFileCount
@@ -885,7 +885,7 @@ regionserver.Server.compactionQueueLength
885885
regionserver.Server.flushedCellsSize
886886
regionserver.Server.memStoreSize
887887
regionserver.Server.mutationsWithoutWALSize
888-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
888+
jvm.JvmMetrics.GcCountG1 Old Generation
889889
regionserver.Server.regionServerStartTime
890890
regionserver.Server.slowDeleteCount
891891
regionserver.Server.slowIncrementCount
@@ -903,7 +903,7 @@ regionserver.Server.Replay_95th_percentile
903903
regionserver.WAL.AppendTime_95th_percentile
904904
regionserver.WAL.AppendTime_median
905905
regionserver.WAL.AppendTime_max
906-
jvm.JvmMetrics.GcCountParNew
906+
jvm.JvmMetrics.GcCountG1 Young Generation
907907
regionserver.WAL.AppendTime_mean
908908
FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.CacheCapacity
909909
FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.CacheUsed
@@ -1100,13 +1100,13 @@ dfs.namenode.TransactionsAvgTime
11001100
dfs.namenode.TransactionsBatchedInSync
11011101
dfs.namenode.TransactionsNumOps
11021102
jvm.JvmMetrics.GcCount
1103-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
1104-
jvm.JvmMetrics.GcCountParNew
1103+
jvm.JvmMetrics.GcCountG1 Old Generation
1104+
jvm.JvmMetrics.GcCountG1 Young Generation
11051105
jvm.JvmMetrics.GcNumInfoThresholdExceeded
11061106
jvm.JvmMetrics.GcNumWarnThresholdExceeded
11071107
jvm.JvmMetrics.GcTimeMillis
1108-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
1109-
jvm.JvmMetrics.GcTimeMillisParNew
1108+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
1109+
jvm.JvmMetrics.GcTimeMillisG1 Young Generation
11101110
jvm.JvmMetrics.GcTotalExtraSleepTime
11111111
jvm.JvmMetrics.LogError
11121112
jvm.JvmMetrics.LogFatal

‎ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dfs.FSNamesystem.UnderReplicatedBlocks
2121
||
2222
rpc.rpc.NumOpenConnections
2323
rpc.rpc.RpcQueueTimeAvgTime
24-
jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
25-
jvm.JvmMetrics.GcCountConcurrentMarkSweep
24+
jvm.JvmMetrics.GcTimeMillisG1 Old Generation
25+
jvm.JvmMetrics.GcCountG1 Old Generation
2626
jvm.JvmMetrics.MemHeapCommittedM
2727
rpc.rpc.RpcProcessingTimeAvgTime
2828
jvm.JvmMetrics.MemHeapUsedM

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
--add-opens java.base/java.util.regex=ALL-UNNAMED
184184
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
185185
--add-opens java.base/java.net=ALL-UNNAMED
186+
--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
186187
</argLine>
187188

188189
<!-- Each profile in the top-level pom.xml defines which test group categories to run. -->

0 commit comments

Comments
 (0)