implement Atlas id= query param, set via fetchId in atlas named accou…

…nt config (#125)
spinnaker · Nov 16, 2017 · 5f50cde · 5f50cde
1 parent 538709f
commit 5f50cde
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasConfiguration.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasConfiguration.java
@@ -76,6 +76,7 @@ MetricsService atlasMetricsService(AtlasConfigurationProperties atlasConfigurati
           .builder()
           .name(name)
           .credentials(atlasCredentials)
+          .fetchId(atlasManagedAccount.getFetchId())
           .backendUpdater(updater);
 
       if (!CollectionUtils.isEmpty(supportedTypes)) {

diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasManagedAccount.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasManagedAccount.java
@@ -31,5 +31,7 @@ public class AtlasManagedAccount {
   @NotNull
   String backendsJsonBaseUrl;
 
+  String fetchId;
+
   private List<AccountCredentials.Type> supportedTypes;
 }
diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/metrics/AtlasMetricsService.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/metrics/AtlasMetricsService.java
@@ -123,7 +123,8 @@ public List<MetricSet> queryMetrics(String accountName,
     List<AtlasResults> atlasResultsList = atlasRemoteService.fetch(decoratedQuery,
                                                                    atlasCanaryScope.getStart().toEpochMilli(),
                                                                    atlasCanaryScope.getEnd().toEpochMilli(),
-                                                                   isoStep);
+                                                                   isoStep,
+                                                                   credentials.getFetchId());
     Map<String, AtlasResults> idToAtlasResultsMap = AtlasResultsHelper.merge(atlasResultsList);
     List<MetricSet> metricSetList = new ArrayList<>();
 

diff --git a/...-atlas/src/main/java/com/netflix/kayenta/atlas/security/AtlasNamedAccountCredentials.java b/...-atlas/src/main/java/com/netflix/kayenta/atlas/security/AtlasNamedAccountCredentials.java
@@ -40,6 +40,8 @@ public class AtlasNamedAccountCredentials implements AccountCredentials<AtlasCre
   @NotNull
   private AtlasCredentials credentials;
 
+  private String fetchId;
+
   @Override
   public String getType() {
     return "atlas";

diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/service/AtlasRemoteService.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/service/AtlasRemoteService.java
@@ -29,5 +29,6 @@ public interface AtlasRemoteService {
   List<AtlasResults> fetch(@Query("q") String q,
                            @Query("s") Long start,
                            @Query("e") Long end,
-                           @Query("step") String step);
+                           @Query("step") String step,
+                           @Query("id") String id);
 }