From 5839ab695d758591648412a2426720af26d63499 Mon Sep 17 00:00:00 2001 From: Slach Date: Sat, 4 Jun 2022 20:11:42 +0400 Subject: [PATCH 1/2] add minimum clickhouse-grafana plugin 2.5.0 Signed-off-by: Slach --- grafana-dashboard/ClickHouse_Queries_dashboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-dashboard/ClickHouse_Queries_dashboard.json b/grafana-dashboard/ClickHouse_Queries_dashboard.json index 7058e90b5..898c4ec74 100644 --- a/grafana-dashboard/ClickHouse_Queries_dashboard.json +++ b/grafana-dashboard/ClickHouse_Queries_dashboard.json @@ -44,7 +44,7 @@ "type": "datasource", "id": "vertamedia-clickhouse-datasource", "name": "ClickHouse", - "version": "1.9.5" + "version": "2.5.0" } ], "annotations": { From 5a4b1f26a64b1400c7027abf48f49e908a2bb51d Mon Sep 17 00:00:00 2001 From: Slach Date: Mon, 6 Jun 2022 11:09:44 +0400 Subject: [PATCH 2/2] split ReplicasMaxQueueSize to ReplicasSumInsertsInQueue and ReplicasSumMergesInQueue Signed-off-by: Slach --- .../Altinity_ClickHouse_Operator_dashboard.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/grafana-dashboard/Altinity_ClickHouse_Operator_dashboard.json b/grafana-dashboard/Altinity_ClickHouse_Operator_dashboard.json index 69c8860c2..704804884 100644 --- a/grafana-dashboard/Altinity_ClickHouse_Operator_dashboard.json +++ b/grafana-dashboard/Altinity_ClickHouse_Operator_dashboard.json @@ -1646,9 +1646,14 @@ "step": 20 }, { - "expr": "chi_clickhouse_metric_ReplicasMaxQueueSize{exported_namespace=~\"$exported_namespace\",chi=~\"$chi\",hostname=~\"$hostname\"}", - "legendFormat": "max queue size {{hostname}}", - "refId": "Z" + "expr": "chi_clickhouse_metric_ReplicasSumInsertsInQueue{exported_namespace=~\"$exported_namespace\",chi=~\"$chi\",hostname=~\"$hostname\"}", + "legendFormat": "inserts in queue {{hostname}}", + "refId": "H" + }, + { + "expr": "chi_clickhouse_metric_ReplicasSumMergesInQueue{exported_namespace=~\"$exported_namespace\",chi=~\"$chi\",hostname=~\"$hostname\"}", + "legendFormat": "merges in queue {{hostname}}", + "refId": "I" } ], "thresholds": [],