diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2017-05-19 13:16:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-19 13:16:07 +0200 |
commit | 7f34cc05c885d939e8b001043d13178c152d8dad (patch) | |
tree | 00ff2a921372fc67ffe560edaf4b1bca6a7ea0ae | |
parent | 1019af4bcf31d2ad166d7a93db25cd85d17f8fc3 (diff) | |
parent | b8b87a43062860ba57410c6ed4c2d42e24910080 (diff) |
Merge pull request #2505 from yahoo/freva/rename-system-metrics-application
Rename system metrics application to "vespa.node"
3 files changed, 5 insertions, 5 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 cdbe94d05f0..01a28518e97 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 @@ -26,7 +26,7 @@ import java.util.stream.Collectors; public class MetricReceiverWrapper { // Application names used public static final String APPLICATION_DOCKER = "docker"; - public static final String APPLICATION_NODE = "node"; + public static final String APPLICATION_NODE = "vespa.node"; public static final String APPLICATION_HOST_LIFE = "host_life"; private final static ObjectMapper objectMapper = new ObjectMapper(); diff --git a/node-admin/src/test/resources/docker.stats.metrics.active.expected.json b/node-admin/src/test/resources/docker.stats.metrics.active.expected.json index b5fe0999e18..350a054ebac 100644 --- a/node-admin/src/test/resources/docker.stats.metrics.active.expected.json +++ b/node-admin/src/test/resources/docker.stats.metrics.active.expected.json @@ -30,7 +30,7 @@ } }, { - "application": "node", + "application": "vespa.node", "dimensions": { "flavor": "docker", "applicationName": "testapp", @@ -64,7 +64,7 @@ } }, { - "application": "node", + "application": "vespa.node", "dimensions": { "flavor": "docker", "applicationName": "testapp", @@ -97,7 +97,7 @@ } }, { - "application": "node", + "application": "vespa.node", "dimensions": { "flavor": "docker", "applicationName": "testapp", diff --git a/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json b/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json index ddfb1c61c06..ed2d5e04446 100644 --- a/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json +++ b/node-admin/src/test/resources/docker.stats.metrics.ready.expected.json @@ -1,6 +1,6 @@ [ { - "application": "node", + "application": "vespa.node", "dimensions": { "flavor": "docker", "role": "tenants", |