Merge pull request #6381 from vespa-engine/ovirtanen/zookeeper-metrics-in-configserver

Report zookeeper monitoring statistics in configserver; proposed metrics keys approved

1 files changed, 6 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index a7a93e75293..bd98ccea8ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -68,6 +68,12 @@ public class VespaMetricSet {
         metrics.add(new Metric("configserver.delayedResponses.count", "configserver.delayedResponses"));
         metrics.add(new Metric("configserver.sessionChangeErrors.count", "configserver.sessionChangeErrors"));
 
+        metrics.add(new Metric("configserver.zkZNodes.last", "configserver.zkZNodes"));
+        metrics.add(new Metric("configserver.zkAvgLatency.last", "configserver.zkAvgLatency"));
+        metrics.add(new Metric("configserver.zkMaxLatency.last", "configserver.zkMaxLatency"));
+        metrics.add(new Metric("configserver.zkConnections.last", "configserver.zkConnections"));
+        metrics.add(new Metric("configserver.zkOutstandingRequests.last", "configserver.zkOutstandingRequests"));
+
         return metrics;
     }