Browse Source

metrics params updated

Roman Nedzvetskiy 5 years ago
parent
commit
771e09ed08

+ 4 - 0
kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/model/Metrics.java

@@ -10,4 +10,8 @@ public class Metrics {
     private Integer bytesInPerSec;
 
     private Integer bytesOutPerSec;
+
+    private Integer brokerCount;
+
+    private Integer activeControllers;
 }

+ 5 - 3
kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

@@ -47,6 +47,9 @@ public class KafkaService {
             var kafkaCluster1 = metrics.getKafkaCluster();
             kafkaCluster1.getCluster().setBytesInPerSec(metrics.getBytesInPerSec());
             kafkaCluster1.getCluster().setBytesOutPerSec(metrics.getBytesOutPerSec());
+            kafkaCluster1.getCluster().setBrokerCount(metrics.getBrokerCount());
+            kafkaCluster1.getBrokersMetrics().setBrokerCount(metrics.getBrokerCount());
+            kafkaCluster1.getBrokersMetrics().setActiveControllers(metrics.getActiveControllers());
             return clusterId;
         }).flatMap(this::updateTopicsData);
     }
@@ -218,11 +221,10 @@ public class KafkaService {
         metrics.setKafkaCluster(kafkaCluster);
         return ClusterUtil.toMono(adminClient.describeCluster().nodes()).flatMap(brokers -> {
             var brokerCount = brokers.size();
-            kafkaCluster.getCluster().setBrokerCount(brokerCount);
-            kafkaCluster.getBrokersMetrics().setBrokerCount(brokerCount);
+            metrics.setBrokerCount(brokerCount);
             return ClusterUtil.toMono(adminClient.describeCluster().controller());
         }).map(c -> {
-            kafkaCluster.getBrokersMetrics().setActiveControllers(c != null ? 1 : 0);
+            metrics.setActiveControllers(c != null ? 1 : 0);
             for (Map.Entry<MetricName, ? extends Metric> metricNameEntry : adminClient.metrics().entrySet()) {
                 if (metricNameEntry.getKey().name().equals(IN_BYTE_PER_SEC_METRIC)
                         && metricNameEntry.getKey().description().equals(IN_BYTE_PER_SEC_METRIC_DESCRIPTION)) {