feat(stackdriver): Expose name of metrics store type for use in ui. (#…

…252)
spinnaker · Mar 16, 2018 · 3ed16f1 · 3ed16f1
1 parent 9d07872
commit 3ed16f1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/...main/java/com/netflix/kayenta/canary/providers/StackdriverCanaryMetricSetQueryConfig.java b/...main/java/com/netflix/kayenta/canary/providers/StackdriverCanaryMetricSetQueryConfig.java
@@ -29,6 +29,8 @@
 // TODO(duftler): Figure out how to move this into the kayenta-stackdriver module? Doing so as-is would introduce a circular dependency.
 public class StackdriverCanaryMetricSetQueryConfig implements CanaryMetricSetQueryConfig {
 
+  public static final String SERVICE_TYPE = "stackdriver";
+
   @NotNull
   @Getter
   private String metricType;
@@ -45,6 +47,6 @@ public class StackdriverCanaryMetricSetQueryConfig implements CanaryMetricSetQue
 
   @Override
   public String getServiceType() {
-    return "stackdriver";
+    return SERVICE_TYPE;
   }
 }
diff --git a/...ogle/src/main/java/com/netflix/kayenta/google/security/GoogleNamedAccountCredentials.java b/...ogle/src/main/java/com/netflix/kayenta/google/security/GoogleNamedAccountCredentials.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.api.services.monitoring.v3.Monitoring;
 import com.google.api.services.storage.Storage;
+import com.netflix.kayenta.canary.providers.StackdriverCanaryMetricSetQueryConfig;
 import com.netflix.kayenta.security.AccountCredentials;
 import lombok.Builder;
 import lombok.Data;
@@ -53,6 +54,10 @@ public String getType() {
     return "google";
   }
 
+  public String getMetricsStoreType() {
+    return supportedTypes.contains(Type.METRICS_STORE) ? StackdriverCanaryMetricSetQueryConfig.SERVICE_TYPE : null;
+  }
+
   @JsonIgnore
   private Monitoring monitoring;
 

diff --git a/...r/src/main/java/com/netflix/kayenta/stackdriver/canary/StackdriverCanaryScopeFactory.java b/...r/src/main/java/com/netflix/kayenta/stackdriver/canary/StackdriverCanaryScopeFactory.java
@@ -18,6 +18,7 @@
 
 import com.netflix.kayenta.canary.CanaryScope;
 import com.netflix.kayenta.canary.CanaryScopeFactory;
+import com.netflix.kayenta.canary.providers.StackdriverCanaryMetricSetQueryConfig;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -27,7 +28,7 @@ public class StackdriverCanaryScopeFactory implements CanaryScopeFactory {
 
   @Override
   public boolean handles(String serviceType) {
-    return "stackdriver".equals(serviceType);
+    return StackdriverCanaryMetricSetQueryConfig.SERVICE_TYPE.equals(serviceType);
   }
 
   @Override

diff --git a/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -83,7 +83,7 @@ public class StackdriverMetricsService implements MetricsService {
 
   @Override
   public String getType() {
-    return "stackdriver";
+    return StackdriverCanaryMetricSetQueryConfig.SERVICE_TYPE;
   }
 
   @Override