Move metrics definitions to metrics:ai.vespa.metrics

6 files changed, 42 insertions, 43 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
index 8bb6be16e4a..685ca377e70 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AutoscalingMetrics.java
@@ -1,9 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
-import com.yahoo.metrics.ContainerMetrics;
-import com.yahoo.metrics.SearchNodeMetrics;
-import com.yahoo.metrics.StorageMetrics;
-import com.yahoo.metrics.HostedNodeAdminMetrics;
+
+import ai.vespa.metrics.ContainerMetrics;
+import ai.vespa.metrics.HostedNodeAdminMetrics;
+import ai.vespa.metrics.SearchNodeMetrics;
+import ai.vespa.metrics.StorageMetrics;
+
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
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 1977a584713..8652acbd546 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
@@ -2,22 +2,22 @@
 
 package com.yahoo.vespa.model.admin.monitoring;
 
-import com.yahoo.metrics.ContainerMetrics;
-import com.yahoo.metrics.SearchNodeMetrics;
-import com.yahoo.metrics.Suffix;
-import com.yahoo.metrics.VespaMetrics;
+import ai.vespa.metrics.ContainerMetrics;
+import ai.vespa.metrics.SearchNodeMetrics;
+import ai.vespa.metrics.Suffix;
+import ai.vespa.metrics.VespaMetrics;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static com.yahoo.metrics.Suffix.average;
-import static com.yahoo.metrics.Suffix.count;
-import static com.yahoo.metrics.Suffix.max;
-import static com.yahoo.metrics.Suffix.ninety_five_percentile;
-import static com.yahoo.metrics.Suffix.ninety_nine_percentile;
-import static com.yahoo.metrics.Suffix.sum;
+import static ai.vespa.metrics.Suffix.average;
+import static ai.vespa.metrics.Suffix.count;
+import static ai.vespa.metrics.Suffix.max;
+import static ai.vespa.metrics.Suffix.ninety_five_percentile;
+import static ai.vespa.metrics.Suffix.ninety_nine_percentile;
+import static ai.vespa.metrics.Suffix.sum;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
index d4c3f908eeb..ac03fcf56cb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
@@ -1,9 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
 
-import com.yahoo.metrics.ContainerMetrics;
-import com.yahoo.metrics.SearchNodeMetrics;
-
+import ai.vespa.metrics.ContainerMetrics;
+import ai.vespa.metrics.SearchNodeMetrics;
 import com.google.common.collect.ImmutableSet;
 
 import java.util.Set;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java
index 839dcad64ee..21e7d35fc7c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java
@@ -1,8 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
 
-import com.yahoo.metrics.HostedNodeAdminMetrics;
-
+import ai.vespa.metrics.HostedNodeAdminMetrics;
 import com.google.common.collect.ImmutableSet;
 
 import java.util.Set;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
index eee6be9af93..64f2a72d1b4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/SystemMetrics.java
@@ -1,8 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
 
-import com.yahoo.metrics.HostedNodeAdminMetrics;
-
+import ai.vespa.metrics.HostedNodeAdminMetrics;
 import com.google.common.collect.ImmutableSet;
 
 import java.util.Set;
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 f933325b8ae..362bc7b0964 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
@@ -1,34 +1,34 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.monitoring;
 
-import com.yahoo.metrics.ClusterControllerMetrics;
-import com.yahoo.metrics.ConfigServerMetrics;
-import com.yahoo.metrics.ContainerMetrics;
-import com.yahoo.metrics.DistributorMetrics;
-import com.yahoo.metrics.LogdMetrics;
-import com.yahoo.metrics.NodeAdminMetrics;
-import com.yahoo.metrics.RoutingLayerMetrics;
-import com.yahoo.metrics.SearchNodeMetrics;
-import com.yahoo.metrics.SentinelMetrics;
-import com.yahoo.metrics.SlobrokMetrics;
-import com.yahoo.metrics.StorageMetrics;
-import com.yahoo.metrics.Suffix;
-import com.yahoo.metrics.VespaMetrics;
+import ai.vespa.metrics.ClusterControllerMetrics;
+import ai.vespa.metrics.ConfigServerMetrics;
+import ai.vespa.metrics.ContainerMetrics;
+import ai.vespa.metrics.DistributorMetrics;
+import ai.vespa.metrics.LogdMetrics;
+import ai.vespa.metrics.NodeAdminMetrics;
+import ai.vespa.metrics.RoutingLayerMetrics;
+import ai.vespa.metrics.SearchNodeMetrics;
+import ai.vespa.metrics.SentinelMetrics;
+import ai.vespa.metrics.SlobrokMetrics;
+import ai.vespa.metrics.StorageMetrics;
+import ai.vespa.metrics.Suffix;
+import ai.vespa.metrics.VespaMetrics;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static com.yahoo.metrics.Suffix.average;
-import static com.yahoo.metrics.Suffix.count;
-import static com.yahoo.metrics.Suffix.last;
-import static com.yahoo.metrics.Suffix.max;
-import static com.yahoo.metrics.Suffix.min;
-import static com.yahoo.metrics.Suffix.ninety_five_percentile;
-import static com.yahoo.metrics.Suffix.ninety_nine_percentile;
-import static com.yahoo.metrics.Suffix.rate;
-import static com.yahoo.metrics.Suffix.sum;
+import static ai.vespa.metrics.Suffix.average;
+import static ai.vespa.metrics.Suffix.count;
+import static ai.vespa.metrics.Suffix.last;
+import static ai.vespa.metrics.Suffix.max;
+import static ai.vespa.metrics.Suffix.min;
+import static ai.vespa.metrics.Suffix.ninety_five_percentile;
+import static ai.vespa.metrics.Suffix.ninety_nine_percentile;
+import static ai.vespa.metrics.Suffix.rate;
+import static ai.vespa.metrics.Suffix.sum;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
 import static java.util.Collections.singleton;