summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-09-18 12:11:03 +0200
committerJon Bratseth <bratseth@gmail.com>2020-09-18 12:11:03 +0200
commitc5ea74aa6d3617e7edc77a6390c8c7d7a1287216 (patch)
tree59e6650a70ee50674229cc69b1f80ac7965fb9fa
parent7b7c1a98a4b963473c1fc7f4808744bad16e09cf (diff)
No functional changes
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java4
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 59a7ae739a9..bdd7e128233 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -56,7 +56,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerClus
import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.LEGACY_APPLICATION;
import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.SYSTEM;
import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.TENANT;
-import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultPublicConsumer;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultMetricsConsumer;
import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumer;
import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty;
@@ -164,7 +164,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
var amendedVespaConsumer = addMetrics(vespaMetricsConsumer(), getAdditionalDefaultMetrics().getMetrics());
builder.consumer.addAll(generateConsumers(amendedVespaConsumer, getUserMetricsConsumers()));
- builder.consumer.add(toConsumerBuilder(defaultPublicConsumer()));
+ builder.consumer.add(toConsumerBuilder(defaultMetricsConsumer()));
}
@Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java
index cc1c50ca6e1..7e99dcde2ae 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java
@@ -22,7 +22,7 @@ public class MetricsConsumers {
public static final String defaultMetricsConsumerId = ValuesFetcher.defaultMetricsConsumerId.id;
public static final String vespaMetricsConsumerId = VespaMetrics.vespaMetricsConsumerId.id;
- public static MetricsConsumer defaultPublicConsumer() {
+ public static MetricsConsumer defaultMetricsConsumer() {
return consumer("default-consumer-metrics", defaultMetricSet, systemMetricSet);
}