浏览代码

fix build and issue with offline cluster

Zhenya Taran 5 年之前
父节点
当前提交
6a15b18d4a

+ 8 - 0
kafka-ui-api/pom.xml

@@ -169,6 +169,14 @@
                                 </goals>
                                 <configuration>
                                     <arguments>install</arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>npm run build</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
                                     <arguments>run build</arguments>
                                 </configuration>
                             </execution>

+ 1 - 0
kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

@@ -84,6 +84,7 @@ public class KafkaService {
             properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, 5000);
             kafkaCluster.setAdminClient(AdminClient.create(properties));
             kafkaCluster.setId(getClusterId(kafkaCluster));
+            kafkaCluster.getCluster().setId(kafkaCluster.getId());
 
             return true;
         } catch (Exception e) {

+ 0 - 4
kafka-ui-api/src/main/resources/application-local.yml

@@ -3,12 +3,8 @@ kafka:
     -
       name: local
       bootstrapServers: localhost:29091
-      jmxHost: localhost
-      jmxPort: 9997
       zookeeper: localhost:2181
     -
       name: secondLocal
       bootstrapServers: localhost:29092
-      jmxHost: localhost
-      jmxPort: 9998
       zookeeper: localhost:2182

+ 2 - 8
kafka-ui-api/src/main/resources/application-sdp.yml

@@ -1,16 +1,10 @@
 kafka:
   clusters:
     -
-      id: wrYGf-csNgiGdK7B_ADF7Z
       name: local
       bootstrapServers: kafka0:29092
-      jmxHost: kafka0
-      jmxPort: 9997
       zookeeper: zookeeper0:2181
     -
-      id: dMMQx-WRh77BKYas_g2ZTz
       name: secondLocal
-      bootstrapServers: kafka1:29092
-      jmxHost: kafka1
-      jmxPort: 9997
-      zookeeper: zookeeper1:2181
+      zookeeper: zookeeper1:2181
+      bootstrapServers: kafka1:29092

+ 0 - 16
kafka-ui-api/src/main/resources/application.yml

@@ -1,16 +0,0 @@
-kafka:
-  clusters:
-    -
-      id: wrYGf-csNgiGdK7B_ADF7Z
-      name: local
-      bootstrapServers: kafka0:29092
-      jmxHost: kafka0
-      jmxPort: 9997
-      zookeeper: zookeeper0:2181
-    -
-      id: dMMQx-WRh77BKYas_g2ZTz
-      name: secondLocal
-      bootstrapServers: kafka1:29092
-      jmxHost: kafka1
-      jmxPort: 9997
-      zookeeper: zookeeper1:2181