diff --git a/README.md b/README.md index ae5f64f..0f3e6a7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The `emqx-exporter` is designed to expose partial metrics that are not included ![Structure](https://assets.emqx.com/images/58adbe48aefb3388f6868854812b18ed.png) ## Metrics -See the documentation [Instruction](config/grafana-template/README.md) for an explanation of the metrics on the dashboard +See the documentation [Instruction](grafana-dashboard/template/README.md) for an explanation of the metrics on the dashboard ## Installation and Usage The `emqx-exporter` listens on HTTP port 8085 by default. See the `--help` output for more options. @@ -80,7 +80,7 @@ scrape_configs: For EMQX 4.4 open-source, make sure the `emqx_prometheus` plugin has been started on all nodes, check it one by one on the dashboard . ## Grafana Dashboard -Import all [templates](./config/grafana-template) to your Grafana, then browse the dashboard `EMQX` and enjoy yourself! +Import all [templates](./grafana-dashboard/template) to your Grafana, then browse the dashboard `EMQX` and enjoy yourself! The templates of dashboard ares JSON files, about how to upload a dashboard JSON file, you can check out [here](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard). diff --git a/examples/docker-compose/docker-compose.yml b/examples/docker-compose/docker-compose.yml index 2a4a894..1d51a12 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/emqx-enterprise-5:/grafana-dashboard-definitions + - ../../grafana-dashboard/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 ddb3099..cb1ab79 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/emqx-4 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/grafana-dashboard/template/emqx-4 emqxImage=emqx/emqx:4.4.16 ;; emqx4-ee) prometheusConfig=prometheus-emqx4.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-enterprise-4 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/grafana-dashboard/template/emqx-enterprise-4 emqxImage=emqx/emqx-ee:4.4.16 ;; emqx5) prometheusConfig=prometheus-emqx5.yaml - dashboardDefinitions=$(dirname $(dirname $(pwd)))/config/grafana-template/emqx-5 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/grafana-dashboard/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/emqx-enterprise-5 + dashboardDefinitions=$(dirname $(dirname $(pwd)))/grafana-dashboard/templateate/emqx-enterprise-5 emqxImage=emqx/emqx-enterprise:5.0.1 ;; esac diff --git a/examples/k8s/README.md b/examples/k8s/README.md index 2bcf8c3..2c31a3e 100644 --- a/examples/k8s/README.md +++ b/examples/k8s/README.md @@ -220,6 +220,6 @@ EOF ``` ## Load Grafana Templates -Import all [templates](../../config/grafana-template) to your Grafana, then browse the dashboard EMQX and enjoy yourself! +Import all [templates](../../grafana-dashboard/template) to your Grafana, then browse the dashboard EMQX and enjoy yourself! The templates of dashboard ares JSON files, about how to upload a dashboard JSON file, you can check out [here](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard). \ No newline at end of file diff --git a/config/grafana-template/grafanalib-emqx/Pipfile b/grafana-dashboard/grafanalib/Pipfile similarity index 100% rename from config/grafana-template/grafanalib-emqx/Pipfile rename to grafana-dashboard/grafanalib/Pipfile diff --git a/config/grafana-template/grafanalib-emqx/README.md b/grafana-dashboard/grafanalib/README.md similarity index 100% rename from config/grafana-template/grafanalib-emqx/README.md rename to grafana-dashboard/grafanalib/README.md diff --git a/config/grafana-template/grafanalib-emqx/emqx.py b/grafana-dashboard/grafanalib/emqx.py similarity index 100% rename from config/grafana-template/grafanalib-emqx/emqx.py rename to grafana-dashboard/grafanalib/emqx.py diff --git a/config/grafana-template/grafanalib-emqx/metrics.py b/grafana-dashboard/grafanalib/metrics.py similarity index 100% rename from config/grafana-template/grafanalib-emqx/metrics.py rename to grafana-dashboard/grafanalib/metrics.py diff --git a/config/grafana-template/README.md b/grafana-dashboard/template/README.md similarity index 100% rename from config/grafana-template/README.md rename to grafana-dashboard/template/README.md diff --git a/config/grafana-template/README_zh_CH.md b/grafana-dashboard/template/README_zh_CH.md similarity index 100% rename from config/grafana-template/README_zh_CH.md rename to grafana-dashboard/template/README_zh_CH.md diff --git a/config/grafana-template/emqx-4/client-events.json b/grafana-dashboard/template/emqx-4/client-events.json similarity index 100% rename from config/grafana-template/emqx-4/client-events.json rename to grafana-dashboard/template/emqx-4/client-events.json diff --git a/config/grafana-template/emqx-4/messages.json b/grafana-dashboard/template/emqx-4/messages.json similarity index 100% rename from config/grafana-template/emqx-4/messages.json rename to grafana-dashboard/template/emqx-4/messages.json diff --git a/config/grafana-template/emqx-4/overview.json b/grafana-dashboard/template/emqx-4/overview.json similarity index 100% rename from config/grafana-template/emqx-4/overview.json rename to grafana-dashboard/template/emqx-4/overview.json diff --git a/config/grafana-template/emqx-4/rule-engine.json b/grafana-dashboard/template/emqx-4/rule-engine.json similarity index 100% rename from config/grafana-template/emqx-4/rule-engine.json rename to grafana-dashboard/template/emqx-4/rule-engine.json diff --git a/config/grafana-template/emqx-5/authentication.json b/grafana-dashboard/template/emqx-5/authentication.json similarity index 100% rename from config/grafana-template/emqx-5/authentication.json rename to grafana-dashboard/template/emqx-5/authentication.json diff --git a/config/grafana-template/emqx-5/authorization.json b/grafana-dashboard/template/emqx-5/authorization.json similarity index 100% rename from config/grafana-template/emqx-5/authorization.json rename to grafana-dashboard/template/emqx-5/authorization.json diff --git a/config/grafana-template/emqx-5/client-events.json b/grafana-dashboard/template/emqx-5/client-events.json similarity index 100% rename from config/grafana-template/emqx-5/client-events.json rename to grafana-dashboard/template/emqx-5/client-events.json diff --git a/config/grafana-template/emqx-5/messages.json b/grafana-dashboard/template/emqx-5/messages.json similarity index 100% rename from config/grafana-template/emqx-5/messages.json rename to grafana-dashboard/template/emqx-5/messages.json diff --git a/config/grafana-template/emqx-5/overview.json b/grafana-dashboard/template/emqx-5/overview.json similarity index 100% rename from config/grafana-template/emqx-5/overview.json rename to grafana-dashboard/template/emqx-5/overview.json diff --git a/config/grafana-template/emqx-5/rule-engine.json b/grafana-dashboard/template/emqx-5/rule-engine.json similarity index 100% rename from config/grafana-template/emqx-5/rule-engine.json rename to grafana-dashboard/template/emqx-5/rule-engine.json diff --git a/config/grafana-template/emqx-enterprise-4/client-events.json b/grafana-dashboard/template/emqx-enterprise-4/client-events.json similarity index 100% rename from config/grafana-template/emqx-enterprise-4/client-events.json rename to grafana-dashboard/template/emqx-enterprise-4/client-events.json diff --git a/config/grafana-template/emqx-enterprise-4/messages.json b/grafana-dashboard/template/emqx-enterprise-4/messages.json similarity index 100% rename from config/grafana-template/emqx-enterprise-4/messages.json rename to grafana-dashboard/template/emqx-enterprise-4/messages.json diff --git a/config/grafana-template/emqx-enterprise-4/overview.json b/grafana-dashboard/template/emqx-enterprise-4/overview.json similarity index 100% rename from config/grafana-template/emqx-enterprise-4/overview.json rename to grafana-dashboard/template/emqx-enterprise-4/overview.json diff --git a/config/grafana-template/emqx-enterprise-4/rule-engine.json b/grafana-dashboard/template/emqx-enterprise-4/rule-engine.json similarity index 100% rename from config/grafana-template/emqx-enterprise-4/rule-engine.json rename to grafana-dashboard/template/emqx-enterprise-4/rule-engine.json diff --git a/config/grafana-template/emqx-enterprise-5/authentication.json b/grafana-dashboard/template/emqx-enterprise-5/authentication.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/authentication.json rename to grafana-dashboard/template/emqx-enterprise-5/authentication.json diff --git a/config/grafana-template/emqx-enterprise-5/authorization.json b/grafana-dashboard/template/emqx-enterprise-5/authorization.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/authorization.json rename to grafana-dashboard/template/emqx-enterprise-5/authorization.json diff --git a/config/grafana-template/emqx-enterprise-5/client-events.json b/grafana-dashboard/template/emqx-enterprise-5/client-events.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/client-events.json rename to grafana-dashboard/template/emqx-enterprise-5/client-events.json diff --git a/config/grafana-template/emqx-enterprise-5/messages.json b/grafana-dashboard/template/emqx-enterprise-5/messages.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/messages.json rename to grafana-dashboard/template/emqx-enterprise-5/messages.json diff --git a/config/grafana-template/emqx-enterprise-5/overview.json b/grafana-dashboard/template/emqx-enterprise-5/overview.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/overview.json rename to grafana-dashboard/template/emqx-enterprise-5/overview.json diff --git a/config/grafana-template/emqx-enterprise-5/rule-engine.json b/grafana-dashboard/template/emqx-enterprise-5/rule-engine.json similarity index 100% rename from config/grafana-template/emqx-enterprise-5/rule-engine.json rename to grafana-dashboard/template/emqx-enterprise-5/rule-engine.json