diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-24 11:40:30 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-24 11:40:30 +0200 |
| commit | 78cfca5f6794f816adff2b33c9b35da67794f9b5 (patch) | |
| tree | 2d9a91a32fefca095cb3d6b687dbaba00041735a /node-admin | |
| parent | 36e250fc367e7d83c2eb20eca82c19f10d380a8c (diff) | |
Do not set flavor/canonicalFlavor dimensions for node metrics
Diffstat (limited to 'node-admin')
2 files changed, 0 insertions, 6 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 0f150ad9065..738babb4bf0 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -163,8 +163,6 @@ public class StorageMaintainer { context.node().getVespaVersion().ifPresent(version -> tags.put("vespaVersion", version.toFullString())); if (! isConfigserverLike(context.nodeType())) { - tags.put("flavor", context.node().getFlavor()); - tags.put("canonicalFlavor", context.node().getCanonicalFlavor()); tags.put("state", context.node().getState().toString()); context.node().getParentHostname().ifPresent(parent -> tags.put("parentHostname", parent)); context.node().getOwner().ifPresent(owner -> { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java index 538bb60555f..1ec957a4dbb 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java @@ -71,8 +71,6 @@ public class StorageMaintainerTest { " role: tenants\n" + " zone: prod.us-north-1\n" + " vespaVersion: 6.305.12\n" + - " flavor: d-2-8-50\n" + - " canonicalFlavor: d-2-8-50\n" + " state: active\n" + " parentHostname: host123.test.domain.tld\n" + " tenantName: tenant\n" + @@ -103,8 +101,6 @@ public class StorageMaintainerTest { " role: routing\n" + " zone: prod.us-north-1\n" + " vespaVersion: 6.305.12\n" + - " flavor: d-2-8-50\n" + - " canonicalFlavor: d-2-8-50\n" + " state: active\n" + " parentHostname: host123.test.domain.tld\n" + " tenantName: tenant\n" + |