diff --git a/src/main/java/dev/dinauer/NodeResource.java b/src/main/java/dev/dinauer/NodeResource.java index 31fc9da..a9b7c96 100644 --- a/src/main/java/dev/dinauer/NodeResource.java +++ b/src/main/java/dev/dinauer/NodeResource.java @@ -26,25 +26,10 @@ public class NodeResource { @GET @Produces(MediaType.APPLICATION_JSON) - public List getMonitoring() throws IOException, InterruptedException + public List getMonitoring() { List result = new ArrayList<>(); - List stats = getTopNodes(); - for(String nodeName : stats) - { - String[] parts = nodeName.split("\\s+"); - if(parts.length == 5) - { - String name = parts[0]; - Node node = ClientProvider.getClient().nodes().withName(name).get(); - Integer absoluteCpu = extractInteger(parts[1]); - Integer relativeCpu = extractInteger(parts[2]); - Integer absoluteMemory = extractMemory(parts[3]); - Integer relativeMemory = extractInteger(parts[4]); - result.add(new NodeStats(node, absoluteCpu, relativeCpu, Integer.parseInt(node.getStatus().getAllocatable().get("cpu").getAmount()) * 1000, absoluteMemory, relativeMemory, extractMemory(node.getStatus().getAllocatable().get("memory").getAmount()))); - } - } return result; } diff --git a/src/main/java/dev/dinauer/utils/ClientProvider.java b/src/main/java/dev/dinauer/utils/ClientProvider.java index 8d43331..2e954ba 100644 --- a/src/main/java/dev/dinauer/utils/ClientProvider.java +++ b/src/main/java/dev/dinauer/utils/ClientProvider.java @@ -1,6 +1,7 @@ package dev.dinauer.utils; import io.fabric8.kubernetes.client.Config; +import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.vertx.mutiny.core.Vertx;