Remove metrics by docker flavor

2 files changed, 6 insertions, 39 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
index b463ee0ab19..8772e421394 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
@@ -204,28 +204,16 @@ public class MetricsReporter extends Maintainer {
         // Capacity flavors for docker
         DockerHostCapacity capacity = new DockerHostCapacity(nodes);
         metric.set("hostedVespa.docker.totalCapacityCpu",
-                   capacity.getCapacityTotal(NodeResources.DiskSpeed.any).vcpu(), null);
+                capacity.getCapacityTotal(NodeResources.DiskSpeed.any).vcpu(), null);
         metric.set("hostedVespa.docker.totalCapacityMem",
-                   capacity.getCapacityTotal(NodeResources.DiskSpeed.any).memoryGb(), null);
+                capacity.getCapacityTotal(NodeResources.DiskSpeed.any).memoryGb(), null);
         metric.set("hostedVespa.docker.totalCapacityDisk",
-                   capacity.getCapacityTotal(NodeResources.DiskSpeed.any).diskGb(), null);
+                capacity.getCapacityTotal(NodeResources.DiskSpeed.any).diskGb(), null);
         metric.set("hostedVespa.docker.freeCapacityCpu",
-                   capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).vcpu(), null);
+                capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).vcpu(), null);
         metric.set("hostedVespa.docker.freeCapacityMem",
-                   capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).memoryGb(), null);
+                capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).memoryGb(), null);
         metric.set("hostedVespa.docker.freeCapacityDisk",
-                   capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).diskGb(), null);
-
-        List<Flavor> dockerFlavors = nodeRepository().getAvailableFlavors().getFlavors().stream()
-                .filter(f -> f.getType().equals(Flavor.Type.DOCKER_CONTAINER))
-                .collect(Collectors.toList());
-        for (Flavor flavor : dockerFlavors) {
-            Metric.Context context = getContextAt("flavor", flavor.name());
-            metric.set("hostedVespa.docker.freeCapacityFlavor",
-                       capacity.freeCapacityInFlavorEquivalence(flavor), context);
-            metric.set("hostedVespa.docker.hostsAvailableFlavor",
-                       capacity.getNofHostsAvailableFor(flavor), context);
-        }
+                capacity.getFreeCapacityTotal(NodeResources.DiskSpeed.any).diskGb(), null);
     }
-
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
index 1f9a833b555..4eba95cb817 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
@@ -163,27 +163,6 @@ public class MetricsReporterTest {
         assertEquals(6.0, metric.values.get("hostedVespa.docker.freeCapacityDisk"));
         assertEquals(3.0, metric.values.get("hostedVespa.docker.freeCapacityMem"));
         assertEquals(4.0, metric.values.get("hostedVespa.docker.freeCapacityCpu"));
-
-        assertContext(metric, "hostedVespa.docker.freeCapacityFlavor", 1, 0);
-        assertContext(metric, "hostedVespa.docker.hostsAvailableFlavor", 1l, 0l);
-    }
-
-    private void assertContext(TestMetric metric, String key, Number dockerValue, Number docker2Value) {
-        List<Metric.Context> freeCapacityFlavor = metric.context.get(key);
-        assertEquals(freeCapacityFlavor.size(), 2);
-
-        // Get the value for the two flavors
-        TestMetric.TestContext contextFlavorDocker = (TestMetric.TestContext)freeCapacityFlavor.get(0);
-        TestMetric.TestContext contextFlavorDocker2 = (TestMetric.TestContext)freeCapacityFlavor.get(1);
-        if (!contextFlavorDocker.properties.containsValue("docker")) {
-            TestMetric.TestContext temp = contextFlavorDocker;
-            contextFlavorDocker = contextFlavorDocker2;
-            contextFlavorDocker2 = temp;
-        }
-
-        assertEquals(dockerValue, contextFlavorDocker.value);
-        assertEquals(docker2Value, contextFlavorDocker2.value);
-
     }
 
     private ApplicationId app(String tenant) {