Renamed jmxmetrics objects param to metrics

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/mapper/ClusterMapper.java

@@ -15,7 +15,7 @@ public interface ClusterMapper {
     @Mapping(target = "brokerCount", source = "metrics.brokerCount")
     @Mapping(target = "onlinePartitionCount", source = "metrics.onlinePartitionCount")
     @Mapping(target = "topicCount", source = "metrics.topicCount")
-    @Mapping(target = "jmxMetrics", source = "metrics.jmxMetrics")
+    @Mapping(target = "metrics", source = "metrics.metrics")
     Cluster toCluster(KafkaCluster cluster);
 
     KafkaCluster toKafkaCluster(ClustersProperties.Cluster clusterProperties);

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/model/InternalBrokerMetrics.java

@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.cluster.model;
 
-import com.provectus.kafka.ui.model.JmxMetric;
+import com.provectus.kafka.ui.model.Metric;
 import lombok.Builder;
 import lombok.Data;
 
@@ -10,5 +10,5 @@ import java.util.List;
 @Builder(toBuilder = true)
 public class InternalBrokerMetrics {
     private final Long segmentSize;
-    private final List<JmxMetric> jmxMetrics;
+    private final List<Metric> jmxMetrics;
 }

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/model/InternalClusterMetrics.java

@@ -1,10 +1,9 @@
 package com.provectus.kafka.ui.cluster.model;
 
-import com.provectus.kafka.ui.model.JmxMetric;
+import com.provectus.kafka.ui.model.Metric;
 import lombok.Builder;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +25,6 @@ public class InternalClusterMetrics {
     private final int segmentCount;
     private final long segmentSize;
     private final Map<Integer, InternalBrokerMetrics> internalBrokerMetrics;
-    private final List<JmxMetric> jmxMetrics;
+    private final List<Metric> metrics;
     private final int zooKeeperStatus;
 }

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java

@@ -43,7 +43,7 @@ public class ClusterService {
                 .map(KafkaCluster::getMetrics)
                 .map(s -> {
                     var brokerMetrics = clusterMapper.toBrokerMetrics(s);
-                    brokerMetrics.setJmxMetrics(s.getInternalBrokerMetrics().get(id).getJmxMetrics());
+                    brokerMetrics.setMetrics(s.getInternalBrokerMetrics().get(id).getJmxMetrics());
                     brokerMetrics.setSegmentZise(Long.valueOf(s.getSegmentSize()).intValue());
                     return brokerMetrics;
                 }));

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/util/JmxClusterUtil.java

@@ -2,7 +2,7 @@ package com.provectus.kafka.ui.cluster.util;
 
 import com.provectus.kafka.ui.cluster.model.InternalClusterMetrics;
 import com.provectus.kafka.ui.cluster.model.MetricDto;
-import com.provectus.kafka.ui.model.JmxMetric;
+import com.provectus.kafka.ui.model.Metric;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.pool2.KeyedObjectPool;
@@ -33,16 +33,16 @@ public class JmxClusterUtil {
     private static final String KAFKA_SERVER_PARAM = "kafka.server";
     private static final String NAME_METRIC_FIELD = "name=";
 
-    public List<JmxMetric> getJmxMetrics(int jmxPort, String jmxHost) {
+    public List<Metric> getJmxMetrics(int jmxPort, String jmxHost) {
         String jmxUrl = JMX_URL + jmxHost + ":" + jmxPort + "/" + JMX_SERVICE_TYPE;
-        List<JmxMetric> result = new ArrayList<>();
+        List<Metric> result = new ArrayList<>();
         JMXConnector srv = null;
         try {
             srv = pool.borrowObject(jmxUrl);
             MBeanServerConnection msc = srv.getMBeanServerConnection();
             var jmxMetrics = msc.queryNames(null, null).stream().filter(q -> q.getCanonicalName().startsWith(KAFKA_SERVER_PARAM)).collect(Collectors.toList());
             for (ObjectName jmxMetric : jmxMetrics) {
-                JmxMetric metric = new JmxMetric();
+                Metric metric = new Metric();
                 metric.setCanonicalName(jmxMetric.getCanonicalName());
                 metric.setValue(getJmxMetric(jmxMetric.getCanonicalName(), msc, srv, jmxUrl));
                 result.add(metric);
@@ -107,8 +107,8 @@ public class JmxClusterUtil {
                 .flatMap(Function.identity()).flatMap(Function.identity()).collect(Collectors.toList());
     }
 
-    public JmxMetric reduceJmxMetrics (JmxMetric metric1, JmxMetric metric2) {
-        var result = new JmxMetric();
+    public Metric reduceJmxMetrics (Metric metric1, Metric metric2) {
+        var result = new Metric();
         Map<String, BigDecimal> jmx1 = new HashMap<>(metric1.getValue());
         Map<String, BigDecimal> jmx2 = new HashMap<>(metric2.getValue());
         jmx1.forEach((k, v) -> jmx2.merge(k, v, BigDecimal::add));

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

@@ -344,7 +344,7 @@ public class KafkaService {
             );
     }
 
-    public List<JmxMetric> getJmxMetric(String clusterName, Node node) {
+    public List<Metric> getJmxMetric(String clusterName, Node node) {
         return clustersStorage.getClusterByName(clusterName)
                         .map(c -> jmxClusterUtil.getJmxMetrics(c.getJmxPort(), node.host())).orElse(Collections.emptyList());
     }
@@ -363,14 +363,14 @@ public class KafkaService {
     }
 
     private InternalClusterMetrics calculateClusterMetrics(InternalClusterMetrics internalClusterMetrics) {
-        return internalClusterMetrics.toBuilder().jmxMetrics(
+        return internalClusterMetrics.toBuilder().metrics(
                     jmxClusterUtil.convertToMetricDto(internalClusterMetrics)
                             .stream().map(c -> {
-                        JmxMetric jmx = new JmxMetric();
+                        Metric jmx = new Metric();
                         jmx.setCanonicalName(c.getCanonicalName());
                         jmx.setValue(Map.of(c.getMetricName(), c.getValue()));
                         return jmx;
-                    }).collect(Collectors.groupingBy(JmxMetric::getCanonicalName, Collectors.reducing(jmxClusterUtil::reduceJmxMetrics)))
+                    }).collect(Collectors.groupingBy(Metric::getCanonicalName, Collectors.reducing(jmxClusterUtil::reduceJmxMetrics)))
                     .values().stream()
                     .filter(Optional::isPresent)
                     .map(Optional::get)

kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml

@@ -312,10 +312,10 @@ components:
           type: integer
         topicCount:
           type: integer
-        jmxMetrics:
+        metrics:
           type: array
           items:
-            $ref: '#/components/schemas/JmxMetric'
+            $ref: '#/components/schemas/Metric'
       required:
         - id
         - name
@@ -346,10 +346,10 @@ components:
           type: integer
         segmentZise:
           type: integer
-        jmxMetrics:
+        metrics:
           type: array
           items:
-            $ref: '#/components/schemas/JmxMetric'
+            $ref: '#/components/schemas/Metric'
 
     Topic:
       type: object
@@ -523,7 +523,7 @@ components:
           items:
             $ref: '#/components/schemas/ConsumerTopicPartitionDetail'
 
-    JmxMetric:
+    Metric:
       type: object
       properties:
         canonicalName: