diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-09-05 11:36:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 11:36:37 +0200 |
| commit | 1e6bd99bf983334cb3fdd7ae0e5af85461e85229 (patch) | |
| tree | f80e9f4f55a6d94335aeab2ee2ad0cab6e9c83b3 /config-model | |
| parent | 3b81210bcbb23dd073d2b6903a1179039ae2012e (diff) | |
| parent | 6b3048162dc039b2a440291418d009837f739077 (diff) | |
Merge pull request #10514 from vespa-engine/olaa/add-system-dimension
Added system dimension
Diffstat (limited to 'config-model')
2 files changed, 4 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index 94dbdafe980..253ad4ce119 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -52,6 +52,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerClus import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.LEGACY_APPLICATION; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.TENANT; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.ZONE; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.SYSTEM; import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.getDefaultPublicConsumer; import static com.yahoo.vespa.model.admin.monitoring.MetricSet.emptyMetricSet; import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.getVespaMetricsConsumer; @@ -77,6 +78,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC static final String METRICS_PROXY_BUNDLE_NAME = "com.yahoo.vespa." + METRICS_PROXY_NAME; static final class AppDimensionNames { + static final String SYSTEM = "system"; static final String ZONE = "zone"; static final String APPLICATION_ID = "applicationId"; // tenant.app.instance static final String TENANT = "tenantName"; @@ -204,6 +206,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC private Map<String, String> applicationDimensions() { Map<String, String> dimensions = new LinkedHashMap<>(); + dimensions.put(SYSTEM, getZone().system().value()); dimensions.put(ZONE, zoneString(getZone())); dimensions.put(APPLICATION_ID, serializeWithDots(applicationId)); dimensions.put(TENANT, applicationId.tenant().value()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index be6f84c2a28..6e3ff564025 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -270,6 +270,7 @@ public class MetricsProxyContainerClusterTest { VespaModel hostedModel = getModel(servicesWithAdminOnly(), hosted); ApplicationDimensionsConfig config = getApplicationDimensionsConfig(hostedModel); + assertEquals(Zone.defaultZone().system().value(), config.dimensions(AppDimensionNames.SYSTEM)); assertEquals(zoneString(Zone.defaultZone()), config.dimensions(AppDimensionNames.ZONE)); assertEquals(MY_TENANT, config.dimensions(AppDimensionNames.TENANT)); assertEquals(MY_APPLICATION, config.dimensions(AppDimensionNames.APPLICATION)); |