summaryrefslogtreecommitdiffstats
path: root/docker-api/src
diff options
context:
space:
mode:
authorfreva <valerijf@yahoo-inc.com>2016-10-21 12:41:23 +0200
committerfreva <valerijf@yahoo-inc.com>2016-10-21 12:41:23 +0200
commit973f49a7f2d7eb970a4da379433c97aaa86cbd41 (patch)
treeb0ed2f7b6a9a9a17f3dff5ae3a475511bf41761b /docker-api/src
parent4696635291d8168bdbe501d836dfd3ea36c49333 (diff)
Add routing to metrics output, add zone and parentHostname to dimensions
Diffstat (limited to 'docker-api/src')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
index 26cbaff720c..842ad722e5b 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
@@ -100,11 +100,17 @@ public class MetricReceiverWrapper implements Iterable<MetricReceiverWrapper.Dim
}
public String toSecretAgentReport() throws JsonProcessingException {
+ final Map<String, Object> routing = new HashMap<>();
+ final Map<String, Object> routingYamas = new HashMap<>();
+ routing.put("yamas", routingYamas);
+ routingYamas.put("namespaces", new String[]{"Vespa"});
+
Map<String, Object> report = new LinkedHashMap<>();
report.put("application", "docker");
report.put("timestamp", System.currentTimeMillis() / 1000);
report.put("dimensions", dimensions.dimensionsMap);
report.put("metrics", metrics);
+ report.put("routing", routing);
return objectMapper.writeValueAsString(report);
}