aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2021-03-04 14:59:06 +0100
committerJon Bratseth <bratseth@gmail.com>2021-03-04 14:59:06 +0100
commit6f7fbd44239daf9c0ff8064cca23edd8e1660991 (patch)
treee2e1ba8745be82310c2b9777b892e2518e5a8f74 /config-model/src/main/java/com
parent399ef4d7864d9334006ce68e46c72b827f2843aa (diff)
Non-functional changes only
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java1
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 0f006c31959..a24ba93c80e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -105,6 +105,7 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable
return metricsProxyCluster;
}
+ /** Use by model amenders */
public void setAdditionalDefaultMetrics(MetricSet additionalDefaultMetrics) {
if (additionalDefaultMetrics == null) return;
this.additionalDefaultMetrics = additionalDefaultMetrics;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
index 30797f27789..9c969d4f11e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
@@ -43,13 +43,13 @@ public class MetricSet {
/**
* Returns all metrics in this set, including all metrics in any contained metric sets.
- * <br>
+ *
* Joins this set's metrics with its child sets into a named flat map of metrics.
* In the case of duplicate metrics, the metrics directly defined in this set
* takes precedence with respect to output name, description and dimension value
* (even if they are empty), while new dimensions from the children will be added.
*
- * @return All metrics contained in this set.
+ * @return all the metrics contained in this set
*/
public final Map<String, Metric> getMetrics() {
return unmodifiableMap(flatten(metrics, children));