From a44c3fdce484b14b0463d75bd93badfde404fccc Mon Sep 17 00:00:00 2001 From: lhpqaq <657407891@qq.com> Date: Sat, 4 Jan 2025 16:13:02 +0800 Subject: [PATCH] add clusters --- .../infra/v1_0_0/grafana/GrafanaParams.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) 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 9a881ed2..24f960f1 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 @@ -61,7 +61,7 @@ public GrafanaParams(CommandPayload commandPayload) { if (prometheusServer != null) { globalParamsMap.put( "prometheus_url", MessageFormat.format("http://{0}:{1}", prometheusServer, prometheusPort)); - + setDashboards(); globalParamsMap.put("dashboards", dashboards); } } @@ -90,11 +90,6 @@ public String dashboardConfigDir(String cluster) { return MessageFormat.format("{0}/{1}", dashboardsDir(), cluster); } - /// TODO - public List getClusters() { - return List.of("cluster_name"); - } - @GlobalParams public Map configs() { Map configuration = LocalSettings.configurations(getServiceName(), "grafana"); @@ -134,7 +129,19 @@ public Map dashboards() { grafanaDashboardContent = (String) configuration.get("content"); bmAgentDashboardConfig = (String) configuration.get("bm_agent_dashboard"); prometheusDashboardPath = MessageFormat.format("{0}/prometheus", dashboardsDir()); + return configuration; + } + + @Override + public String getServiceName() { + return "grafana"; + } + public List getClusters() { + return new ArrayList<>(getClusterHosts().keySet()); + } + + public void setDashboards() { dashboards = new ArrayList<>(); for (String cluster : getClusters()) { Map dashboard = new HashMap<>(); @@ -143,11 +150,5 @@ public Map dashboards() { dashboard.put("path", dashboardConfigDir(cluster)); dashboards.add(dashboard); } - return configuration; - } - - @Override - public String getServiceName() { - return "grafana"; } }