refactor(newrelic): get nr endpoint from config (#609)

spinnaker · Aug 30, 2019 · 8aa41e6 · 8aa41e6
1 parent 0c837a6
commit 8aa41e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...lic-insights/src/main/java/com/netflix/kayenta/newrelic/config/NewRelicConfiguration.java b/...lic-insights/src/main/java/com/netflix/kayenta/newrelic/config/NewRelicConfiguration.java
@@ -45,8 +45,6 @@
 @Slf4j
 public class NewRelicConfiguration {
 
-  private static final String NEWRELIC_INSIGHTS_ENDPOINT = "https://insights-api.newrelic.com";
-
   @Bean
   @ConfigurationProperties("kayenta.newrelic")
   NewRelicConfigurationProperties newrelicConfigurationProperties() {
@@ -105,13 +103,17 @@ MetricsService newrelicMetricsService(
               .applicationKey(account.getApplicationKey())
               .build();
 
-      RemoteService remoteService = new RemoteService().setBaseUrl(NEWRELIC_INSIGHTS_ENDPOINT);
+      RemoteService endpoint = account.getEndpoint();
+
+      if (endpoint == null) {
+        endpoint = new RemoteService().setBaseUrl("https://insights-api.newrelic.com");
+      }
 
       NewRelicNamedAccountCredentials.NewRelicNamedAccountCredentialsBuilder
           accountCredentialsBuilder =
               NewRelicNamedAccountCredentials.builder()
                   .name(name)
-                  .endpoint(remoteService)
+                  .endpoint(endpoint)
                   .credentials(credentials);
 
       if (!CollectionUtils.isEmpty(supportedTypes)) {
@@ -120,7 +122,7 @@ MetricsService newrelicMetricsService(
               retrofitClientFactory.createClient(
                   NewRelicRemoteService.class,
                   new JacksonConverter(objectMapper),
-                  remoteService,
+                  endpoint,
                   okHttpClient));
         }
         accountCredentialsBuilder.supportedTypes(supportedTypes);

diff --git a/kayenta-web/config/kayenta.yml b/kayenta-web/config/kayenta.yml
@@ -87,6 +87,7 @@ kayenta:
 #      defaultLocationKey: server_region # Optional, if omitted requests must supply the _location_key if it is needed.
 #      supportedTypes:
 #        - METRICS_STORE
+#      endpoint.baseUrl: https://insights-api.newrelic.com
 
   prometheus:
     enabled: false