qrserver -> container, part 2

2 files changed, 5 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
index 5e10001baf6..2ff6a8f4505 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
@@ -33,7 +33,7 @@ public class DefaultMetrics {
         return ImmutableSet.<Metric>builder()
                 .addAll(getContentMetrics())
                 .addAll(getContainerMetrics())
-                .addAll(getQrserverMetrics())
+                .addAll(getSearchMetrics())
                 .build();
     }
 
@@ -51,7 +51,7 @@ public class DefaultMetrics {
         return metrics;
     }
 
-    private static Set<Metric> getQrserverMetrics() {
+    private static Set<Metric> getSearchMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
         metrics.add(new Metric("queries.rate"));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 6ce8c54f98c..60b86b9785f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -28,7 +28,7 @@ public class VespaMetricSet {
         metrics.addAll(getDistributorMetrics());
         metrics.addAll(getDocprocMetrics());
         metrics.addAll(getClusterControllerMetrics());
-        metrics.addAll(getQrserverMetrics());
+        metrics.addAll(getSearchMetrics());
         metrics.addAll(getContainerMetrics());
         metrics.addAll(getConfigServerMetrics());
         metrics.addAll(getSentinelMetrics());
@@ -297,7 +297,7 @@ public class VespaMetricSet {
         return metrics;
     }
 
-    private static Set<Metric> getQrserverMetrics() {
+    private static Set<Metric> getSearchMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
         metrics.add(new Metric("peak_qps.max"));
@@ -351,7 +351,7 @@ public class VespaMetricSet {
         metrics.add(new Metric("relevance.at_10.sum"));
         metrics.add(new Metric("relevance.at_10.count"));
 
-        // Errors from qrserver
+        // Errors from search container
         metrics.add(new Metric("error.timeout.rate"));
         metrics.add(new Metric("error.backends_oos.rate"));
         metrics.add(new Metric("error.plugin_failure.rate"));