diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-09-21 09:44:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 09:44:26 +0200 |
| commit | 0fbc4d579dd3a05a42dc224f7e883d56051052f4 (patch) | |
| tree | 41afd9b03843fd6efeac9b9b0d178d6f29cdce89 /controller-api | |
| parent | f53da8ecfc3a2aa499b75a7599829c0d1ce73c50 (diff) | |
| parent | 8f2d713dca812b9608f6ca2be5d877653b3a2a86 (diff) | |
Merge pull request #7031 from vespa-engine/mpolden/cache-rotation-status
Cache rotation status in DeploymentMetricsMaintainer
Diffstat (limited to 'controller-api')
2 files changed, 10 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java index 20e9710f092..ff0628ccccc 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java @@ -1,9 +1,12 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.HostName; +import com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; +import java.util.Collections; import java.util.Map; /** @@ -17,6 +20,11 @@ public interface MetricsService { DeploymentMetrics getDeploymentMetrics(ApplicationId application, ZoneId zone); + // TODO: Remove default once implementation catches up + default Map<HostName, RotationStatus> getRotationStatus(String rotationName) { + return Collections.emptyMap(); + } + Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, ZoneId zone); class DeploymentMetrics { diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java index d49d6a9e4c2..5a5f775c013 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/GlobalRoutingService.java @@ -8,6 +8,7 @@ import java.util.Map; * * @author mpolden */ +// TODO: Remove once DeploymentMetricsMaintainer starts providing rotation status public interface GlobalRoutingService { /** Returns the health status for each endpoint behind the given rotation name */ |