From 2ca59a819dfc8d12137ef20d6452f6491b3d4480 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 17 Dec 2017 21:56:07 +0100 Subject: [PATCH] Add num requests to monitor --- .../seednode_monitor/MetricsByNodeAddressMap.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/seednode_monitor/src/main/java/io/bisq/seednode_monitor/MetricsByNodeAddressMap.java b/seednode_monitor/src/main/java/io/bisq/seednode_monitor/MetricsByNodeAddressMap.java index caede9d955..8123f7d127 100644 --- a/seednode_monitor/src/main/java/io/bisq/seednode_monitor/MetricsByNodeAddressMap.java +++ b/seednode_monitor/src/main/java/io/bisq/seednode_monitor/MetricsByNodeAddressMap.java @@ -93,6 +93,7 @@ public class MetricsByNodeAddressMap extends HashMap { "" + "Operator" + "Node address" + + "Num requests" + "Num errors" + "Last error message" + "Duration average" + @@ -117,9 +118,11 @@ public class MetricsByNodeAddressMap extends HashMap { Map lastReceivedData = !allReceivedData.isEmpty() ? allReceivedData.get(allReceivedData.size() - 1) : new HashMap<>(); final String lastReceivedDataString = lastReceivedData.entrySet().stream().map(Object::toString).collect(Collectors.joining("
")); final String allReceivedDataString = allReceivedData.stream().map(Object::toString).collect(Collectors.joining("
")); + int numRequests = allDurations.size(); sb.append("\nOperator: ").append(operator) .append("\nNode address: ").append(nodeAddress) + .append("\nNum requests: ").append(numRequests) .append("\nNum errors: ").append(numErrors) .append("\nLast error message: ").append(lastErrorMsg) .append("\nDuration average: ").append(durationAverage) @@ -130,6 +133,7 @@ public class MetricsByNodeAddressMap extends HashMap { html.append("") .append("").append("" + operator + " ").append("") .append("").append("" + nodeAddress + " ").append("") + .append("").append("" + numRequests + " ").append("") .append("").append("" + numErrors + " ").append("") .append("").append("" + lastErrorMsg + " ").append("") .append("").append("" + durationAverage + " ").append("") @@ -143,16 +147,17 @@ public class MetricsByNodeAddressMap extends HashMap { String str = dataItem + ": " + deviation + "%"; sb.append(str).append("\n"); String color; - if (Math.abs(deviation - 100) == 0) + final double devAbs = Math.abs(deviation - 100); + if (devAbs < 5) color = "black"; - else if (Math.abs(deviation - 100) < 10) + else if (devAbs < 10) color = "blue"; else color = "red"; html.append("" + str + " ").append("
"); - if (deviation > 120 || deviation < 80) { + if (devAbs >= 20) { if (slackApi != null) slackApi.call(new SlackMessage("Warning: " + nodeAddress.getFullAddress(), "<" + operator + ">" + " Your seed node delivers diverging results for " + dataItem + ". " +