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> 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