From 16b7648d23458e9a55b2258fa39a80ee5260dd70 Mon Sep 17 00:00:00 2001 From: Rory Z <16801068+Rory-Z@users.noreply.github.com> Date: Thu, 10 Aug 2023 17:51:25 +0800 Subject: [PATCH] chore: change default datasource Signed-off-by: Rory Z <16801068+Rory-Z@users.noreply.github.com> --- .../client-events.json} | 40 ++--- .../Messages.json => emqx-4/messages.json} | 24 +-- .../{EMQX4/EMQX.json => emqx-4/overview.json} | 122 +++++++-------- .../rule-engine.json} | 56 +++---- .../authentication.json} | 30 ++-- .../authorization.json} | 30 ++-- .../client-events.json} | 40 ++--- .../Messages.json => emqx-5/messages.json} | 20 +-- .../{EMQX5/EMQX.json => emqx-5/overview.json} | 140 +++++++++--------- .../rule-engine.json} | 56 +++---- .../client-events.json} | 40 ++--- .../messages.json} | 24 +-- .../overview.json} | 124 ++++++++-------- .../rule-engine.json} | 56 +++---- .../authentication.json} | 32 ++-- .../authorization.json} | 30 ++-- .../client-events.json} | 40 ++--- .../messages.json} | 24 +-- .../overview.json} | 140 +++++++++--------- .../rule-engine.json} | 56 +++---- examples/docker-compose/docker-compose.yml | 2 +- examples/docker/startup.sh | 8 +- 22 files changed, 567 insertions(+), 567 deletions(-) rename config/grafana-template/{EMQX4/Client Events.json => emqx-4/client-events.json} (97%) rename config/grafana-template/{EMQX4/Messages.json => emqx-4/messages.json} (97%) rename config/grafana-template/{EMQX4/EMQX.json => emqx-4/overview.json} (96%) rename config/grafana-template/{EMQX4/Rule Engine.json => emqx-4/rule-engine.json} (96%) rename config/grafana-template/{EMQX5/Authentication.json => emqx-5/authentication.json} (96%) rename config/grafana-template/{EMQX5/Authorization.json => emqx-5/authorization.json} (96%) rename config/grafana-template/{EMQX5/Client Events.json => emqx-5/client-events.json} (97%) rename config/grafana-template/{EMQX5/Messages.json => emqx-5/messages.json} (98%) rename config/grafana-template/{EMQX5/EMQX.json => emqx-5/overview.json} (97%) rename config/grafana-template/{EMQX5/Rule Engine.json => emqx-5/rule-engine.json} (96%) rename config/grafana-template/{EMQX4-enterprise/Client Events.json => emqx-enterprise-4/client-events.json} (97%) rename config/grafana-template/{EMQX4-enterprise/Messages.json => emqx-enterprise-4/messages.json} (97%) rename config/grafana-template/{EMQX4-enterprise/EMQX.json => emqx-enterprise-4/overview.json} (97%) rename config/grafana-template/{EMQX4-enterprise/Rule Engine.json => emqx-enterprise-4/rule-engine.json} (96%) rename config/grafana-template/{EMQX5-enterprise/Authentication.json => emqx-enterprise-5/authentication.json} (96%) rename config/grafana-template/{EMQX5-enterprise/Authorization.json => emqx-enterprise-5/authorization.json} (96%) rename config/grafana-template/{EMQX5-enterprise/Client Events.json => emqx-enterprise-5/client-events.json} (97%) rename config/grafana-template/{EMQX5-enterprise/Messages.json => emqx-enterprise-5/messages.json} (97%) rename config/grafana-template/{EMQX5-enterprise/EMQX.json => emqx-enterprise-5/overview.json} (97%) rename config/grafana-template/{EMQX5-enterprise/Rule Engine.json => emqx-enterprise-5/rule-engine.json} (96%) diff --git a/config/grafana-template/EMQX4/Client Events.json b/config/grafana-template/emqx-4/client-events.json similarity index 97% rename from config/grafana-template/EMQX4/Client Events.json rename to config/grafana-template/emqx-4/client-events.json index b72232a..0c232cc 100644 --- a/config/grafana-template/EMQX4/Client Events.json +++ b/config/grafana-template/emqx-4/client-events.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -190,7 +190,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_connected{cluster=\"$cluster\",instance=~\"$node\"}[$__rate_interval]))", @@ -206,7 +206,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -333,7 +333,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_disconnected{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -349,7 +349,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_subscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -440,7 +440,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -567,7 +567,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_unsubscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -583,7 +583,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -711,7 +711,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authenticate{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -855,7 +855,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_check_acl{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -871,7 +871,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -1000,7 +1000,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_auth_success_anonymous {cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -1030,7 +1030,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1042,7 +1042,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1065,7 +1065,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({from='emqx',cluster=\"$cluster\"}, instance)", "hide": 0, @@ -1091,8 +1091,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Client Events", - "uid": "EMQX4-client-events", + "title": "client events", + "uid": "emqx-4-client-events", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4/Messages.json b/config/grafana-template/emqx-4/messages.json similarity index 97% rename from config/grafana-template/EMQX4/Messages.json rename to config/grafana-template/emqx-4/messages.json index ad4d27c..b0dc53b 100644 --- a/config/grafana-template/EMQX4/Messages.json +++ b/config/grafana-template/emqx-4/messages.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -249,7 +249,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_sent{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -266,7 +266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -452,7 +452,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_received{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -469,7 +469,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -655,7 +655,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_dropped{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -686,7 +686,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -698,7 +698,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -721,7 +721,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up{from=\"emqx\",cluster=\"$cluster\"}, instance)", "hide": 0, @@ -747,8 +747,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Messages", - "uid": "EMQX4-messages", + "title": "messages", + "uid": "emqx-4-messages", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4/EMQX.json b/config/grafana-template/emqx-4/overview.json similarity index 96% rename from config/grafana-template/EMQX4/EMQX.json rename to config/grafana-template/emqx-4/overview.json index ecd340b..73934a0 100644 --- a/config/grafana-template/EMQX4/EMQX.json +++ b/config/grafana-template/emqx-4/overview.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -184,7 +184,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -272,7 +272,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_scrape_collector_duration_seconds{cluster=\"$cluster\"})", @@ -395,7 +395,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_running{instance=~\".*\", cluster=\"$cluster\"})", @@ -406,7 +406,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_stopped{instance=~\".*\", cluster=\"$cluster\"})", @@ -422,7 +422,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -509,7 +509,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_suboptions_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -583,7 +583,7 @@ { "targetBlank": true, "title": "Show Node Detail Metrics", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" } ], "options": { @@ -690,7 +690,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_live_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -701,7 +701,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (emqx_connections_count{cluster=\"$cluster\"})", @@ -932,7 +932,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -947,7 +947,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_bytes_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -1133,7 +1133,7 @@ { "targetBlank": true, "title": "Show Node Messages Detail", - "url": "/d/EMQX4-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-4-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -1158,7 +1158,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1171,7 +1171,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -1184,7 +1184,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_dropped{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -1491,7 +1491,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1504,7 +1504,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos1_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -1516,7 +1516,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos2_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -1591,7 +1591,7 @@ { "targetBlank": true, "title": "Show Node Exec Rate", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" } ], "options": { @@ -1625,7 +1625,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1688,7 +1688,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" } ], "options": { @@ -1707,7 +1707,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1722,7 +1722,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1785,7 +1785,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" } ], "options": { @@ -1804,7 +1804,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1820,7 +1820,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1883,7 +1883,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" } ], "options": { @@ -1902,7 +1902,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1918,7 +1918,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1981,7 +1981,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" } ], "options": { @@ -2000,7 +2000,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -2137,12 +2137,12 @@ { "targetBlank": true, "title": "Show Node Connection Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" }, { "targetBlank": true, "title": "Show Node Disconnection Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" } ], "options": { @@ -2304,7 +2304,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2466,7 +2466,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" } ], "options": { @@ -2616,12 +2616,12 @@ { "targetBlank": true, "title": "Show Node Subscribe Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" }, { "targetBlank": true, "title": "Show Node Unsubscribe Events", - "url": "/d/EMQX4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" + "url": "/d/emqx-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" } ], "options": { @@ -2813,7 +2813,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connect{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2824,7 +2824,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2836,7 +2836,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3008,7 +3008,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3019,7 +3019,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3202,7 +3202,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3213,7 +3213,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3225,7 +3225,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_dropped{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3237,7 +3237,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3450,7 +3450,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3461,7 +3461,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_suback_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3473,7 +3473,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3485,7 +3485,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3497,7 +3497,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3877,7 +3877,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" + "url": "/d/emqx-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" } ] } @@ -4193,7 +4193,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4267,7 +4267,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load1\"})", @@ -4282,7 +4282,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4356,7 +4356,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load5\"})", @@ -4371,7 +4371,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4445,7 +4445,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load15\"})", @@ -4517,8 +4517,8 @@ }, "timepicker": {}, "timezone": "", - "title": "EMQX", - "uid": "EMQX4", + "title": "overview", + "uid": "emqx-4-overview", "version": 2, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4/Rule Engine.json b/config/grafana-template/emqx-4/rule-engine.json similarity index 96% rename from config/grafana-template/EMQX4/Rule Engine.json rename to config/grafana-template/emqx-4/rule-engine.json index 7ff1f67..3412b1d 100644 --- a/config/grafana-template/EMQX4/Rule Engine.json +++ b/config/grafana-template/emqx-4/rule-engine.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -80,7 +80,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -207,7 +207,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -223,7 +223,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -294,7 +294,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -323,7 +323,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -653,7 +653,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -667,7 +667,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -682,7 +682,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -697,7 +697,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -712,7 +712,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -742,7 +742,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -757,7 +757,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -801,7 +801,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -876,7 +876,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -891,7 +891,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -966,7 +966,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -982,7 +982,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1057,7 +1057,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1073,7 +1073,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1148,7 +1148,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1178,7 +1178,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1190,7 +1190,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1213,7 +1213,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -1235,7 +1235,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", node=~\"$node\", from=\"exporter\"}, rule)", "description": "The id of rule engine", @@ -1262,8 +1262,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Rule Engine", - "uid": "EMQX4-rule-engine", + "title": "rule engine", + "uid": "emqx-4-rule-engine", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5/Authentication.json b/config/grafana-template/emqx-5/authentication.json similarity index 96% rename from config/grafana-template/EMQX5/Authentication.json rename to config/grafana-template/emqx-5/authentication.json index 2471eae..5e0db6b 100644 --- a/config/grafana-template/EMQX5/Authentication.json +++ b/config/grafana-template/emqx-5/authentication.json @@ -60,7 +60,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -253,7 +253,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -268,7 +268,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -283,7 +283,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -298,7 +298,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -338,7 +338,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -410,7 +410,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authentication_exec_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -496,7 +496,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authentication_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -526,7 +526,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -538,7 +538,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -561,7 +561,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -583,7 +583,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(emqx_authentication_resource_status{cluster=\"$cluster\"},resource)", "description": "The third party resource of authentication", @@ -610,8 +610,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Authentication", - "uid": "EMQX5-authn", + "title": "authentication", + "uid": "emqx-5-authn", "version": 2, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5/Authorization.json b/config/grafana-template/emqx-5/authorization.json similarity index 96% rename from config/grafana-template/EMQX5/Authorization.json rename to config/grafana-template/emqx-5/authorization.json index 7b98257..fcbfbcc 100644 --- a/config/grafana-template/EMQX5/Authorization.json +++ b/config/grafana-template/emqx-5/authorization.json @@ -60,7 +60,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -268,7 +268,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -283,7 +283,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -298,7 +298,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -313,7 +313,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -353,7 +353,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authorization_exec_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -440,7 +440,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -511,7 +511,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authorization_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -541,7 +541,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -553,7 +553,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -576,7 +576,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -598,7 +598,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(emqx_authorization_resource_status{cluster=\"$cluster\"},resource)", "description": "The third party resource of authentication", @@ -625,8 +625,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Authorization", - "uid": "EMQX5-authz", + "title": "authorization", + "uid": "emqx-5-authz", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5/Client Events.json b/config/grafana-template/emqx-5/client-events.json similarity index 97% rename from config/grafana-template/EMQX5/Client Events.json rename to config/grafana-template/emqx-5/client-events.json index fa8a895..572df6e 100644 --- a/config/grafana-template/EMQX5/Client Events.json +++ b/config/grafana-template/emqx-5/client-events.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -190,7 +190,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_connected{cluster=\"$cluster\",instance=~\"$node\"}[$__rate_interval]))", @@ -206,7 +206,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -333,7 +333,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_disconnected{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -349,7 +349,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_subscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -440,7 +440,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -567,7 +567,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_unsubscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -583,7 +583,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -711,7 +711,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authenticate{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -855,7 +855,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authorize{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -871,7 +871,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -998,7 +998,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_auth_anonymous{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -1028,7 +1028,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1040,7 +1040,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1063,7 +1063,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({from='emqx',cluster=\"$cluster\"}, instance)", "hide": 0, @@ -1089,8 +1089,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Client Events", - "uid": "EMQX5-client-events", + "title": "client events", + "uid": "emqx-5-client-events", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5/Messages.json b/config/grafana-template/emqx-5/messages.json similarity index 98% rename from config/grafana-template/EMQX5/Messages.json rename to config/grafana-template/emqx-5/messages.json index 34289ed..5d0c844 100644 --- a/config/grafana-template/EMQX5/Messages.json +++ b/config/grafana-template/emqx-5/messages.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -249,7 +249,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_sent{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -266,7 +266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -452,7 +452,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_received{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -469,7 +469,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -655,7 +655,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_dropped{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -686,7 +686,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -698,7 +698,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -721,7 +721,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up{from=\"emqx\",cluster=\"$cluster\"}, instance)", "hide": 0, diff --git a/config/grafana-template/EMQX5/EMQX.json b/config/grafana-template/emqx-5/overview.json similarity index 97% rename from config/grafana-template/EMQX5/EMQX.json rename to config/grafana-template/emqx-5/overview.json index 595bbce..ae013e3 100644 --- a/config/grafana-template/EMQX5/EMQX.json +++ b/config/grafana-template/emqx-5/overview.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -184,7 +184,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -272,7 +272,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_scrape_collector_duration_seconds{cluster=\"$cluster\"})", @@ -395,7 +395,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_running{instance=~\".*\", cluster=\"$cluster\"})", @@ -406,7 +406,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_stopped{instance=~\".*\", cluster=\"$cluster\"})", @@ -586,7 +586,7 @@ { "targetBlank": true, "title": "Show Node Detail Metrics", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" } ], "options": { @@ -693,7 +693,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_live_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -704,7 +704,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (emqx_connections_count{cluster=\"$cluster\"})", @@ -720,7 +720,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -807,7 +807,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_suboptions_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -1020,7 +1020,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -1270,7 +1270,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1341,7 +1341,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(type, name) (emqx_rule_bridge_queuing{cluster=\"$cluster\"})", @@ -1415,7 +1415,7 @@ { "targetBlank": true, "title": "Show Node Exec Rate", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" } ], "options": { @@ -1449,7 +1449,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1511,7 +1511,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" } ], "options": { @@ -1530,7 +1530,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1545,7 +1545,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1607,7 +1607,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" } ], "options": { @@ -1626,7 +1626,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1642,7 +1642,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1704,7 +1704,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" } ], "options": { @@ -1723,7 +1723,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1739,7 +1739,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1801,7 +1801,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" } ], "options": { @@ -1820,7 +1820,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1957,12 +1957,12 @@ { "targetBlank": true, "title": "Show Node Connection Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" }, { "targetBlank": true, "title": "Show Node Disconnection Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" } ], "options": { @@ -2124,12 +2124,12 @@ { "targetBlank": true, "title": "Show Node Subscribe Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" }, { "targetBlank": true, "title": "Show Node Unsubscribe Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" } ], "options": { @@ -2291,7 +2291,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2453,7 +2453,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2632,7 +2632,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connect{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2643,7 +2643,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2655,7 +2655,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2829,7 +2829,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2840,7 +2840,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3025,7 +3025,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3036,7 +3036,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3048,7 +3048,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_dropped{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3060,7 +3060,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3275,7 +3275,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3286,7 +3286,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_suback_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3298,7 +3298,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3310,7 +3310,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3322,7 +3322,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3523,7 +3523,7 @@ { "targetBlank": true, "title": "Show Node Messages Detail", - "url": "/d/EMQX5-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-5-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -3548,7 +3548,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3561,7 +3561,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3574,7 +3574,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_dropped{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3665,7 +3665,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3678,7 +3678,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos1_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -3690,7 +3690,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos2_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -3817,7 +3817,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3832,7 +3832,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_bytes_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -4276,7 +4276,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" + "url": "/d/emqx-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" } ] } @@ -4738,7 +4738,7 @@ { "targetBlank": true, "title": "Show Node Authentication Detail", - "url": "/d/EMQX5-authn/authentication?var-cluster=$cluster&var-node=All&resource=${__value.text}&viewPanel=2" + "url": "/d/emqx-5-authn/authentication?var-cluster=$cluster&var-node=All&resource=${__value.text}&viewPanel=2" } ] } @@ -4998,7 +4998,7 @@ { "targetBlank": true, "title": "Show Node Metrics details", - "url": "/d/EMQX5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=4" + "url": "/d/emqx-5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=4" } ], "options": { @@ -5091,7 +5091,7 @@ { "targetBlank": true, "title": "Show Node Metrics Details", - "url": "/d/EMQX5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=6" + "url": "/d/emqx-5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=6" } ], "options": { @@ -5300,7 +5300,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-authz/authorization?var-cluster=$cluster&var-node=All&var-resource=${__value.text}&viewPanel=8" + "url": "/d/emqx-5-authz/authorization?var-cluster=$cluster&var-node=All&var-resource=${__value.text}&viewPanel=8" } ] } @@ -5572,7 +5572,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=10" + "url": "/d/emqx-5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=10" } ], "options": { @@ -5665,7 +5665,7 @@ { "targetBlank": true, "title": "Show Node Metrics Details", - "url": "/d/EMQX5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" + "url": "/d/emqx-5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" } ], "options": { @@ -5713,7 +5713,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -5787,7 +5787,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load1\"})", @@ -5802,7 +5802,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -5876,7 +5876,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load5\"})", @@ -5891,7 +5891,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -5965,7 +5965,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load15\"})", @@ -6037,8 +6037,8 @@ }, "timepicker": {}, "timezone": "", - "title": "EMQX", - "uid": "EMQX5", + "title": "overview", + "uid": "emqx-5-overview", "version": 2, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5/Rule Engine.json b/config/grafana-template/emqx-5/rule-engine.json similarity index 96% rename from config/grafana-template/EMQX5/Rule Engine.json rename to config/grafana-template/emqx-5/rule-engine.json index b000b21..f6b0626 100644 --- a/config/grafana-template/EMQX5/Rule Engine.json +++ b/config/grafana-template/emqx-5/rule-engine.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -80,7 +80,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -207,7 +207,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -223,7 +223,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -294,7 +294,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -323,7 +323,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -653,7 +653,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -667,7 +667,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -682,7 +682,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -697,7 +697,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -712,7 +712,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -742,7 +742,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -757,7 +757,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -786,7 +786,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -861,7 +861,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -876,7 +876,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -951,7 +951,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -967,7 +967,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1042,7 +1042,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1058,7 +1058,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1133,7 +1133,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1163,7 +1163,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1175,7 +1175,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1198,7 +1198,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -1220,7 +1220,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", node=~\"$node\", from=\"exporter\"}, rule)", "description": "The id of rule engine", @@ -1247,8 +1247,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Rule Engine", - "uid": "EMQX5-rule-engine", + "title": "rule engine", + "uid": "emqx-5-rule-engine", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4-enterprise/Client Events.json b/config/grafana-template/emqx-enterprise-4/client-events.json similarity index 97% rename from config/grafana-template/EMQX4-enterprise/Client Events.json rename to config/grafana-template/emqx-enterprise-4/client-events.json index 87477e1..15942ec 100644 --- a/config/grafana-template/EMQX4-enterprise/Client Events.json +++ b/config/grafana-template/emqx-enterprise-4/client-events.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -190,7 +190,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_connected{cluster=\"$cluster\",instance=~\"$node\"}[$__rate_interval]))", @@ -206,7 +206,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -333,7 +333,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_disconnected{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -349,7 +349,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_subscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -440,7 +440,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -567,7 +567,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_unsubscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -583,7 +583,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -711,7 +711,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authenticate{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -855,7 +855,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_check_acl{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -871,7 +871,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -1000,7 +1000,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_auth_success_anonymous {cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -1030,7 +1030,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1042,7 +1042,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1065,7 +1065,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({from='emqx',cluster=\"$cluster\"}, instance)", "hide": 0, @@ -1091,8 +1091,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Client Events", - "uid": "EMQX4-ee-client-events", + "title": "client events", + "uid": "emqx-ee-4-client-events", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4-enterprise/Messages.json b/config/grafana-template/emqx-enterprise-4/messages.json similarity index 97% rename from config/grafana-template/EMQX4-enterprise/Messages.json rename to config/grafana-template/emqx-enterprise-4/messages.json index 5de36d9..b81f26c 100644 --- a/config/grafana-template/EMQX4-enterprise/Messages.json +++ b/config/grafana-template/emqx-enterprise-4/messages.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -249,7 +249,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_sent{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -266,7 +266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -452,7 +452,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_received{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -469,7 +469,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -655,7 +655,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_dropped{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -686,7 +686,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -698,7 +698,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -721,7 +721,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up{from=\"emqx\",cluster=\"$cluster\"}, instance)", "hide": 0, @@ -747,8 +747,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Messages", - "uid": "EMQX4-ee-messages", + "title": "messages", + "uid": "emqx-ee-4-messages", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4-enterprise/EMQX.json b/config/grafana-template/emqx-enterprise-4/overview.json similarity index 97% rename from config/grafana-template/EMQX4-enterprise/EMQX.json rename to config/grafana-template/emqx-enterprise-4/overview.json index f542a54..b76f193 100644 --- a/config/grafana-template/EMQX4-enterprise/EMQX.json +++ b/config/grafana-template/emqx-enterprise-4/overview.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -245,7 +245,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -485,7 +485,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_running{instance=~\".*\", cluster=\"$cluster\"})", @@ -496,7 +496,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_stopped{instance=~\".*\", cluster=\"$cluster\"})", @@ -512,7 +512,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -600,7 +600,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_scrape_collector_duration_seconds{cluster=\"$cluster\"})", @@ -924,7 +924,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_live_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -935,7 +935,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (emqx_connections_count{cluster=\"$cluster\"})", @@ -951,7 +951,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1038,7 +1038,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_suboptions_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -1241,7 +1241,7 @@ { "targetBlank": true, "title": "Show Node Detail Metrics", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" } ], "options": { @@ -1597,7 +1597,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1612,7 +1612,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_bytes_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -1688,7 +1688,7 @@ { "targetBlank": true, "title": "Show Node Exec Rate", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" } ], "options": { @@ -1722,7 +1722,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1784,7 +1784,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" } ], "options": { @@ -1803,7 +1803,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1818,7 +1818,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1880,7 +1880,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" } ], "options": { @@ -1899,7 +1899,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1915,7 +1915,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1977,7 +1977,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" } ], "options": { @@ -1996,7 +1996,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -2012,7 +2012,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2074,7 +2074,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" } ], "options": { @@ -2093,7 +2093,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -2230,12 +2230,12 @@ { "targetBlank": true, "title": "Show Node Connection Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" }, { "targetBlank": true, "title": "Show Node Disconnection Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" } ], "options": { @@ -2397,12 +2397,12 @@ { "targetBlank": true, "title": "Show Node Subscribe Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" }, { "targetBlank": true, "title": "Show Node Unsubscribe Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" } ], "options": { @@ -2564,7 +2564,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2726,7 +2726,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX4-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" + "url": "/d/emqx-ee-4-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" } ], "options": { @@ -2906,7 +2906,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connect{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2917,7 +2917,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2929,7 +2929,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3101,7 +3101,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3112,7 +3112,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3295,7 +3295,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3306,7 +3306,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3318,7 +3318,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_dropped{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3330,7 +3330,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3543,7 +3543,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3554,7 +3554,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_suback_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3566,7 +3566,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3578,7 +3578,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3590,7 +3590,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3787,7 +3787,7 @@ { "targetBlank": true, "title": "Show Node Messages Detail", - "url": "/d/EMQX4-ee-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-ee-4-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -3812,7 +3812,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3825,7 +3825,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3838,7 +3838,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_dropped{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3929,7 +3929,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3942,7 +3942,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos1_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -3954,7 +3954,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos2_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -4334,7 +4334,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX4-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" + "url": "/d/emqx-ee-4-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" } ] } @@ -4650,7 +4650,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4724,7 +4724,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load1\"})", @@ -4739,7 +4739,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4813,7 +4813,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load5\"})", @@ -4828,7 +4828,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -4902,7 +4902,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load15\"})", @@ -4974,8 +4974,8 @@ }, "timepicker": {}, "timezone": "", - "title": "EMQX", - "uid": "EMQX4-Enterprise", + "title": "overview", + "uid": "emqx-ee-4-overview", "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX4-enterprise/Rule Engine.json b/config/grafana-template/emqx-enterprise-4/rule-engine.json similarity index 96% rename from config/grafana-template/EMQX4-enterprise/Rule Engine.json rename to config/grafana-template/emqx-enterprise-4/rule-engine.json index 5987c56..c7002d5 100644 --- a/config/grafana-template/EMQX4-enterprise/Rule Engine.json +++ b/config/grafana-template/emqx-enterprise-4/rule-engine.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -80,7 +80,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -207,7 +207,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -223,7 +223,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -294,7 +294,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -323,7 +323,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -653,7 +653,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -667,7 +667,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -682,7 +682,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -697,7 +697,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -712,7 +712,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -742,7 +742,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -757,7 +757,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -801,7 +801,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -876,7 +876,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -891,7 +891,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -966,7 +966,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -982,7 +982,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1057,7 +1057,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1073,7 +1073,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1148,7 +1148,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1178,7 +1178,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1190,7 +1190,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1213,7 +1213,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -1235,7 +1235,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", node=~\"$node\", from=\"exporter\"}, rule)", "description": "The id of rule engine", @@ -1262,8 +1262,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Rule Engine", - "uid": "EMQX4-ee-rule-engine", + "title": "rule engine", + "uid": "emqx-ee-4-rule-engine", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5-enterprise/Authentication.json b/config/grafana-template/emqx-enterprise-5/authentication.json similarity index 96% rename from config/grafana-template/EMQX5-enterprise/Authentication.json rename to config/grafana-template/emqx-enterprise-5/authentication.json index d2640dd..49e4e20 100644 --- a/config/grafana-template/EMQX5-enterprise/Authentication.json +++ b/config/grafana-template/emqx-enterprise-5/authentication.json @@ -60,7 +60,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -251,7 +251,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -266,7 +266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -281,7 +281,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -296,7 +296,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -336,7 +336,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -408,7 +408,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authentication_exec_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -423,7 +423,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -494,7 +494,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authentication_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -524,7 +524,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -536,7 +536,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -559,7 +559,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -581,7 +581,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(emqx_authentication_resource_status{cluster=\"$cluster\"},resource)", "description": "The third party resource of authentication", @@ -608,8 +608,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Authentication", - "uid": "EMQX5-ee-authn", + "title": "authentication", + "uid": "emqx-ee-5-authn", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/config/grafana-template/EMQX5-enterprise/Authorization.json b/config/grafana-template/emqx-enterprise-5/authorization.json similarity index 96% rename from config/grafana-template/EMQX5-enterprise/Authorization.json rename to config/grafana-template/emqx-enterprise-5/authorization.json index 3c08d6b..3c4f203 100644 --- a/config/grafana-template/EMQX5-enterprise/Authorization.json +++ b/config/grafana-template/emqx-enterprise-5/authorization.json @@ -60,7 +60,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -266,7 +266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -281,7 +281,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -296,7 +296,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -311,7 +311,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -351,7 +351,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -423,7 +423,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authorization_exec_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -438,7 +438,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -509,7 +509,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, resource) (emqx_authorization_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", resource=~\"$resource\"})", @@ -539,7 +539,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -551,7 +551,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -574,7 +574,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "description": "", @@ -597,7 +597,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(emqx_authorization_resource_status{cluster=\"$cluster\"},resource)", "description": "The third party resource of authentication", @@ -624,8 +624,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Authorization", - "uid": "EMQX5-ee-authz", + "title": "authorization", + "uid": "emqx-ee-5-authz", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5-enterprise/Client Events.json b/config/grafana-template/emqx-enterprise-5/client-events.json similarity index 97% rename from config/grafana-template/EMQX5-enterprise/Client Events.json rename to config/grafana-template/emqx-enterprise-5/client-events.json index c6d14d7..d37274c 100644 --- a/config/grafana-template/EMQX5-enterprise/Client Events.json +++ b/config/grafana-template/emqx-enterprise-5/client-events.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -190,7 +190,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_connected{cluster=\"$cluster\",instance=~\"$node\"}[$__rate_interval]))", @@ -206,7 +206,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -333,7 +333,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_disconnected{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -349,7 +349,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -425,7 +425,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_subscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -440,7 +440,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -567,7 +567,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_unsubscribe{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -583,7 +583,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -711,7 +711,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authenticate{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -727,7 +727,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -855,7 +855,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_authorize{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -871,7 +871,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -998,7 +998,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_client_auth_anonymous{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -1028,7 +1028,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1040,7 +1040,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1063,7 +1063,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({from='emqx',cluster=\"$cluster\"}, instance)", "hide": 0, @@ -1089,8 +1089,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Client Events", - "uid": "EMQX5-ee-client-events", + "title": "client events", + "uid": "emqx-ee-5-client-events", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5-enterprise/Messages.json b/config/grafana-template/emqx-enterprise-5/messages.json similarity index 97% rename from config/grafana-template/EMQX5-enterprise/Messages.json rename to config/grafana-template/emqx-enterprise-5/messages.json index 838ceea..e129cf2 100644 --- a/config/grafana-template/EMQX5-enterprise/Messages.json +++ b/config/grafana-template/emqx-enterprise-5/messages.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -250,7 +250,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_sent{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -267,7 +267,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -454,7 +454,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_received{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -471,7 +471,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -658,7 +658,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (irate(emqx_messages_dropped{cluster=\"$cluster\", instance=~\"$node\"}[$__rate_interval]))", @@ -689,7 +689,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -701,7 +701,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -724,7 +724,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up{from=\"emqx\",cluster=\"$cluster\"}, instance)", "hide": 0, @@ -750,8 +750,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Messages", - "uid": "EMQX5-ee-messages", + "title": "messages", + "uid": "emqx-ee-5-messages", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5-enterprise/EMQX.json b/config/grafana-template/emqx-enterprise-5/overview.json similarity index 97% rename from config/grafana-template/EMQX5-enterprise/EMQX.json rename to config/grafana-template/emqx-enterprise-5/overview.json index 1c1c45d..814155a 100644 --- a/config/grafana-template/EMQX5-enterprise/EMQX.json +++ b/config/grafana-template/emqx-enterprise-5/overview.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -246,7 +246,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -486,7 +486,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_running{instance=~\".*\", cluster=\"$cluster\"})", @@ -497,7 +497,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(emqx_cluster_nodes_stopped{instance=~\".*\", cluster=\"$cluster\"})", @@ -513,7 +513,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -601,7 +601,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_scrape_collector_duration_seconds{cluster=\"$cluster\"})", @@ -937,7 +937,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(emqx_live_connections_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -948,7 +948,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(instance) (emqx_connections_count{cluster=\"$cluster\"})", @@ -964,7 +964,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1051,7 +1051,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum(emqx_suboptions_count{instance=~\".*\", cluster=\"$cluster\"})", @@ -1254,7 +1254,7 @@ { "targetBlank": true, "title": "Show Node Detail Metrics", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&&var-node=All&viewPanel=6" } ], "options": { @@ -1498,7 +1498,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1569,7 +1569,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(type, name) (emqx_rule_bridge_queuing{cluster=\"$cluster\"})", @@ -1643,7 +1643,7 @@ { "targetBlank": true, "title": "Show Node Exec Rate", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" } ], "options": { @@ -1677,7 +1677,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1740,7 +1740,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=16" } ], "options": { @@ -1759,7 +1759,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1774,7 +1774,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1837,7 +1837,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=18" } ], "options": { @@ -1856,7 +1856,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1872,7 +1872,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1935,7 +1935,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=20" } ], "options": { @@ -1954,7 +1954,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -1970,7 +1970,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2033,7 +2033,7 @@ { "targetBlank": true, "title": "Show details", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=All&viewPanel=22" } ], "options": { @@ -2052,7 +2052,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\".*\"}[$__rate_interval]))", @@ -2190,12 +2190,12 @@ { "targetBlank": true, "title": "Show Node Connection Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=2" }, { "targetBlank": true, "title": "Show Node Disconnection Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=3" } ], "options": { @@ -2358,12 +2358,12 @@ { "targetBlank": true, "title": "Show Node Subscribe Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=5" }, { "targetBlank": true, "title": "Show Node Unsubscribe Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=7" } ], "options": { @@ -2526,7 +2526,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2689,7 +2689,7 @@ { "targetBlank": true, "title": "Show Node Auth Events", - "url": "/d/EMQX5-ee-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-ee-5-client-events/client-events?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -2866,7 +2866,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connect{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2877,7 +2877,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -2889,7 +2889,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_connack_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3061,7 +3061,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3072,7 +3072,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_disconnect_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3255,7 +3255,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3266,7 +3266,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3278,7 +3278,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_dropped{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3290,7 +3290,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_publish_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3503,7 +3503,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3514,7 +3514,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_suback_sent{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3526,7 +3526,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_subscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3538,7 +3538,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_received{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3550,7 +3550,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_packets_unsubscribe_error{instance=~\".*\", cluster=\"$cluster\"}[$__rate_interval]))", @@ -3752,7 +3752,7 @@ { "targetBlank": true, "title": "Show Node Messages Detail", - "url": "/d/EMQX5-ee-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" + "url": "/d/emqx-ee-5-messages/messages?var-datasource=$datasource&var-cluster=$cluster&var-node=All" } ], "options": { @@ -3777,7 +3777,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3790,7 +3790,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3803,7 +3803,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_dropped{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -3895,7 +3895,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -3908,7 +3908,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos1_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -3920,7 +3920,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_messages_qos2_received{cluster=\"$cluster\", instance=~\".*\"}[$__rate_interval]))", @@ -4048,7 +4048,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -4063,7 +4063,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(emqx_bytes_sent{instance=~\".*\",cluster=\"$cluster\"}[$__rate_interval]))", @@ -4513,7 +4513,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-ee-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" + "url": "/d/emqx-ee-5-rule-engine/rule-engine?var-datasource=$datasource&var-cluster=$cluster&var-node=All&var-rule=${__value.text}&viewPanel=4" } ] } @@ -4977,7 +4977,7 @@ { "targetBlank": true, "title": "Show Node Authentication Detail", - "url": "/d/EMQX5-ee-authn/authentication?var-cluster=$cluster&var-node=All&resource=${__value.text}&viewPanel=2" + "url": "/d/emqx-ee-5-authn/authentication?var-cluster=$cluster&var-node=All&resource=${__value.text}&viewPanel=2" } ] } @@ -5238,7 +5238,7 @@ { "targetBlank": true, "title": "Show Node Metrics details", - "url": "/d/EMQX5-ee-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=4" + "url": "/d/emqx-ee-5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=4" } ], "options": { @@ -5332,7 +5332,7 @@ { "targetBlank": true, "title": "Show Node Metrics Details", - "url": "/d/EMQX5-ee-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=6" + "url": "/d/emqx-ee-5-authn/authentication?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=6" } ], "options": { @@ -5543,7 +5543,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-ee-authz/authorization?var-cluster=$cluster&var-node=All&var-resource=${__value.text}&viewPanel=8" + "url": "/d/emqx-ee-5-authz/authorization?var-cluster=$cluster&var-node=All&var-resource=${__value.text}&viewPanel=8" } ] } @@ -5804,7 +5804,7 @@ { "targetBlank": true, "title": "Show Node Metrics Detail", - "url": "/d/EMQX5-ee-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=10" + "url": "/d/emqx-ee-5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=10" } ], "options": { @@ -5898,7 +5898,7 @@ { "targetBlank": true, "title": "Show Node Metrics Details", - "url": "/d/EMQX5-ee-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" + "url": "/d/emqx-ee-5-authz/authorization?var-datasource=$datasource&var-cluster=$cluster&var-node=All&viewPanel=12" } ], "options": { @@ -5946,7 +5946,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -6021,7 +6021,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load1\"})", @@ -6036,7 +6036,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -6111,7 +6111,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load5\"})", @@ -6126,7 +6126,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -6201,7 +6201,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node) (emqx_cluster_cpu_load{cluster=\"$cluster\", load=\"load15\"})", @@ -6273,8 +6273,8 @@ }, "timepicker": {}, "timezone": "", - "title": "EMQX", - "uid": "EMQX5-Enterprise", + "title": "overview", + "uid": "emqx-ee-5-overview", "version": 2, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana-template/EMQX5-enterprise/Rule Engine.json b/config/grafana-template/emqx-enterprise-5/rule-engine.json similarity index 96% rename from config/grafana-template/EMQX5-enterprise/Rule Engine.json rename to config/grafana-template/emqx-enterprise-5/rule-engine.json index 3f85e72..6ed59b3 100644 --- a/config/grafana-template/EMQX5-enterprise/Rule Engine.json +++ b/config/grafana-template/emqx-enterprise-5/rule-engine.json @@ -1,7 +1,7 @@ { "__inputs": [ { - "name": "DS_PROMETHEUS", + "name": "datasource", "label": "Prometheus", "description": "", "type": "datasource", @@ -80,7 +80,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -207,7 +207,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -223,7 +223,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -294,7 +294,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(node, rule) (emqx_rule_exec_last5m_rate{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"})", @@ -323,7 +323,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -647,7 +647,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -661,7 +661,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -676,7 +676,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -691,7 +691,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -706,7 +706,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -721,7 +721,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -736,7 +736,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -751,7 +751,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -795,7 +795,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -870,7 +870,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_pass_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -885,7 +885,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -960,7 +960,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_exec_failure_count{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -976,7 +976,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1051,7 +1051,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_success{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1067,7 +1067,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1142,7 +1142,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(rule) (irate(emqx_rule_action_failed{cluster=\"$cluster\", node=~\"$node\", rule=~\"$rule\"}[$__rate_interval]))", @@ -1172,7 +1172,7 @@ "includeAll": false, "label": "datasource", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, @@ -1184,7 +1184,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values(up, cluster)", "description": "A custom label of the scrape_config in prometheus to tag the cluster", @@ -1207,7 +1207,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", from=\"exporter\"}, node)", "hide": 0, @@ -1229,7 +1229,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "$datasource" }, "definition": "label_values({cluster=\"$cluster\", node=~\"$node\", from=\"exporter\"}, rule)", "description": "The id of rule engine", @@ -1256,8 +1256,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Rule Engine", - "uid": "EMQX5-ee-rule-engine", + "title": "rule engine", + "uid": "emqx-ee-5-rule-engine", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/examples/docker-compose/docker-compose.yml b/examples/docker-compose/docker-compose.yml index 6481dbd..2a4a894 100644 --- a/examples/docker-compose/docker-compose.yml +++ b/examples/docker-compose/docker-compose.yml @@ -39,6 +39,6 @@ services: ports: - 3000:3000 volumes: - - ../../config/grafana-template/EMQX5-enterprise:/grafana-dashboard-definitions + - ../../config/grafana-template/emqx-enterprise-5:/grafana-dashboard-definitions - ../provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ../provisioning/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml diff --git a/examples/docker/startup.sh b/examples/docker/startup.sh index 6793790..ddb3099 100644 --- a/examples/docker/startup.sh +++ b/examples/docker/startup.sh @@ -8,23 +8,23 @@ emqxVersion=$1 case $emqxVersion in emqx4) prometheusConfig=prometheus-emqx4.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/EMQX4 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-4 emqxImage=emqx/emqx:4.4.16 ;; emqx4-ee) prometheusConfig=prometheus-emqx4.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/EMQX4-enterprise + dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-enterprise-4 emqxImage=emqx/emqx-ee:4.4.16 ;; emqx5) prometheusConfig=prometheus-emqx5.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/EMQX5 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-5 emqxImage=emqx/emqx:5.0.1 ;; *) # deploy emqx5 enterprise by default prometheusConfig=prometheus-emqx5.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/EMQX5-enterprise + dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-enterprise-5 emqxImage=emqx/emqx-enterprise:5.0.1 ;; esac