chore(stackdriver): Persist filter as 'query' in metric set list attr…

…ibutes. (#232)
spinnaker · Feb 15, 2018 · 65edf39 · 65edf39
1 parent d0bf333
commit 65edf39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...src/main/java/com/netflix/kayenta/stackdriver/controllers/StackdriverFetchController.java b/...src/main/java/com/netflix/kayenta/stackdriver/controllers/StackdriverFetchController.java
@@ -24,6 +24,7 @@
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import com.netflix.kayenta.security.CredentialsHelper;
 import com.netflix.kayenta.stackdriver.canary.StackdriverCanaryScope;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -56,6 +57,7 @@ public StackdriverFetchController(AccountCredentialsRepository accountCredential
     this.synchronousQueryProcessor = synchronousQueryProcessor;
   }
 
+  @ApiOperation(value = "Exercise the Stackdriver Metrics Service directly, without any orchestration or judging")
   @RequestMapping(value = "/query", method = RequestMethod.POST)
   public Map queryMetrics(@RequestParam(required = false) final String metricsAccountName,
                           @RequestParam(required = false) final String storageAccountName,
@@ -66,9 +68,9 @@ public Map queryMetrics(@RequestParam(required = false) final String metricsAcco
                           @ApiParam(defaultValue = "gce_instance") @RequestParam String resourceType,
                           @ApiParam(defaultValue = "us-central1") @RequestParam(required = false) String region,
                           @ApiParam(defaultValue = "myapp-v059") @RequestParam(required = false) String scope,
-                          @ApiParam(defaultValue = "2017-11-21T12:48:00Z") @RequestParam Instant startTimeIso,
-                          @ApiParam(defaultValue = "2017-11-21T12:51:00Z") @RequestParam Instant endTimeIso,
-                          @ApiParam(defaultValue = "3600") @RequestParam Long step,
+                          @ApiParam(defaultValue = "2018-01-21T12:48:00Z") @RequestParam Instant startTimeIso,
+                          @ApiParam(defaultValue = "2018-01-21T12:51:00Z") @RequestParam Instant endTimeIso,
+                          @ApiParam(defaultValue = "60", value = "seconds") @RequestParam Long step,
                           @RequestParam(required = false) final String customFilter,
                           @ApiParam @RequestBody final Map<String, String> extendedScopeParams) throws IOException {
     String resolvedMetricsAccountName = CredentialsHelper.resolveAccountByNameOrType(metricsAccountName,

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
@@ -273,6 +273,8 @@ public List<MetricSet> queryMetrics(String metricsAccountName,
         }
       }
 
+      metricSetBuilder.attribute("query", filter);
+
       metricSetList.add(metricSetBuilder.build());
     }