bugfix rabbitmq contains duplicated metric (#1322)

apache · Nov 8, 2023 · 9392ff7 · 9392ff7
1 parent c90c8dd
commit 9392ff7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java
@@ -313,6 +313,18 @@ private void verifyDefineAppContent(Job app, boolean isModify) {
             Assert.isNull(appDefines.get(app.getApp().toLowerCase()),
                     "monitoring template name " + app.getApp() + " already exists.");
         }
+        Set<String> fieldsSet = new HashSet<>(16);
+        for (Metrics metrics : app.getMetrics()) {
+            Assert.notEmpty(metrics.getFields(), "monitoring template metrics fields can not null");
+            fieldsSet.clear();
+            for (Metrics.Field field : metrics.getFields()) {
+                if (fieldsSet.contains(field.getField())) {
+                    throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " 
+                            + field.getField() + " can not duplicated.");
+                }
+                fieldsSet.add(field.getField());
+            }
+        }
     }
 
     @Override

diff --git a/manager/src/main/resources/define/app-rabbitmq.yml b/manager/src/main/resources/define/app-rabbitmq.yml
@@ -317,8 +317,6 @@ metrics:
         type: 0
       - field: queue_deleted
         type: 0
-      - field: connection_closed
-        type: 0
     units:
       - mem_limit=B->MB
       - mem_used=B->MB