fix(bom): spinnaker-monitoring -> monitoring (#246)

spinnaker · Mar 17, 2017 · 06fc096 · 06fc096
1 parent ac12cb6
commit 06fc096
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...rd-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/BillOfMaterials.java b/...rd-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/BillOfMaterials.java
@@ -40,10 +40,10 @@ public static class Artifacts {
     Artifact igor;
     Artifact orca;
     Artifact rosco;
-    @JsonProperty("spinnaker-monitoring-third-party")
-    Artifact spinnakerMonitoringThirdParty;
-    @JsonProperty("spinnaker-monitoring-daemon")
-    Artifact spinnakerMonitoringDaemon;
+    @JsonProperty("monitoring-third-party")
+    Artifact monitoringThirdParty;
+    @JsonProperty("monitoring-daemon")
+    Artifact monitoringDaemon;
 
     public String getArtifactVersion(String artifactName) {
       Optional<Field> field = Arrays.stream(Artifacts.class.getDeclaredFields())

diff --git a/...loy/src/main/java/com/netflix/spinnaker/halyard/deploy/provider/v1/ProviderInterface.java b/...loy/src/main/java/com/netflix/spinnaker/halyard/deploy/provider/v1/ProviderInterface.java
@@ -77,7 +77,7 @@ public abstract class ProviderInterface<T extends Account> {
    */
   public void deployService(AccountDeploymentDetails<T> details, Orca orca, SpinnakerEndpoints endpoints, String name) {
     SpinnakerService service = endpoints.getService(name);
-    SpinnakerMonitoringDaemonService monitoringService = endpoints.getServices().getSpinnakerMonitoringDaemon();
+    SpinnakerMonitoringDaemonService monitoringService = endpoints.getServices().getMonitoringDaemon();
     String artifactName = service.getArtifact().getName();
     DaemonTaskHandler.newStage("Deploying " + service.getArtifact().getName());
     boolean update = serviceExists(details, service);

diff --git a/...y/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/SpinnakerEndpoints.java b/...y/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/SpinnakerEndpoints.java
@@ -50,7 +50,7 @@ public SpinnakerEndpoints(Security security) {
     services.rosco = new RoscoService();
     services.redis = new RedisService();
     services.redisBootstrap = new RedisBootstrapService();
-    services.spinnakerMonitoringDaemon = new SpinnakerMonitoringDaemonService();
+    services.monitoringDaemon = new SpinnakerMonitoringDaemonService();
   }
 
   @Data
@@ -68,7 +68,7 @@ public class Services {
     RoscoService rosco;
     RedisService redis;
     RedisBootstrapService redisBootstrap;
-    SpinnakerMonitoringDaemonService spinnakerMonitoringDaemon;
+    SpinnakerMonitoringDaemonService monitoringDaemon;
 
     public List<SpinnakerService> allServices() {
       return Arrays.stream(Services.class.getDeclaredFields())

diff --git a/...tflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpinnakerMonitoringDaemonProfile.java b/...tflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpinnakerMonitoringDaemonProfile.java
@@ -56,7 +56,7 @@ public SpinnakerArtifact getArtifact() {
   protected ProfileConfig generateFullConfig(ProfileConfig config, DeploymentConfiguration deploymentConfiguration, SpinnakerEndpoints endpoints) {
     String primaryConfig = config.getPrimaryConfigFile();
     SpinnakerEndpoints.Services services = endpoints.getServices();
-    SpinnakerMonitoringDaemonService monitoringService = services.getSpinnakerMonitoringDaemon();
+    SpinnakerMonitoringDaemonService monitoringService = services.getMonitoringDaemon();
     MetricStores metricStores = deploymentConfiguration.getMetricStores();
     List<String> enabledMetricStores = new ArrayList<>();
 

diff --git a/...tflix/spinnaker/halyard/deploy/spinnaker/v1/service/SpinnakerMonitoringDaemonService.java b/...tflix/spinnaker/halyard/deploy/spinnaker/v1/service/SpinnakerMonitoringDaemonService.java
@@ -32,7 +32,7 @@ public class SpinnakerMonitoringDaemonService extends SpinnakerService<Spinnaker
   String host = "0.0.0.0";
   String protocol = "http";
   String httpHealth = null;
-  String name = "spinnaker-monitoring";
+  String name = "monitoring";
   // We don't (yet) monitor the monitoring agent.
   boolean monitoringEnabled = false;