From f3588532aef4f787019f7f28b61a90a3b5b08b9a Mon Sep 17 00:00:00 2001
From: ruanwe <88fantasy@gmail.com>
Date: Tue, 13 Aug 2024 15:51:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E4=BC=9A=E7=94=9F=E6=88=90=20c?=
 =?UTF-8?q?ustom.ini=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meta/DDP-1.2.2/GRAFANA/service_ddl.json        | 14 ++++++++++++--
 .../worker/handler/ConfigureServiceHandler.java    |  7 -------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.2/GRAFANA/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.2/GRAFANA/service_ddl.json
index 407029f4..3afff7da 100644
--- a/datasophon-api/src/main/resources/meta/DDP-1.2.2/GRAFANA/service_ddl.json
+++ b/datasophon-api/src/main/resources/meta/DDP-1.2.2/GRAFANA/service_ddl.json
@@ -70,6 +70,16 @@
        ]
     }]
   },
-  "parameters": [
-  ]
+  "parameters": [{
+     "name": "clusterId",
+     "label": "集群ID",
+     "description": "集群ID",
+     "configType": "map",
+     "required": true,
+     "type": "input",
+     "value": "${clusterId}",
+     "configurableInWizard": false,
+     "hidden": true,
+     "defaultValue": "${clusterId}"
+   }]
 }
\ No newline at end of file
diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java b/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
index 9d0d295c..95623462 100644
--- a/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
+++ b/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
@@ -168,13 +168,6 @@ public ExecResult configure(Map<Generators, List<ServiceConfig>> cofigFileMap,
                     serviceConfig.setValue(IdUtil.simpleUUID());
                     customConfList.add(serviceConfig);
                 }
-                if ("Grafana".equals(serviceRoleName)) {
-                    ServiceConfig clusterIdConfig = new ServiceConfig();
-                    clusterIdConfig.setName("clusterId");
-                    clusterIdConfig.setValue(String.valueOf(clusterId));
-                    clusterIdConfig.setConfigType("map");
-                    customConfList.add(clusterIdConfig);
-                }
                 configs.addAll(customConfList);
                 if (!configs.isEmpty()) {
                     // extra app, package: META, templates