From 4810f2b8a2bfbad17f8422675d42ce0b810bf7bd Mon Sep 17 00:00:00 2001 From: Thomas Way Date: Wed, 10 Apr 2024 13:55:33 +0100 Subject: [PATCH] fix(grafana-dashboard): use ${datasource} variable Fixes: #84 --- grafana-dashboard/grafanalib/README.md | 6 +- grafana-dashboard/grafanalib/common.py | 26 +++--- .../template/emqx-4/client-events.json | 18 ++-- .../template/emqx-4/messages.json | 10 +-- .../template/emqx-4/overview.json | 64 +++++++-------- .../template/emqx-4/rule-engine-count.json | 16 ++-- .../template/emqx-4/rule-engine-rate.json | 10 +-- .../template/emqx-5/authentication.json | 12 +-- .../template/emqx-5/authorization.json | 12 +-- .../template/emqx-5/client-events.json | 18 ++-- .../template/emqx-5/messages.json | 10 +-- .../template/emqx-5/overview.json | 78 +++++++++--------- .../template/emqx-5/rule-engine-count.json | 16 ++-- .../template/emqx-5/rule-engine-rate.json | 10 +-- .../emqx-enterprise-4/client-events.json | 18 ++-- .../template/emqx-enterprise-4/messages.json | 10 +-- .../template/emqx-enterprise-4/overview.json | 68 +++++++-------- .../emqx-enterprise-4/rule-engine-count.json | 16 ++-- .../emqx-enterprise-4/rule-engine-rate.json | 10 +-- .../emqx-enterprise-5/authentication.json | 12 +-- .../emqx-enterprise-5/authorization.json | 12 +-- .../emqx-enterprise-5/client-events.json | 18 ++-- .../template/emqx-enterprise-5/messages.json | 10 +-- .../template/emqx-enterprise-5/overview.json | 82 +++++++++---------- .../emqx-enterprise-5/rule-engine-count.json | 16 ++-- .../emqx-enterprise-5/rule-engine-rate.json | 10 +-- 26 files changed, 294 insertions(+), 294 deletions(-) diff --git a/grafana-dashboard/grafanalib/README.md b/grafana-dashboard/grafanalib/README.md index d565af5..ceb2fbb 100644 --- a/grafana-dashboard/grafanalib/README.md +++ b/grafana-dashboard/grafanalib/README.md @@ -33,19 +33,19 @@ make - Generate EMQX 5.x Community Edition Dashboard ```shell -make E_ARG=ce V_ARG=5 +make EDITION_ARG=ce VERSION_ARG=5 ``` - Generate EMQX 4.x Enterprise Dashboard ```shell -make E_ARG=ee V_ARG=4 +make EDITION_ARG=ee VERSION_ARG=4 ``` - Generate EMQX 4.x Community Edition Dashboard ```shell -make E_ARG=ce V_ARG=4 +make EDITION_ARG=ce VERSION_ARG=4 ``` ## Remove Dashboard JSON diff --git a/grafana-dashboard/grafanalib/common.py b/grafana-dashboard/grafanalib/common.py index 8a1b2f4..b4f13a5 100644 --- a/grafana-dashboard/grafanalib/common.py +++ b/grafana-dashboard/grafanalib/common.py @@ -163,7 +163,7 @@ def create_template_list(): G.Template( name="cluster", type="query", - dataSource="$datasource", + dataSource="${datasource}", query="label_values(up, cluster)", includeAll=False, multi=False, @@ -192,7 +192,7 @@ def create_nodes_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=False, @@ -211,7 +211,7 @@ def create_nodes_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=True, @@ -247,7 +247,7 @@ def create_auth_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=False, @@ -266,7 +266,7 @@ def create_auth_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=True, @@ -285,7 +285,7 @@ def create_auth_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=True, @@ -321,7 +321,7 @@ def create_rule_engine_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=False, @@ -340,7 +340,7 @@ def create_rule_engine_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=True, @@ -359,7 +359,7 @@ def create_rule_engine_template_list(): G.Template( dataSource={ "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, hide=0, includeAll=True, @@ -417,7 +417,7 @@ def create_gridpos(pos): def create_timeseries(**kwargs): default_kwargs = { - "dataSource": "prometheus", + "dataSource": "${datasource}", "gridPos": create_gridpos({"h": 8, "w": 6, "x": 0, "y": 14}), "span": 2, "scaleDistributionType": "linear", @@ -436,7 +436,7 @@ def create_timeseries(**kwargs): def create_stat(**kwargs): default_kwargs = { - "dataSource": "prometheus", + "dataSource": "${datasource}", "gridPos": create_gridpos({"h": 3, "w": 6, "x": 0, "y": 1}), "span": "2", "mappings": [ @@ -477,7 +477,7 @@ def create_stat(**kwargs): def create_gauge(**kwargs): default_kwargs = { - "dataSource": "prometheus", + "dataSource": "${datasource}", "gridPos": create_gridpos({"h": 6, "w": 4, "x": 6, "y": 1}), "span": 2, "max": None, @@ -491,7 +491,7 @@ def create_gauge(**kwargs): def create_table(**kwargs): default_kwargs = { - "dataSource": "prometheus", + "dataSource": "${datasource}", "gridPos": create_gridpos({"h": 6, "w": 10, "x": 0, "y": 42}), "span": 2, "thresholds": thresholds_2_steps, diff --git a/grafana-dashboard/template/emqx-4/client-events.json b/grafana-dashboard/template/emqx-4/client-events.json index b66f75c..d740cac 100644 --- a/grafana-dashboard/template/emqx-4/client-events.json +++ b/grafana-dashboard/template/emqx-4/client-events.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -132,7 +132,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -244,7 +244,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -356,7 +356,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -468,7 +468,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -580,7 +580,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -692,7 +692,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -857,7 +857,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -890,7 +890,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-4/messages.json b/grafana-dashboard/template/emqx-4/messages.json index 374d025..5f4ea71 100644 --- a/grafana-dashboard/template/emqx-4/messages.json +++ b/grafana-dashboard/template/emqx-4/messages.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -123,7 +123,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -226,7 +226,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -382,7 +382,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -415,7 +415,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-4/overview.json b/grafana-dashboard/template/emqx-4/overview.json index ff75ac3..b6f7fb5 100644 --- a/grafana-dashboard/template/emqx-4/overview.json +++ b/grafana-dashboard/template/emqx-4/overview.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -116,7 +116,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -237,7 +237,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -389,7 +389,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -495,7 +495,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -635,7 +635,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -747,7 +747,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -859,7 +859,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -962,7 +962,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1083,7 +1083,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1204,7 +1204,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1307,7 +1307,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1419,7 +1419,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1531,7 +1531,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1643,7 +1643,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1765,7 +1765,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1903,7 +1903,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2041,7 +2041,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2174,7 +2174,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2302,7 +2302,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2490,7 +2490,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2648,7 +2648,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2866,7 +2866,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3124,7 +3124,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3319,7 +3319,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3455,7 +3455,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3587,7 +3587,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3785,7 +3785,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4164,7 +4164,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4270,7 +4270,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4376,7 +4376,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4533,7 +4533,7 @@ "text": null, "value": null }, - "datasource": "$datasource", + "datasource": "${datasource}", "hide": 0, "includeAll": false, "label": null, diff --git a/grafana-dashboard/template/emqx-4/rule-engine-count.json b/grafana-dashboard/template/emqx-4/rule-engine-count.json index 133b977..0304020 100644 --- a/grafana-dashboard/template/emqx-4/rule-engine-count.json +++ b/grafana-dashboard/template/emqx-4/rule-engine-count.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -394,7 +394,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -500,7 +500,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -606,7 +606,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -712,7 +712,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -871,7 +871,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -904,7 +904,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -937,7 +937,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-4/rule-engine-rate.json b/grafana-dashboard/template/emqx-4/rule-engine-rate.json index 2526a0e..655c3d0 100644 --- a/grafana-dashboard/template/emqx-4/rule-engine-rate.json +++ b/grafana-dashboard/template/emqx-4/rule-engine-rate.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -117,7 +117,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -267,7 +267,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -300,7 +300,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -333,7 +333,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/authentication.json b/grafana-dashboard/template/emqx-5/authentication.json index 093f240..1293aea 100644 --- a/grafana-dashboard/template/emqx-5/authentication.json +++ b/grafana-dashboard/template/emqx-5/authentication.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -236,7 +236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -333,7 +333,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -483,7 +483,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -516,7 +516,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -549,7 +549,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/authorization.json b/grafana-dashboard/template/emqx-5/authorization.json index 6b478d9..aa2e451 100644 --- a/grafana-dashboard/template/emqx-5/authorization.json +++ b/grafana-dashboard/template/emqx-5/authorization.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -236,7 +236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -333,7 +333,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -483,7 +483,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -516,7 +516,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -549,7 +549,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/client-events.json b/grafana-dashboard/template/emqx-5/client-events.json index c10a173..e540d70 100644 --- a/grafana-dashboard/template/emqx-5/client-events.json +++ b/grafana-dashboard/template/emqx-5/client-events.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -132,7 +132,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -244,7 +244,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -356,7 +356,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -468,7 +468,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -580,7 +580,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -692,7 +692,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -857,7 +857,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -890,7 +890,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/messages.json b/grafana-dashboard/template/emqx-5/messages.json index 374d025..5f4ea71 100644 --- a/grafana-dashboard/template/emqx-5/messages.json +++ b/grafana-dashboard/template/emqx-5/messages.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -123,7 +123,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -226,7 +226,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -382,7 +382,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -415,7 +415,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/overview.json b/grafana-dashboard/template/emqx-5/overview.json index 13a47dc..e7cce6c 100644 --- a/grafana-dashboard/template/emqx-5/overview.json +++ b/grafana-dashboard/template/emqx-5/overview.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -116,7 +116,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -237,7 +237,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -389,7 +389,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -495,7 +495,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -635,7 +635,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -747,7 +747,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -859,7 +859,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -962,7 +962,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1083,7 +1083,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1204,7 +1204,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1301,7 +1301,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1404,7 +1404,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1516,7 +1516,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1628,7 +1628,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1740,7 +1740,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1862,7 +1862,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2000,7 +2000,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2138,7 +2138,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2271,7 +2271,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2399,7 +2399,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2587,7 +2587,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2745,7 +2745,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2963,7 +2963,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3221,7 +3221,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3416,7 +3416,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3552,7 +3552,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3684,7 +3684,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3882,7 +3882,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4265,7 +4265,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4548,7 +4548,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4651,7 +4651,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4768,7 +4768,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5051,7 +5051,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5154,7 +5154,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5267,7 +5267,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5373,7 +5373,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5479,7 +5479,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5636,7 +5636,7 @@ "text": null, "value": null }, - "datasource": "$datasource", + "datasource": "${datasource}", "hide": 0, "includeAll": false, "label": null, diff --git a/grafana-dashboard/template/emqx-5/rule-engine-count.json b/grafana-dashboard/template/emqx-5/rule-engine-count.json index 133b977..0304020 100644 --- a/grafana-dashboard/template/emqx-5/rule-engine-count.json +++ b/grafana-dashboard/template/emqx-5/rule-engine-count.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -394,7 +394,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -500,7 +500,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -606,7 +606,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -712,7 +712,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -871,7 +871,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -904,7 +904,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -937,7 +937,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-5/rule-engine-rate.json b/grafana-dashboard/template/emqx-5/rule-engine-rate.json index 2526a0e..655c3d0 100644 --- a/grafana-dashboard/template/emqx-5/rule-engine-rate.json +++ b/grafana-dashboard/template/emqx-5/rule-engine-rate.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -117,7 +117,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -267,7 +267,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -300,7 +300,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -333,7 +333,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-4/client-events.json b/grafana-dashboard/template/emqx-enterprise-4/client-events.json index b66f75c..d740cac 100644 --- a/grafana-dashboard/template/emqx-enterprise-4/client-events.json +++ b/grafana-dashboard/template/emqx-enterprise-4/client-events.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -132,7 +132,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -244,7 +244,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -356,7 +356,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -468,7 +468,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -580,7 +580,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -692,7 +692,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -857,7 +857,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -890,7 +890,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-4/messages.json b/grafana-dashboard/template/emqx-enterprise-4/messages.json index 374d025..5f4ea71 100644 --- a/grafana-dashboard/template/emqx-enterprise-4/messages.json +++ b/grafana-dashboard/template/emqx-enterprise-4/messages.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -123,7 +123,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -226,7 +226,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -382,7 +382,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -415,7 +415,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-4/overview.json b/grafana-dashboard/template/emqx-enterprise-4/overview.json index 55ceaa0..14d4374 100644 --- a/grafana-dashboard/template/emqx-enterprise-4/overview.json +++ b/grafana-dashboard/template/emqx-enterprise-4/overview.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -120,7 +120,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -307,7 +307,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -390,7 +390,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -511,7 +511,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -663,7 +663,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -769,7 +769,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -909,7 +909,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1021,7 +1021,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1133,7 +1133,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1236,7 +1236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1357,7 +1357,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1478,7 +1478,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1581,7 +1581,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1693,7 +1693,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1805,7 +1805,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1917,7 +1917,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2039,7 +2039,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2177,7 +2177,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2315,7 +2315,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2448,7 +2448,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2576,7 +2576,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2764,7 +2764,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2922,7 +2922,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3140,7 +3140,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3398,7 +3398,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3593,7 +3593,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3729,7 +3729,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3861,7 +3861,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4059,7 +4059,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4438,7 +4438,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4544,7 +4544,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4650,7 +4650,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4807,7 +4807,7 @@ "text": null, "value": null }, - "datasource": "$datasource", + "datasource": "${datasource}", "hide": 0, "includeAll": false, "label": null, diff --git a/grafana-dashboard/template/emqx-enterprise-4/rule-engine-count.json b/grafana-dashboard/template/emqx-enterprise-4/rule-engine-count.json index 133b977..0304020 100644 --- a/grafana-dashboard/template/emqx-enterprise-4/rule-engine-count.json +++ b/grafana-dashboard/template/emqx-enterprise-4/rule-engine-count.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -394,7 +394,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -500,7 +500,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -606,7 +606,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -712,7 +712,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -871,7 +871,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -904,7 +904,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -937,7 +937,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-4/rule-engine-rate.json b/grafana-dashboard/template/emqx-enterprise-4/rule-engine-rate.json index 2526a0e..655c3d0 100644 --- a/grafana-dashboard/template/emqx-enterprise-4/rule-engine-rate.json +++ b/grafana-dashboard/template/emqx-enterprise-4/rule-engine-rate.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -117,7 +117,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -267,7 +267,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -300,7 +300,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -333,7 +333,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/authentication.json b/grafana-dashboard/template/emqx-enterprise-5/authentication.json index 093f240..1293aea 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/authentication.json +++ b/grafana-dashboard/template/emqx-enterprise-5/authentication.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -236,7 +236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -333,7 +333,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -483,7 +483,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -516,7 +516,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -549,7 +549,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/authorization.json b/grafana-dashboard/template/emqx-enterprise-5/authorization.json index 6b478d9..aa2e451 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/authorization.json +++ b/grafana-dashboard/template/emqx-enterprise-5/authorization.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -236,7 +236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -333,7 +333,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -483,7 +483,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -516,7 +516,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -549,7 +549,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/client-events.json b/grafana-dashboard/template/emqx-enterprise-5/client-events.json index c10a173..e540d70 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/client-events.json +++ b/grafana-dashboard/template/emqx-enterprise-5/client-events.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -132,7 +132,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -244,7 +244,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -356,7 +356,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -468,7 +468,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -580,7 +580,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -692,7 +692,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -857,7 +857,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -890,7 +890,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/messages.json b/grafana-dashboard/template/emqx-enterprise-5/messages.json index 374d025..5f4ea71 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/messages.json +++ b/grafana-dashboard/template/emqx-enterprise-5/messages.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -123,7 +123,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -226,7 +226,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -382,7 +382,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -415,7 +415,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/overview.json b/grafana-dashboard/template/emqx-enterprise-5/overview.json index b307844..90b574f 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/overview.json +++ b/grafana-dashboard/template/emqx-enterprise-5/overview.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -120,7 +120,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -307,7 +307,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -390,7 +390,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -511,7 +511,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -663,7 +663,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -769,7 +769,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -909,7 +909,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1021,7 +1021,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1133,7 +1133,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1236,7 +1236,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1357,7 +1357,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1478,7 +1478,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1575,7 +1575,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1678,7 +1678,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1790,7 +1790,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -1902,7 +1902,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2014,7 +2014,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2136,7 +2136,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2274,7 +2274,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2412,7 +2412,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2545,7 +2545,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2673,7 +2673,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -2861,7 +2861,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3019,7 +3019,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3237,7 +3237,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3495,7 +3495,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3690,7 +3690,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3826,7 +3826,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -3958,7 +3958,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4156,7 +4156,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4539,7 +4539,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4822,7 +4822,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -4925,7 +4925,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5042,7 +5042,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5325,7 +5325,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5428,7 +5428,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5541,7 +5541,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5647,7 +5647,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5753,7 +5753,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -5910,7 +5910,7 @@ "text": null, "value": null }, - "datasource": "$datasource", + "datasource": "${datasource}", "hide": 0, "includeAll": false, "label": null, diff --git a/grafana-dashboard/template/emqx-enterprise-5/rule-engine-count.json b/grafana-dashboard/template/emqx-enterprise-5/rule-engine-count.json index 133b977..0304020 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/rule-engine-count.json +++ b/grafana-dashboard/template/emqx-enterprise-5/rule-engine-count.json @@ -24,7 +24,7 @@ "mode": "thresholds" }, "columns": [], - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -394,7 +394,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -500,7 +500,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -606,7 +606,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -712,7 +712,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -871,7 +871,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -904,7 +904,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -937,7 +937,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, diff --git a/grafana-dashboard/template/emqx-enterprise-5/rule-engine-rate.json b/grafana-dashboard/template/emqx-enterprise-5/rule-engine-rate.json index 2526a0e..655c3d0 100644 --- a/grafana-dashboard/template/emqx-enterprise-5/rule-engine-rate.json +++ b/grafana-dashboard/template/emqx-enterprise-5/rule-engine-rate.json @@ -20,7 +20,7 @@ "panels": [ { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -117,7 +117,7 @@ }, { "cacheTimeout": null, - "datasource": "prometheus", + "datasource": "${datasource}", "description": null, "editable": true, "error": false, @@ -267,7 +267,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": false, @@ -300,7 +300,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true, @@ -333,7 +333,7 @@ }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${datasource}" }, "hide": 0, "includeAll": true,