Merge pull request #603 from morenod/watcher_integrated

Add watcher deployment integrated on openstack-operator

Adding watcher to be deployed by openstack-operator with kustomized config

Reviewed-by: Chandan Kumar
Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

examples/va/hci/service-values.yaml

@@ -94,6 +94,22 @@ data:
     enabled: true
     metricStorage:
       enabled: true
+      monitoringStack: null
+      customMonitoringStack:
+        alertmanagerConfig:
+          disabled: true
+        prometheusConfig:
+          enableRemoteWriteReceiver: true
+          persistentVolumeClaim:
+            resources:
+              requests:
+                storage: 20G
+          replicas: 1
+          scrapeInterval: 30s
+        resourceSelector:
+          matchLabels:
+            service: metricStorage
+        retention: 24h
     autoscaling:
       enabled: true
     ceilometer:
@@ -104,3 +120,11 @@ data:
       expiration = 28800
   heat:
     enabled: true
+  watcher:
+    enabled: true
+    decisionengineServiceTemplate:
+      customServiceConfig: |
+        [watcher_cluster_data_model_collectors.compute]
+        period = 60
+        [watcher_cluster_data_model_collectors.storage]
+        period = 60

va/hci/edpm-post-ceph/nodeset/kustomization.yaml

@@ -236,12 +236,12 @@ replacements:
   - source:
       kind: ConfigMap
       name: service-values
-      fieldPath: data.telemetry.metricStorage.enabled
+      fieldPath: data.telemetry.metricStorage
     targets:
       - select:
           kind: OpenStackControlPlane
         fieldPaths:
-          - spec.telemetry.template.metricStorage.enabled
+          - spec.telemetry.template.metricStorage
         options:
           create: true
   - source:
@@ -288,3 +288,25 @@ replacements:
           - spec.heat.enabled
         options:
           create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.watcher.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.watcher.enabled
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.watcher.decisionengineServiceTemplate.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.watcher.template.decisionengineServiceTemplate.customServiceConfig
+        options:
+          create: true