diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-07-09 19:17:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-09 19:17:14 +0200 |
commit | 005500dc628d65c2a1ca8182cfa6e8981a8d9f90 (patch) | |
tree | ddf975e191590b58aba40acbe121fa36f35167ca /config-model | |
parent | dba2bb8101d98defa03d433469831efff92ea875 (diff) | |
parent | 4676cc1c15523c1ac159708022ce228afcf7f802 (diff) |
Merge pull request #13854 from vespa-engine/vekterli/remove-part-of-sum-metrics-from-statereporter-metric-consumer
Remove "partofsum" metrics from statereporter consumer
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 2 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 9fb553fffde..9923cb2fece 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -711,7 +711,7 @@ public class ContentCluster extends AbstractConfigProducer implements name("statereporter"). addedmetrics("*"). removedtags("thread"). - tags("disk")); + removedtags("partofsum")); } private static final String DEFAULT_BUCKET_SPACE = "default"; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 1f0ec0ea910..0a97bcc700f 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -652,7 +652,8 @@ public class ContentClusterTest extends ContentBaseTest { assertEquals("statereporter", config.consumer(5).name()); assertEquals("*", config.consumer(5).addedmetrics(0)); assertEquals("thread", config.consumer(5).removedtags(0)); - assertEquals("disk", config.consumer(5).tags(0)); + assertEquals("partofsum", config.consumer(5).removedtags(1)); + assertEquals(0, config.consumer(5).tags().size()); cluster.getStorageNodes().getConfig(builder); config = new MetricsmanagerConfig(builder); |