feat(canary): add prometheus component

features/canary/prometheus/kustomization.yml

@@ -0,0 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - prometheus-grafana.yml
+
+patchesStrategicMerge:
+  - spinnaker-config.yml
+
+configMapGenerator:
+  - name: grafana-dashboard-spinnaker
+    files:
+      - spinnaker-dashboards.json
+
+secretGenerator:
+  - name: prometheus-secrets
+    literals:
+      - grafanaDefaultUser=DefaultUser1!
+      - grafanaDefaultPassword=DefaultPass1!
+
+generatorOptions:
+  disableNameSuffixHash: true

infrastructure/prometheus-grafana/prometheus-grafana.yml → features/canary/prometheus/prometheus-grafana.yml

@@ -1375,12 +1375,12 @@ spec:
             - name: GF_SECURITY_ADMIN_USER
               valueFrom:
                 secretKeyRef:
-                  name: spin-secrets
+                  name: prometheus-secrets
                   key: grafanaDefaultUser
             - name: GF_SECURITY_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: spin-secrets
+                  name: prometheus-secrets
                   key: grafanaDefaultPassword
             - name: GF_AUTH_ANONYMOUS_ENABLED
               value: "false"

accounts/canary/prometheus.yml → features/canary/prometheus/spinnaker-config.yml

@@ -1,11 +1,15 @@
-#-----------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # Example configuration for enabling canary through prometheus endpoints
-#-----------------------------------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 apiVersion: spinnaker.armory.io/v1alpha2
 kind: SpinnakerService
 metadata:
   name: spinnaker
 spec:
+  validation:
+    providers:
+      canary:
+        enabled: false
   spinnakerConfig:
     config:
       canary:
@@ -16,12 +20,19 @@ spec:
           accounts:
           - name: prometheus
             endpoint:
-              baseUrl: http://myprometheus       # (Required). The base URL to the Prometheus server.
+              baseUrl: http://prometheus:9090       # (Required). The base URL to the Prometheus server.
             supportedTypes:
             - METRICS_STORE
+            - CONFIGURATION_STORE
+            - OBJECT_STORE
             #username: admin                      # (Optional). Username for Prometheus Basic Auth
             #password: encrypted:k8s!n:spin-secrets!k:prometheus-password  # (Optional). Password for Prometheus Basic Auth
 
+        # NOTE: Needed to get past an operator/halyard validation issue
+        - name: aws
+          enabled: false
+          accounts: []
+
         reduxLoggerEnabled: true                 # Whether or not to enable redux logging in the canary module in deck (Default: true).
         defaultJudge: NetflixACAJudge-v1.0       # Name of canary judge to use by default (Default: NetflixACAJudge-v1.0).
         stagesEnabled: true                      # Whether or not to enable canary stages in deck (Default: true).