summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-05-19 13:16:07 +0200
committerGitHub <noreply@github.com>2017-05-19 13:16:07 +0200
commit7f34cc05c885d939e8b001043d13178c152d8dad (patch)
tree00ff2a921372fc67ffe560edaf4b1bca6a7ea0ae /node-admin
parent1019af4bcf31d2ad166d7a93db25cd85d17f8fc3 (diff)
parentb8b87a43062860ba57410c6ed4c2d42e24910080 (diff)
Merge pull request #2505 from yahoo/freva/rename-system-metrics-application
Rename system metrics application to "vespa.node"
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/test/resources/docker.stats.metrics.active.expected.json6
-rw-r--r--node-admin/src/test/resources/docker.stats.metrics.ready.expected.json2
2 files changed, 4 insertions, 4 deletions
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",