From 8858d881828bb889be4ef0079cd569b06c3c818b Mon Sep 17 00:00:00 2001 From: catdrink <2738035238@qq.com> Date: Sun, 8 Dec 2024 08:34:41 +0800 Subject: [PATCH] change param name and add some bound --- .../controller/MonitoringController.java | 14 +- .../manager/server/proxy/PrometheusProxy.java | 347 +++++++++--------- .../server/service/MonitoringService.java | 4 +- .../service/impl/MonitoringServiceImpl.java | 8 +- 4 files changed, 192 insertions(+), 181 deletions(-) diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MonitoringController.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MonitoringController.java index 6e6f1d07..c5a9752f 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MonitoringController.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MonitoringController.java @@ -46,23 +46,23 @@ public ResponseEntity agentHostsHealthyStatus() { return ResponseEntity.success(monitoringService.queryAgentsHealthyStatus()); } - @Operation(summary = "staticAgentInfo", description = "agent info query") + @Operation(summary = "staticAgentInfo", description = "agent static info query") @GetMapping("staticAgentInfo") public ResponseEntity queryAgentsInfo() { return ResponseEntity.success(monitoringService.queryAgentsInfo()); } - @Operation(summary = "dynamicAgentInfo", description = "agent info query") + @Operation(summary = "dynamicAgentInfo", description = "agent dynamic info query") @GetMapping("dynamicAgentInfo") - public ResponseEntity queryAgentsInfo(@RequestParam(value = "pace", defaultValue = "1") String pace) { - return ResponseEntity.success(monitoringService.queryAgentsInfo(pace)); + public ResponseEntity queryAgentsInfo(@RequestParam(value = "step", defaultValue = "1") String step) { + return ResponseEntity.success(monitoringService.queryAgentsInfo(step)); } - @Operation(summary = "cluster info", description = "cluster info") + @Operation(summary = "cluster info", description = "cluster multi info") @GetMapping("clusterInfo") public ResponseEntity queryCluster( @RequestParam(value = "clusterId") String clusterId, - @RequestParam(value = "pace", defaultValue = "1") String pace) { - return ResponseEntity.success(monitoringService.queryClusterInfo(clusterId, pace)); + @RequestParam(value = "step", defaultValue = "1") String step) { + return ResponseEntity.success(monitoringService.queryClusterInfo(clusterId, step)); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java index d39d8aac..f8ae4a7b 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java @@ -160,7 +160,7 @@ private JsonNode queryAgents() { ObjectNode node = objectMapper.createObjectNode(); node.put("agentsNum", iPv4addrArray.size()); node.set("iPv4addr", iPv4addrArray); - return node; // iPv4 + return node; } } return objectMapper.createObjectNode(); @@ -170,184 +170,195 @@ private JsonNode queryAgents() { * query agents static info */ public JsonNode queryAgentsInfo() { + JsonNode agents = queryAgents(); ObjectMapper objectMapper = new ObjectMapper(); - ArrayNode agentsInfo = objectMapper.createArrayNode(); - JsonNode agents = queryAgents().get("iPv4addr"); // get all host - for (JsonNode agent : agents) { - JsonNode cpuResult = retrieveAgentCpu(agent.asText()); - JsonNode memResult = retrieveAgentMemory(agent.asText()); - JsonNode diskResult = queryAgentDisk(agent.asText()); - ObjectNode temp = objectMapper.createObjectNode(); - // HOST - temp.put("hostname", cpuResult.get("hostname").asText()); - temp.put("iPv4addr", cpuResult.get("iPv4addr").asText()); - temp.put("cpuInfo", cpuResult.get("cpuInfo").asText().strip()); - // temp.put("iPv6addr", cpuResult.get("iPv6addr").asText()); - temp.put("os", cpuResult.get("os").asText()); - temp.put("architecture", cpuResult.get("architecture").asText()); - temp.put(PHYSICAL_CORES, cpuResult.get(PHYSICAL_CORES).asText()); - // MEM - temp.put(MEM_TOTAL, memResult.get(MEM_TOTAL).asLong()); - // DISK - temp.set(DISK_TOTAL, diskResult.get(DISK_TOTAL)); - agentsInfo.add(temp); + if (agents != null && !agents.isEmpty()) { + JsonNode agentsIpv4 = agents.get("iPv4addr"); + ArrayNode agentsInfo = objectMapper.createArrayNode(); + for (JsonNode agentIpv4 : agentsIpv4) { + JsonNode cpuResult = retrieveAgentCpu(agentIpv4.asText()); + JsonNode memResult = retrieveAgentMemory(agentIpv4.asText()); + JsonNode diskResult = queryAgentDisk(agentIpv4.asText()); + ObjectNode temp = objectMapper.createObjectNode(); + // HOST + temp.put("hostname", cpuResult.get("hostname").asText()); + temp.put("iPv4addr", cpuResult.get("iPv4addr").asText()); + temp.put("cpuInfo", cpuResult.get("cpuInfo").asText().strip()); + // temp.put("iPv6addr", cpuResult.get("iPv6addr").asText()); + temp.put("os", cpuResult.get("os").asText()); + temp.put("architecture", cpuResult.get("architecture").asText()); + temp.put(PHYSICAL_CORES, cpuResult.get(PHYSICAL_CORES).asText()); + // MEM + temp.put(MEM_TOTAL, memResult.get(MEM_TOTAL).asLong()); + // DISK + temp.set(DISK_TOTAL, diskResult.get(DISK_TOTAL)); + agentsInfo.add(temp); + } + return agentsInfo; } - return agentsInfo; + return objectMapper.createObjectNode(); } /** * query agents dynamic info */ - public JsonNode queryAgentsInfo(String pace) { + public JsonNode queryAgentsInfo(String step) { JsonNode agents = queryAgents(); - JsonNode agentsIpv4 = agents.get("iPv4addr"); - ObjectMapper mapper = new ObjectMapper(); - ArrayNode agentsInfo = mapper.createArrayNode(); - for (JsonNode agentIpv4 : agentsIpv4) { - ObjectNode ag = mapper.createObjectNode(); - double[] agentsCpuUsage = new double[6]; - double[] agentsCpuLoad1 = new double[6]; - double[] agentsCpuLoad2 = new double[6]; - double[] agentsCpuLoad3 = new double[6]; - long[] agentMemIdle = new long[6]; - long[] agentMemTotal = new long[6]; - long[] agentDiskRead = new long[6]; - long[] agentDiskWrite = new long[6]; - // real-time cpuUsage - JsonNode agentCpu = retrieveAgentCpu(agentIpv4.asText()); - // real-time mem - JsonNode agentMem = retrieveAgentMemory(agentIpv4.asText()); - // real-time disk - JsonNode agentDisk = queryAgentDisk(agentIpv4.asText()); - // real-time diskIO - JsonNode agentDiskIO = queryAgentDiskIO(agentIpv4.asText()); - - // dynamic - JsonNode agentCpuInterval = retrieveAgentCpu(agentIpv4.asText(), pace); - JsonNode agentMemInterval = retrieveAgentMemory(agentIpv4.asText(), pace); - JsonNode agentDiskIOInterval = queryAgentDiskIO(agentIpv4.asText(), pace); - for (int i = 0; i < 6; i++) { - // CPU - System.out.println(agentCpuInterval); - agentsCpuUsage[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_USAGE, i); - agentsCpuLoad1[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_1, i); - agentsCpuLoad2[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_5, i); - agentsCpuLoad3[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_15, i); - - // MEM - agentMemIdle[i] = ProxyUtils.getLongSafely(agentMemInterval, MEM_IDLE, i); - agentMemTotal[i] = ProxyUtils.getLongSafely(agentMemInterval, MEM_TOTAL, i); - - // DISK IO - agentDiskRead[i] = ProxyUtils.getLongSafely(agentDiskIOInterval, DISK_READ, i); - agentDiskWrite[i] = ProxyUtils.getLongSafely(agentDiskIOInterval, DISK_WRITE, i); + ObjectMapper objectMapper = new ObjectMapper(); + if (agents != null && !agents.isEmpty()) { + JsonNode agentsIpv4 = agents.get("iPv4addr"); + ArrayNode agentsInfo = objectMapper.createArrayNode(); + for (JsonNode agentIpv4 : agentsIpv4) { + ObjectNode ag = objectMapper.createObjectNode(); + double[] agentsCpuUsage = new double[6]; + double[] agentsCpuLoad1 = new double[6]; + double[] agentsCpuLoad2 = new double[6]; + double[] agentsCpuLoad3 = new double[6]; + long[] agentMemIdle = new long[6]; + long[] agentMemTotal = new long[6]; + long[] agentDiskRead = new long[6]; + long[] agentDiskWrite = new long[6]; + // real-time cpuUsage + JsonNode agentCpu = retrieveAgentCpu(agentIpv4.asText()); + // real-time mem + JsonNode agentMem = retrieveAgentMemory(agentIpv4.asText()); + // real-time disk + JsonNode agentDisk = queryAgentDisk(agentIpv4.asText()); + // real-time diskIO + JsonNode agentDiskIO = queryAgentDiskIO(agentIpv4.asText()); + + // dynamic + JsonNode agentCpuInterval = retrieveAgentCpu(agentIpv4.asText(), step); + JsonNode agentMemInterval = retrieveAgentMemory(agentIpv4.asText(), step); + JsonNode agentDiskIOInterval = queryAgentDiskIO(agentIpv4.asText(), step); + for (int i = 0; i < 6; i++) { + // CPU + System.out.println(agentCpuInterval); + agentsCpuUsage[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_USAGE, i); + agentsCpuLoad1[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_1, i); + agentsCpuLoad2[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_5, i); + agentsCpuLoad3[i] = ProxyUtils.getDoubleSafely(agentCpuInterval, CPU_LOAD_AVG_MIN_15, i); + + // MEM + agentMemIdle[i] = ProxyUtils.getLongSafely(agentMemInterval, MEM_IDLE, i); + agentMemTotal[i] = ProxyUtils.getLongSafely(agentMemInterval, MEM_TOTAL, i); + + // DISK IO + agentDiskRead[i] = ProxyUtils.getLongSafely(agentDiskIOInterval, DISK_READ, i); + agentDiskWrite[i] = ProxyUtils.getLongSafely(agentDiskIOInterval, DISK_WRITE, i); + } + // cur + ag.put("cpu_usage_cur", agentCpu.get(CPU_USAGE).asDouble()); + ag.put( + "memory_usage_cur", + (double) (agentMem.get(MEM_TOTAL).asLong() + - agentMem.get(MEM_IDLE).asLong()) + / agentMem.get(MEM_TOTAL).asLong()); + ag.put( + "disk_usage_cur", + (double) (agentDisk.get(DISK_TOTAL).asLong() + - agentDisk.get(DISK_IDLE).asLong()) + / agentDisk.get(DISK_TOTAL).asLong()); + ag.put( + "file_descriptor_usage", + (double) agentCpu.get(FILE_OPEN_DESCRIPTOR).asLong() + / agentCpu.get(FILE_TOTAL_DESCRIPTOR).asLong()); + ag.put("disk_read", agentDiskIO.get(DISK_READ).asLong()); + ag.put("disk_read", agentDiskIO.get(DISK_WRITE).asLong()); + // cpu + ag.set("cpu_usage", ProxyUtils.array2node(agentsCpuUsage)); + ag.set("system_load1", ProxyUtils.array2node(agentsCpuLoad1)); + ag.set("system_load2", ProxyUtils.array2node(agentsCpuLoad2)); + ag.set("system_load3", ProxyUtils.array2node(agentsCpuLoad3)); + // mem + ag.set("memory_usage", ProxyUtils.array2node(agentMemIdle, agentMemTotal)); + // disk io + ag.set("disk_read", ProxyUtils.array2node(agentDiskRead)); + ag.set("disk_write", ProxyUtils.array2node(agentDiskWrite)); + + agentsInfo.add(ag); } - // cur - ag.put("cpu_usage_cur", agentCpu.get(CPU_USAGE).asDouble()); - ag.put( - "memory_usage_cur", - (double) (agentMem.get(MEM_TOTAL).asLong() - - agentMem.get(MEM_IDLE).asLong()) - / agentMem.get(MEM_TOTAL).asLong()); - ag.put( - "disk_usage_cur", - (double) (agentDisk.get(DISK_TOTAL).asLong() - - agentDisk.get(DISK_IDLE).asLong()) - / agentDisk.get(DISK_TOTAL).asLong()); - ag.put( - "file_descriptor_usage", - (double) agentCpu.get(FILE_OPEN_DESCRIPTOR).asLong() - / agentCpu.get(FILE_TOTAL_DESCRIPTOR).asLong()); - ag.put("disk_read", agentDiskIO.get(DISK_READ).asLong()); - ag.put("disk_read", agentDiskIO.get(DISK_WRITE).asLong()); - // cpu - ag.set("cpu_usage", ProxyUtils.array2node(agentsCpuUsage)); - ag.set("system_load1", ProxyUtils.array2node(agentsCpuLoad1)); - ag.set("system_load2", ProxyUtils.array2node(agentsCpuLoad2)); - ag.set("system_load3", ProxyUtils.array2node(agentsCpuLoad3)); - // mem - ag.set("memory_usage", ProxyUtils.array2node(agentMemIdle, agentMemTotal)); - // disk io - ag.set("disk_read", ProxyUtils.array2node(agentDiskRead)); - ag.set("disk_write", ProxyUtils.array2node(agentDiskWrite)); - - agentsInfo.add(ag); + return agentsInfo; } - return agentsInfo; + return objectMapper.createObjectNode(); } /** * query cluster info */ - public JsonNode queryClusterInfo(String clusterId, String pace) { - JsonNode agents = bigtopProxy.queryClusterAgentsList(clusterId).get("agents"); // cluster's agents - int agentsNum = - bigtopProxy.queryClusterAgentsList(clusterId).get("agentsNum").asInt(); // agentsNum - ObjectMapper mapper = new ObjectMapper(); - int total_physical_cores = 0; - long totalMemSpace = 0L; - long totalDiskSpace = 0L; - long totalMemIdle = 0L; - double instantCpuUsage = 0.0; - double[][] agentsCpuUsage = new double[agentsNum][6]; - double[][] agentsCpuLoad1 = new double[agentsNum][6]; - double[][] agentsCpuLoad2 = new double[agentsNum][6]; - double[][] agentsCpuLoad3 = new double[agentsNum][6]; - long[][] agentMemIdle = new long[agentsNum][6]; - long[][] agentMemTotal = new long[agentsNum][6]; - int agentIndex = 0; - ObjectNode clusterInfo = mapper.createObjectNode(); - for (JsonNode agentIpv4 : agents) { - // real-time cpuUsage - JsonNode agentCpu = retrieveAgentCpu(agentIpv4.asText()); - instantCpuUsage += agentCpu.get("cpuUsage").asDouble() - * agentCpu.get(PHYSICAL_CORES).asInt(); - // real-time mem - JsonNode agentMem = retrieveAgentMemory(agents.asText()); - totalMemIdle += agentMem.get("memIdle").asLong(); - totalMemSpace += agentMem.get(("memTotal")).asLong(); - // real-time disk - JsonNode agentDisk = queryAgentDisk(agentIpv4.asText()); - totalDiskSpace += agentDisk.get(DISK_TOTAL).asLong(); - - // avg time - JsonNode agentCpuStep = retrieveAgentCpu(agentIpv4.asText(), pace); - JsonNode agentMemStep = retrieveAgentMemory(agents.asText(), pace); - int agent_physical_cores = agentCpuStep.get(PHYSICAL_CORES).asInt(); - total_physical_cores += agent_physical_cores; - for (int i = 0; i < 6; i++) { - // CPU - agentsCpuUsage[agentIndex][i] = - ProxyUtils.getDoubleSafely(agentCpuStep, CPU_USAGE, i) * agent_physical_cores; - agentsCpuLoad1[agentIndex][i] = - ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_1, i) * agent_physical_cores; - agentsCpuLoad2[agentIndex][i] = - ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_5, i) * agent_physical_cores; - agentsCpuLoad3[agentIndex][i] = - ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_15, i) * agent_physical_cores; + public JsonNode queryClusterInfo(String clusterId, String step) { + JsonNode clusterAgents = bigtopProxy.queryClusterAgents(clusterId); + ObjectMapper objectMapper = new ObjectMapper(); + if (clusterAgents != null && !clusterAgents.isEmpty()) { + JsonNode agents = clusterAgents.get("agents"); // cluster's agents + int agentsNum = + bigtopProxy.queryClusterAgents(clusterId).get("agentsNum").asInt(); // agentsNum + int total_physical_cores = 0; + long totalMemSpace = 0L, totalDiskSpace = 0L, totalMemIdle = 0L; + double instantCpuUsage = 0.0; + double[][] agentsCpuUsage = new double[agentsNum][6]; + double[][] agentsCpuLoad1 = new double[agentsNum][6]; + double[][] agentsCpuLoad2 = new double[agentsNum][6]; + double[][] agentsCpuLoad3 = new double[agentsNum][6]; + long[][] agentMemIdle = new long[agentsNum][6]; + long[][] agentMemTotal = new long[agentsNum][6]; + int agentIndex = 0; + ObjectNode clusterInfo = objectMapper.createObjectNode(); + for (JsonNode agentIpv4 : agents) { + // real-time cpuUsage + JsonNode agentCpu = retrieveAgentCpu(agentIpv4.asText()); + instantCpuUsage += agentCpu.get("cpuUsage").asDouble() + * agentCpu.get(PHYSICAL_CORES).asInt(); + // real-time mem + JsonNode agentMem = retrieveAgentMemory(agents.asText()); + totalMemIdle += agentMem.get("memIdle").asLong(); + totalMemSpace += agentMem.get(("memTotal")).asLong(); + // real-time disk + JsonNode agentDisk = queryAgentDisk(agentIpv4.asText()); + totalDiskSpace += agentDisk.get(DISK_TOTAL).asLong(); + + // avg time + JsonNode agentCpuStep = retrieveAgentCpu(agentIpv4.asText(), step); + JsonNode agentMemStep = retrieveAgentMemory(agents.asText(), step); + int agent_physical_cores = agentCpuStep.get(PHYSICAL_CORES).asInt(); + total_physical_cores += agent_physical_cores; + for (int i = 0; i < 6; i++) { + // CPU + agentsCpuUsage[agentIndex][i] = + ProxyUtils.getDoubleSafely(agentCpuStep, CPU_USAGE, i) * agent_physical_cores; + agentsCpuLoad1[agentIndex][i] = + ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_1, i) * agent_physical_cores; + agentsCpuLoad2[agentIndex][i] = + ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_5, i) * agent_physical_cores; + agentsCpuLoad3[agentIndex][i] = + ProxyUtils.getDoubleSafely(agentCpuStep, CPU_LOAD_AVG_MIN_15, i) * agent_physical_cores; + + // MEM + agentMemIdle[agentIndex][i] = ProxyUtils.getLongSafely(agentMemStep, MEM_IDLE, i); + agentMemTotal[agentIndex][i] = ProxyUtils.getLongSafely(agentMemStep, MEM_TOTAL, i); + } - // MEM - agentMemIdle[agentIndex][i] = ProxyUtils.getLongSafely(agentMemStep, MEM_IDLE, i); - agentMemTotal[agentIndex][i] = ProxyUtils.getLongSafely(agentMemStep, MEM_TOTAL, i); + agentIndex++; // loop of agents } + // static + clusterInfo.put("total_physical_cores", total_physical_cores); + clusterInfo.put("total_memory", totalMemSpace); + clusterInfo.put("total_disk", totalDiskSpace); + + // cur + clusterInfo.put("cpu_usage_cur", instantCpuUsage / total_physical_cores); + clusterInfo.put("memory_usage_cur", (double) (totalMemSpace - totalMemIdle) / totalMemSpace); + + // cpu + clusterInfo.set("cpu_usage", ProxyUtils.array2node(agentsCpuUsage, total_physical_cores, agentsNum)); + clusterInfo.set("system_load1", ProxyUtils.array2node(agentsCpuLoad1, total_physical_cores, agentsNum)); + clusterInfo.set("system_load2", ProxyUtils.array2node(agentsCpuLoad2, total_physical_cores, agentsNum)); + clusterInfo.set("system_load3", ProxyUtils.array2node(agentsCpuLoad3, total_physical_cores, agentsNum)); + + // mem + clusterInfo.set("memory_usage", ProxyUtils.array2node(agentMemIdle, agentMemTotal, agentsNum)); + return clusterInfo; } - // static - clusterInfo.put("total_physical_cores", total_physical_cores); - clusterInfo.put("total_memory", totalMemSpace); - clusterInfo.put("total_disk", totalDiskSpace); - - // cur - clusterInfo.put("cpu_usage_cur", instantCpuUsage / total_physical_cores); - clusterInfo.put("memory_usage_cur", (double) (totalMemSpace - totalMemIdle) / totalMemSpace); - - // cpu - clusterInfo.set("cpu_usage", ProxyUtils.array2node(agentsCpuUsage, total_physical_cores, agentsNum)); - clusterInfo.set("system_load1", ProxyUtils.array2node(agentsCpuLoad1, total_physical_cores, agentsNum)); - clusterInfo.set("system_load2", ProxyUtils.array2node(agentsCpuLoad2, total_physical_cores, agentsNum)); - clusterInfo.set("system_load3", ProxyUtils.array2node(agentsCpuLoad3, total_physical_cores, agentsNum)); - - // mem - clusterInfo.set("memory_usage", ProxyUtils.array2node(agentMemIdle, agentMemTotal, agentsNum)); - return clusterInfo; + return objectMapper.createObjectNode(); } /** @@ -390,14 +401,14 @@ public JsonNode retrieveAgentCpu(String iPv4addr) { /** * retrieve cpu internal */ - public JsonNode retrieveAgentCpu(String iPv4addr, String pace) { + public JsonNode retrieveAgentCpu(String iPv4addr, String step) { String params = String.format("agent_host_monitoring_cpu{iPv4addr=\"%s\"}", iPv4addr); - ArrayList timeStampsList = ProxyUtils.getTimeStampsList(Integer.parseInt(pace)); + ArrayList timeStampsList = ProxyUtils.getTimeStampsList(Integer.parseInt(step)); JsonNode result = queryRange( params, timeStampsList.get(timeStampsList.size() - 1), timeStampsList.get(0), - ProxyUtils.Number2Param(Integer.parseInt(pace))); // end start + ProxyUtils.Number2Param(Integer.parseInt(step))); // end start ObjectMapper objectMapper = new ObjectMapper(); if (result != null) { JsonNode agentCpu = result.get("data").get("result"); @@ -462,14 +473,14 @@ public JsonNode retrieveAgentMemory(String iPv4addr) { /** * retrieve memory internal */ - public JsonNode retrieveAgentMemory(String iPv4addr, String pace) { + public JsonNode retrieveAgentMemory(String iPv4addr, String step) { String params = String.format("agent_host_monitoring_mem{iPv4addr=\"%s\"}", iPv4addr); - ArrayList timeStampsList = ProxyUtils.getTimeStampsList(Integer.parseInt(pace)); // sum 8 and between 7 + ArrayList timeStampsList = ProxyUtils.getTimeStampsList(Integer.parseInt(step)); JsonNode result = queryRange( params, timeStampsList.get(timeStampsList.size() - 1), timeStampsList.get(0), - ProxyUtils.Number2Param(Integer.parseInt(pace))); // end start + ProxyUtils.Number2Param(Integer.parseInt(step))); ObjectMapper objectMapper = new ObjectMapper(); if (result != null) { JsonNode agentMem = result.get("data").get("result"); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/MonitoringService.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/MonitoringService.java index 8dfdcafa..09ed562e 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/MonitoringService.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/MonitoringService.java @@ -26,7 +26,7 @@ public interface MonitoringService { JsonNode queryAgentsInfo(); - JsonNode queryAgentsInfo(String pace); + JsonNode queryAgentsInfo(String step); - JsonNode queryClusterInfo(String clusterId, String pace); + JsonNode queryClusterInfo(String clusterId, String step); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/MonitoringServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/MonitoringServiceImpl.java index 794cc8b6..6cfc2c14 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/MonitoringServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/MonitoringServiceImpl.java @@ -46,12 +46,12 @@ public JsonNode queryAgentsInfo() { } @Override - public JsonNode queryAgentsInfo(String pace) { - return prometheusProxy.queryAgentsInfo(pace); + public JsonNode queryAgentsInfo(String step) { + return prometheusProxy.queryAgentsInfo(step); } @Override - public JsonNode queryClusterInfo(String clusterId, String pace) { - return prometheusProxy.queryClusterInfo(clusterId, pace); + public JsonNode queryClusterInfo(String clusterId, String step) { + return prometheusProxy.queryClusterInfo(clusterId, step); } }