From 520ecbb1f49e3fb8ada64ec532a83819f26de865 Mon Sep 17 00:00:00 2001 From: peterxcli Date: Sat, 7 Jun 2025 05:03:31 +0000 Subject: [PATCH 1/4] Update Grafana dashboard JSON files to replace Prometheus datasource UID from "${DS_PROMETHEUS}" to "-- Grafana --" for consistency. --- .../Ozone - OMComittedIndexMetrics.json | 4 +- .../Ozone - Ozone Manager RocksDB.json | 126 +++++++++--------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json index 9ff886cbeec2..4f259acc351b 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json @@ -55,7 +55,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -134,7 +134,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "editorMode": "code", "exemplar": false, diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json index 4005c50a5a82..fadc4b2b579c 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json @@ -88,7 +88,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -142,7 +142,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -165,7 +165,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -219,7 +219,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -238,7 +238,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -292,7 +292,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -311,7 +311,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -365,7 +365,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -384,7 +384,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -438,7 +438,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -457,7 +457,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -511,7 +511,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -530,7 +530,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -584,7 +584,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -616,7 +616,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -670,7 +670,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -689,7 +689,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -743,7 +743,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -775,7 +775,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -829,7 +829,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -861,7 +861,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "gridPos": { "h": 3, @@ -899,7 +899,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -979,7 +979,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -998,7 +998,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1077,7 +1077,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1096,7 +1096,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1175,7 +1175,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1194,7 +1194,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1273,7 +1273,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1292,7 +1292,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1372,7 +1372,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1391,7 +1391,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1471,7 +1471,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1490,7 +1490,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1569,7 +1569,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1601,7 +1601,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1681,7 +1681,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1700,7 +1700,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1780,7 +1780,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1799,7 +1799,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1879,7 +1879,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1898,7 +1898,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -1978,7 +1978,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -1997,7 +1997,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2077,7 +2077,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2096,7 +2096,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2176,7 +2176,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2208,7 +2208,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "description": "", "fieldConfig": { @@ -2289,7 +2289,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2308,7 +2308,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2388,7 +2388,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2407,7 +2407,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "description": "", "fieldConfig": { @@ -2488,7 +2488,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2507,7 +2507,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2587,7 +2587,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2619,7 +2619,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2699,7 +2699,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2718,7 +2718,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2798,7 +2798,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2817,7 +2817,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2897,7 +2897,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", @@ -2916,7 +2916,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "fieldConfig": { "defaults": { @@ -2996,7 +2996,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "-- Grafana --" }, "disableTextWrap": false, "editorMode": "builder", From a2f38690630ffb0fdd2dbbe0c09dfac70ffaf26c Mon Sep 17 00:00:00 2001 From: peterxcli Date: Sat, 7 Jun 2025 15:54:09 +0800 Subject: [PATCH 2/4] Remove uid: "--Grafana--" --- .../Ozone - OMComittedIndexMetrics.json | 6 +- .../Ozone - Ozone Manager RocksDB.json | 189 ++++++------------ 2 files changed, 65 insertions(+), 130 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json index 4f259acc351b..2fb387afa10e 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json @@ -54,8 +54,7 @@ "panels": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -133,8 +132,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "editorMode": "code", "exemplar": false, diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json index fadc4b2b579c..86006979fa2a 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json @@ -87,8 +87,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -141,8 +140,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -164,8 +162,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -218,8 +215,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -237,8 +233,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -291,8 +286,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -310,8 +304,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -364,8 +357,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -383,8 +375,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -437,8 +428,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -456,8 +446,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -510,8 +499,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -529,8 +517,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -583,8 +570,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -615,8 +601,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -669,8 +654,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -688,8 +672,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -742,8 +725,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -774,8 +756,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -828,8 +809,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -860,8 +840,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "gridPos": { "h": 3, @@ -898,8 +877,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -978,8 +956,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -997,8 +974,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1076,8 +1052,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1095,8 +1070,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1174,8 +1148,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1193,8 +1166,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1272,8 +1244,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1291,8 +1262,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1371,8 +1341,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1390,8 +1359,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1470,8 +1438,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1489,8 +1456,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1568,8 +1534,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1600,8 +1565,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1680,8 +1644,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1699,8 +1662,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1779,8 +1741,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1798,8 +1759,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1878,8 +1838,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1897,8 +1856,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -1977,8 +1935,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -1996,8 +1953,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2076,8 +2032,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2095,8 +2050,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2175,8 +2129,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2207,8 +2160,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "description": "", "fieldConfig": { @@ -2288,8 +2240,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2307,8 +2258,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2387,8 +2337,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2406,8 +2355,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "description": "", "fieldConfig": { @@ -2487,8 +2435,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2506,8 +2453,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2586,8 +2532,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2618,8 +2563,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2698,8 +2642,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2717,8 +2660,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2797,8 +2739,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2816,8 +2757,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2896,8 +2836,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", @@ -2915,8 +2854,7 @@ }, { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "fieldConfig": { "defaults": { @@ -2995,8 +2933,7 @@ "targets": [ { "datasource": { - "type": "prometheus", - "uid": "-- Grafana --" + "type": "prometheus" }, "disableTextWrap": false, "editorMode": "builder", From 57492990e74516371e165d6e7a8c73b07bc07ef5 Mon Sep 17 00:00:00 2001 From: peterxcli Date: Tue, 15 Jul 2025 16:37:01 +0800 Subject: [PATCH 3/4] remove uid from the yaml files of GF dashbroad --- .../grafana/dashboards/Ozone - OMComittedIndexMetrics.json | 3 +-- .../grafana/dashboards/Ozone - Ozone Manager RocksDB.json | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json index 2fb387afa10e..7b5d1efe48af 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json @@ -35,8 +35,7 @@ { "builtIn": 1, "datasource": { - "type": "grafana", - "uid": "-- Grafana --" + "type": "grafana" }, "enable": true, "hide": true, diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json index 86006979fa2a..8c0477aef4f5 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json @@ -47,8 +47,7 @@ { "builtIn": 1, "datasource": { - "type": "grafana", - "uid": "-- Grafana --" + "type": "grafana" }, "enable": true, "hide": true, @@ -2964,7 +2963,6 @@ "timepicker": {}, "timezone": "browser", "title": "OM RocksDB", - "uid": "feegs4uzd60aoe", "version": 5, "weekStart": "" } From d70774d6411e743895aaa6298d11040a488af41b Mon Sep 17 00:00:00 2001 From: peterxcli Date: Tue, 15 Jul 2025 21:50:34 +0800 Subject: [PATCH 4/4] Remove DS_PROMETHEUS input from Grafana dashboard JSON files for Ozone Manager metrics. --- .../grafana/dashboards/Ozone - OMComittedIndexMetrics.json | 1 - .../common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json | 1 - 2 files changed, 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json index 7b5d1efe48af..bade7e4fed2c 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OMComittedIndexMetrics.json @@ -1,7 +1,6 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", "label": "prometheus", "description": "", "type": "datasource", diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json index 8c0477aef4f5..4d369604d57d 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Ozone Manager RocksDB.json @@ -1,7 +1,6 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", "label": "Prometheus", "description": "", "type": "datasource",