Skip to content

Commit c544a73

Browse files
sahanajadavsaja0219
sahanajadav
and
saja0219
authored
Update metrics naming changes (#46)
Co-authored-by: saja0219 <sahana.s.jadav@netcracker.com>
1 parent 366a380 commit c544a73

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎charts/helm/zookeeper-service/monitoring/zookeeper-dashboard.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
"datasource": "$datasource",
539539
"editorMode": "code",
540540
"exemplar": true,
541-
"expr": "100 * max( jvm_memory_bytes_used{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}) / max(jvm_memory_bytes_max{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"})",
541+
"expr": "100 * max( jvm_memory_used_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}) / max(jvm_memory_max_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"})",
542542
"instant": true,
543543
"interval": "",
544544
"legendFormat": "",
@@ -2824,7 +2824,7 @@
28242824
"uid": "$datasource"
28252825
},
28262826
"exemplar": true,
2827-
"expr": "jvm_memory_bytes_used{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
2827+
"expr": "jvm_memory_used_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
28282828
"groupBy": [
28292829
{
28302830
"params": [
@@ -2875,7 +2875,7 @@
28752875
"uid": "$datasource"
28762876
},
28772877
"exemplar": true,
2878-
"expr": "jvm_memory_bytes_max{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
2878+
"expr": "jvm_memory_max_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
28792879
"groupBy": [
28802880
{
28812881
"params": [
@@ -3056,7 +3056,7 @@
30563056
"uid": "$datasource"
30573057
},
30583058
"exemplar": true,
3059-
"expr": "100 * jvm_memory_bytes_used{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"} / jvm_memory_bytes_max{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
3059+
"expr": "100 * jvm_memory_used_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"} / jvm_memory_max_bytes{area=\"heap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
30603060
"groupBy": [
30613061
{
30623062
"params": [
@@ -3192,7 +3192,7 @@
31923192
"uid": "$datasource"
31933193
},
31943194
"exemplar": true,
3195-
"expr": "jvm_memory_pool_bytes_used{namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
3195+
"expr": "jvm_memory_pool_used_bytes{namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
31963196
"interval": "",
31973197
"legendFormat": "{{job}}: {{pool}}",
31983198
"refId": "A"
@@ -3202,7 +3202,7 @@
32023202
"uid": "$datasource"
32033203
},
32043204
"exemplar": true,
3205-
"expr": "jvm_memory_pool_bytes_max{namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
3205+
"expr": "jvm_memory_pool_max_bytes{namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
32063206
"hide": false,
32073207
"interval": "",
32083208
"legendFormat": "{{job}}: {{pool}} - max",
@@ -3367,7 +3367,7 @@
33673367
"uid": "$datasource"
33683368
},
33693369
"exemplar": true,
3370-
"expr": "jvm_memory_bytes_used{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
3370+
"expr": "jvm_memory_used_bytes{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
33713371
"groupBy": [
33723372
{
33733373
"params": [
@@ -3419,7 +3419,7 @@
34193419
"uid": "$datasource"
34203420
},
34213421
"exemplar": true,
3422-
"expr": "jvm_memory_bytes_committed{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
3422+
"expr": "jvm_memory_committed_bytes{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"}",
34233423
"groupBy": [
34243424
{
34253425
"params": [
@@ -3470,7 +3470,7 @@
34703470
"uid": "$datasource"
34713471
},
34723472
"exemplar": true,
3473-
"expr": "jvm_memory_bytes_max{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"} > 0",
3473+
"expr": "jvm_memory_max_bytes{area=\"nonheap\",namespace=\"$project\",job=~\"$server*\", cluster=\"$cluster\"} > 0",
34743474
"groupBy": [
34753475
{
34763476
"params": [

‎docker-zookeeper/docker/config/jmx-exporter-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ rules:
2525
type: GAUGE
2626
labels:
2727
replicaId: "$2"
28-
memberType: "$3"
28+
memberType: "$3"

‎docs/public/monitoring.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ This table provides the full list of Prometheus metrics being collected by ZooKe
3838
| zookeeper_packets_sent | How many ZooKeeper packets have been sent from a ZooKeeper server. | telegraf ZooKeeper plugin | Supported |
3939
| jvm_gc_collection_seconds_count | The number of garbage collections grouped by collection type. | ZooKeeper Prometheus Exporter | Supported |
4040
| jvm_gc_collection_seconds_sum | The time spent on garbage collections grouped by collection type. | ZooKeeper Prometheus Exporter | Supported |
41-
| jvm_memory_bytes_used | This widget displays the general data on heap\non-heap memory usage. | ZooKeeper Prometheus Exporter | Supported |
42-
| jvm_memory_pool_bytes_used | JVM heap memory used by pools. | ZooKeeper Prometheus Exporter | Supported |
43-
| jvm_memory_pool_bytes_max | JVM heap memory limits by pools. | ZooKeeper Prometheus Exporter | Supported |
41+
| jvm_memory_used_bytes | This widget displays the general data on heap\non-heap memory usage. | ZooKeeper Prometheus Exporter | Supported |
42+
| jvm_memory_pool_used_bytes | JVM heap memory used by pools. | ZooKeeper Prometheus Exporter | Supported |
43+
| jvm_memory_pool_max_bytes | JVM heap memory limits by pools. | ZooKeeper Prometheus Exporter | Supported |
4444
| jvm_threads_total | This widget displays the data about the thread count. | ZooKeeper Prometheus Exporter | Supported |
4545
| kubelet_volume_stats_used_bytes | Number of used bytes in the volume. | Kubernetes Prometheus Exporter | Supported |
4646
| kubelet_volume_stats_capacity_bytes | Capacity in bytes of the volume. | Kubernetes Prometheus Exporter | Supported |

‎zookeeper-monitoring/grafana/zookeeper-dashboard.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,7 +3853,7 @@
38533853
"measurement": "java_memory",
38543854
"orderByTime": "ASC",
38553855
"policy": "default",
3856-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_bytes_used\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
3856+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_used_bytes\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
38573857
"rawQuery": true,
38583858
"refId": "B",
38593859
"resultFormat": "time_series",
@@ -3898,7 +3898,7 @@
38983898
"measurement": "java_memory",
38993899
"orderByTime": "ASC",
39003900
"policy": "default",
3901-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_bytes_max\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
3901+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_max_bytes\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
39023902
"rawQuery": true,
39033903
"refId": "C",
39043904
"resultFormat": "time_series",
@@ -3943,7 +3943,7 @@
39433943
"measurement": "java_memory",
39443944
"orderByTime": "ASC",
39453945
"policy": "default",
3946-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_bytes_committed\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
3946+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_committed_bytes\" WHERE (\"area\" = 'heap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
39473947
"rawQuery": true,
39483948
"refId": "D",
39493949
"resultFormat": "time_series",
@@ -4075,7 +4075,7 @@
40754075
],
40764076
"orderByTime": "ASC",
40774077
"policy": "default",
4078-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_pool_bytes_used\" WHERE (\"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\", \"pool\" fill(null)",
4078+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_pool_used_bytes\" WHERE (\"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\", \"pool\" fill(null)",
40794079
"rawQuery": true,
40804080
"refId": "A",
40814081
"resultFormat": "time_series",
@@ -4113,7 +4113,7 @@
41134113
],
41144114
"orderByTime": "ASC",
41154115
"policy": "default",
4116-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_pool_bytes_max\" WHERE (\"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\", \"pool\" fill(null)",
4116+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_pool_max_bytes\" WHERE (\"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\", \"pool\" fill(null)",
41174117
"rawQuery": true,
41184118
"refId": "B",
41194119
"resultFormat": "time_series",
@@ -4260,7 +4260,7 @@
42604260
"measurement": "java_memory",
42614261
"orderByTime": "ASC",
42624262
"policy": "default",
4263-
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_bytes_used\" WHERE (\"area\" = 'nonheap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
4263+
"query": "SELECT mean(\"gauge\") FROM \"jvm_memory_used_bytes\" WHERE (\"area\" = 'nonheap' AND \"project_name\" =~ /^$project$/ AND \"url\" =~/$server/) AND $timeFilter GROUP BY time($__interval), \"url\" fill(null)",
42644264
"rawQuery": true,
42654265
"refId": "B",
42664266
"resultFormat": "time_series",

0 commit comments

Comments
 (0)