bugfix fix found 2 dataQueue bean when not config common.queue param (#…

…1205)
apache · Aug 25, 2023 · 3e30b7a · 3e30b7a
1 parent 26cd97e
commit 3e30b7a
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 10 deletions.
diff --git a/collector/pom.xml b/collector/pom.xml
@@ -177,15 +177,6 @@
             </activation>
             <build>
                 <finalName>hertzbeat-collector</finalName>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                        <filtering>true</filtering>
-                        <includes>
-                            <include>META-INF/**</include>
-                        </includes>
-                    </resource>
-                </resources>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>

diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/export/NettyDataQueue.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/export/NettyDataQueue.java
@@ -37,7 +37,7 @@
  *
  */
 @Configuration
-@ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "netty", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "netty")
 @Slf4j
 public class NettyDataQueue implements CommonDataQueue {
 

diff --git a/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java b/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java
@@ -24,6 +24,7 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -38,6 +39,7 @@
 @Configuration
 @ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "memory", matchIfMissing = true)
 @Slf4j
+@Primary
 public class InMemoryCommonDataQueue implements CommonDataQueue, DisposableBean {
 
     private final LinkedBlockingQueue<Alert> alertDataQueue;

diff --git a/script/application.yml b/script/application.yml
@@ -158,3 +158,8 @@ common:
       servers: 127.0.0.1:9092
       metrics-data-topic: async-metrics-data
       alerts-data-topic: async-alerts-data
+
+scheduler:
+  server:
+    enabled: true
+    port: 1158
diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
@@ -126,3 +126,18 @@ warehouse:
       host: 127.0.0.1
       port: 6379
       password: 123456
+
+common:
+  queue:
+    # memory or kafka
+    type: memory
+    # properties when queue type is kafka
+    kafka:
+      servers: 127.0.0.1:9092
+      metrics-data-topic: async-metrics-data
+      alerts-data-topic: async-alerts-data
+
+scheduler:
+  server:
+    enabled: true
+    port: 1158
diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml
@@ -59,6 +59,7 @@ services:
       - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml
     ports:
       - "1157:1157"
+      - "1158:1158"
     networks:
       - hertzbeat
 

diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml
@@ -67,5 +67,6 @@ services:
       - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml
     ports:
       - "1157:1157"
+      - "1158:1158"
     networks:
       - hertzbeat
diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml
@@ -119,3 +119,18 @@ warehouse:
       host: 127.0.0.1
       port: 6379
       password: 123456
+
+common:
+  queue:
+    # memory or kafka
+    type: memory
+    # properties when queue type is kafka
+    kafka:
+      servers: 127.0.0.1:9092
+      metrics-data-topic: async-metrics-data
+      alerts-data-topic: async-alerts-data
+
+scheduler:
+  server:
+    enabled: true
+    port: 1158
diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml
@@ -67,5 +67,6 @@ services:
       - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml
     ports:
       - "1157:1157"
+      - "1158:1158"
     networks:
       - hertzbeat
diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml
@@ -130,3 +130,18 @@ warehouse:
       host: 127.0.0.1
       port: 6379
       password: 123456
+
+common:
+  queue:
+    # memory or kafka
+    type: memory
+    # properties when queue type is kafka
+    kafka:
+      servers: 127.0.0.1:9092
+      metrics-data-topic: async-metrics-data
+      alerts-data-topic: async-alerts-data
+
+scheduler:
+  server:
+    enabled: true
+    port: 1158
diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml
@@ -67,5 +67,6 @@ services:
       - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml
     ports:
       - "1157:1157"
+      - "1158:1158"
     networks:
       - hertzbeat