From 7dccf775a23d79810ecbc87bb5a680451c72b2a0 Mon Sep 17 00:00:00 2001 From: lhpqaq <657407891@qq.com> Date: Sat, 4 Jan 2025 22:41:58 +0800 Subject: [PATCH] add cluster to dashboard config --- .../configuration/grafana-dashboard.xml | 35 +++++++++++++------ .../infra/v1_0_0/grafana/GrafanaParams.java | 10 +++--- .../infra/v1_0_0/grafana/GrafanaSetup.java | 2 +- .../v1_0_0/prometheus/PrometheusParams.java | 2 +- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml index 11f17a4b..c0e414d4 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana-dashboard.xml @@ -168,7 +168,7 @@ providers: }, "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuUsage\"}", + "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuUsage\", <#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -268,7 +268,7 @@ providers: }, "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_1\"}", + "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_1\", <#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -368,7 +368,7 @@ providers: }, "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_5\"}", + "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_5\", <#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -468,7 +468,7 @@ providers: }, "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_15\"}", + "expr": "agent_host_monitoring_cpu{cpuUsage=\"cpuLoadAvgMin_15\", <#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -578,7 +578,7 @@ providers: "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "agent_host_monitoring_mem{memUsage=\"memTotal\"}", + "expr": "agent_host_monitoring_mem{memUsage=\"memTotal\", <#noparse>cluster=~\"${cluster}\"}", "format": "time_series", "fullMetaSearch": false, "includeNullMetadata": true, @@ -678,7 +678,7 @@ providers: "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "agent_host_monitoring_mem{memUsage=\"memIdle\"}", + "expr": "agent_host_monitoring_mem{memUsage=\"memIdle\", <#noparse>cluster=~\"${cluster}\"}", "format": "time_series", "fullMetaSearch": false, "includeNullMetadata": true, @@ -791,7 +791,7 @@ providers: { "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_diskIO", + "expr": "agent_host_monitoring_diskIO{<#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -887,7 +887,7 @@ providers: { "disableTextWrap": false, "editorMode": "builder", - "expr": "agent_host_monitoring_disk{diskUsage=\"diskFreeSpace\"}", + "expr": "agent_host_monitoring_disk{diskUsage=\"diskFreeSpace\", <#noparse>cluster=~\"${cluster}\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -904,7 +904,22 @@ providers: "schemaVersion": 40, "tags": [], "templating": { - "list": [] + "list": [ + { + "type": "custom", + "name": "${cluster_label}", + "label": "Cluster", + "options": [], + "query": "${cluster_name}", + "refresh": 2, + "multi": false, + "includeAll": false, + "current": { + "text": "${cluster_name}", + "value": "${cluster_name}" + } + } + ] }, "time": { "from": "now-6h", @@ -913,7 +928,7 @@ providers: "timepicker": {}, "timezone": "browser", "title": "bm-agent", - "uid": "ee8r44rmotukga", + "uid": "uid4agent_dashboard", "version": 1, "weekStart": "" } diff --git a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java index 24f960f1..82ae0881 100644 --- a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java +++ b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java @@ -23,6 +23,7 @@ import org.apache.bigtop.manager.stack.core.spi.param.Params; import org.apache.bigtop.manager.stack.core.utils.LocalSettings; import org.apache.bigtop.manager.stack.infra.param.InfraParams; +import org.apache.bigtop.manager.stack.infra.v1_0_0.prometheus.PrometheusParams; import com.google.auto.service.AutoService; import lombok.Getter; @@ -70,10 +71,6 @@ public String dataDir() { return MessageFormat.format("{0}/data", serviceHome()); } - public String confDir() { - return MessageFormat.format("{0}/conf", serviceHome()); - } - public String provisioningDir() { return MessageFormat.format("{0}/provisioning", confDir()); } @@ -145,9 +142,14 @@ public void setDashboards() { dashboards = new ArrayList<>(); for (String cluster : getClusters()) { Map dashboard = new HashMap<>(); + // Used for dashboard yaml configuration dashboard.put("name", cluster); dashboard.put("folder", cluster); dashboard.put("path", dashboardConfigDir(cluster)); + + // Used for dashboard json configuration + dashboard.put("cluster_label", PrometheusParams.AGENT_TARGET_LABEL); + dashboard.put("cluster_name", cluster); dashboards.add(dashboard); } } diff --git a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java index 18ec1f42..6f9ab66e 100644 --- a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java +++ b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java @@ -82,7 +82,7 @@ public static ShellResult config(Params params) { user, group, Constants.PERMISSION_644, - grafanaParams.getGlobalParamsMap()); + dashboard); } } diff --git a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java index d4dc3bb7..d78820e7 100644 --- a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java +++ b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java @@ -44,7 +44,7 @@ public class PrometheusParams extends InfraParams { protected final String PROMETHEUS_SELF_JOB_NAME = "prometheus"; protected final String BM_AGENT_JOB_NAME = "bm-agent"; protected final String BM_AGENT_PORT = "8081"; - protected final String AGENT_TARGET_LABEL = "cluster"; + public static final String AGENT_TARGET_LABEL = "cluster"; private Map prometheusScrapeJob; private Map agentScrapeJob;