Update support for Observability module 1.6 (#173)

dell · Feb 23, 2023 · a7e0cb8 · a7e0cb8
1 parent 18af78c
commit a7e0cb8
Show file tree

Hide file tree

Showing 6 changed files with 202 additions and 33 deletions.
diff --git a/...lity/v1.2.0/karavi-metrics-powerflex.yaml → ...lity/v1.5.0/karavi-metrics-powerflex.yaml b/...lity/v1.2.0/karavi-metrics-powerflex.yaml → ...lity/v1.5.0/karavi-metrics-powerflex.yaml
@@ -37,7 +37,6 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -79,6 +78,18 @@ data:
 
 ---
 
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <DriverDefaultReleaseName>-config-params
+  namespace: karavi
+data:
+  driver-config-params.yaml: |
+    CSI_LOG_LEVEL: debug
+    CSI_LOG_FORMAT: TEXT
+
+---
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -135,5 +146,8 @@ spec:
         - name: karavi-metrics-powerflex-configmap
           configMap:
             name: karavi-metrics-powerflex-configmap
+        - name: vxflexos-config-params
+          configMap:
+            name: <DriverDefaultReleaseName>-config-params
       restartPolicy: Always
 status: {}
diff --git a/operatorconfig/moduleconfig/observability/v1.5.0/karavi-metrics-powerscale.yaml b/operatorconfig/moduleconfig/observability/v1.5.0/karavi-metrics-powerscale.yaml
@@ -0,0 +1,156 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: karavi-metrics-powerscale-controller
+  namespace: karavi
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: karavi-metrics-powerscale-controller
+rules:
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["csinodes", "storageclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["persistentvolumes", "nodes"]
+    verbs: ["list"]
+  - apiGroups: [""]
+    resources: ["endpoints"]
+    verbs: ["*"]
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: karavi-metrics-powerscale-controller
+subjects:
+  - kind: ServiceAccount
+    name: karavi-metrics-powerscale-controller
+    namespace: karavi
+roleRef:
+  kind: ClusterRole
+  name: karavi-metrics-powerscale-controller
+  apiGroup: rbac.authorization.k8s.io
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: karavi-metrics-powerscale
+    app.kubernetes.io/instance: karavi
+  name: karavi-metrics-powerscale
+  namespace: karavi
+spec:
+  type: ClusterIP
+  ports:
+    - name: karavi-metrics-powerscale
+      port: 8080
+      targetPort: 8080
+  selector:
+    app.kubernetes.io/name: karavi-metrics-powerscale
+    app.kubernetes.io/instance: karavi
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: karavi-metrics-powerscale-configmap
+  namespace: karavi
+data:
+  karavi-metrics-powerscale.yaml : |
+    COLLECTOR_ADDR: <COLLECTOR_ADDRESS>
+    PROVISIONER_NAMES: csi-isilon.dellemc.com
+    POWERSCALE_MAX_CONCURRENT_QUERIES: <POWERSCALE_MAX_CONCURRENT_QUERIES>
+    POWERSCALE_CAPACITY_METRICS_ENABLED: <POWERSCALE_CAPACITY_METRICS_ENABLED>
+    POWERSCALE_PERFORMANCE_METRICS_ENABLED: <POWERSCALE_PERFORMANCE_METRICS_ENABLED>
+    POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY: <POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY>
+    POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY: <POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY>
+    POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY: <POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY>
+    POWERSCALE_ISICLIENT_INSECURE: <ISICLIENT_INSECURE>
+    POWERSCALE_ISICLIENT_AUTH_TYPE: <ISICLIENT_AUTH_TYPE>
+    POWERSCALE_ISICLIENT_VERBOSE: <ISICLIENT_VERBOSE>
+    LOG_LEVEL: <POWERSCALE_LOG_LEVEL>
+    LOG_FORMAT: <POWERSCALE_LOG_FORMAT>
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <DriverDefaultReleaseName>-config-params
+  namespace: karavi
+data:
+  driver-config-params.yaml: |
+    CSI_LOG_LEVEL: debug
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: karavi-metrics-powerscale
+  namespace: karavi
+  labels:
+    app.kubernetes.io/name: karavi-metrics-powerscale
+    app.kubernetes.io/instance: karavi
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: karavi-metrics-powerscale
+      app.kubernetes.io/instance: karavi
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: karavi-metrics-powerscale
+        app.kubernetes.io/instance: karavi
+    spec:
+      serviceAccount: karavi-metrics-powerscale-controller
+      containers:
+        - name: karavi-metrics-powerscale
+          image: <POWERSCALE_OBS_IMAGE>
+          resources: {}
+          env:
+            - name: POWERSCALE_METRICS_ENDPOINT
+              value: "karavi-metrics-powerscale"
+            - name: POWERSCALE_METRICS_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: TLS_ENABLED
+              value: "true"
+          volumeMounts:
+            - name: isilon-creds
+              mountPath: /isilon-creds
+            - name: tls-secret
+              mountPath: /etc/ssl/certs
+              readOnly: true
+            - name: karavi-metrics-powerscale-configmap
+              mountPath: /etc/config
+      volumes:
+        - name: isilon-creds
+          secret:
+            secretName: <DriverDefaultReleaseName>-creds
+        - name: tls-secret
+          secret:
+            secretName: otel-collector-tls
+            items:
+              - key: tls.crt
+                path: cert.crt
+        - name: karavi-metrics-powerscale-configmap
+          configMap:
+            name: karavi-metrics-powerscale-configmap
+        - name: csi-isilon-config-params
+          configMap:
+            name: <DriverDefaultReleaseName>-config-params
+      restartPolicy: Always
+status: {}
+
diff --git a/...ability/v1.2.0/karavi-otel-collector.yaml → ...ability/v1.5.0/karavi-otel-collector.yaml b/...ability/v1.2.0/karavi-otel-collector.yaml → ...ability/v1.5.0/karavi-otel-collector.yaml
@@ -5,27 +5,26 @@ data:
       otlp:
         protocols:
           grpc:
-            tls_settings:
+            endpoint: 0.0.0.0:55680
+            tls:
               cert_file: /etc/ssl/certs/tls.crt
               key_file: /etc/ssl/certs/tls.key
-
+    
     exporters:
       prometheus:
         endpoint: 0.0.0.0:8889
       logging:
-
+    
     extensions:
       health_check: {}
-
+    
     service:
       extensions: [health_check]
       pipelines:
         metrics:
           receivers: [otlp]
           processors: []
           exporters: [logging,prometheus]
-
-
 kind: ConfigMap
 metadata:
   name: otel-collector-config
@@ -38,30 +37,30 @@ data:
   nginx.conf: |-
     worker_processes  1;
     events {
-        worker_connections  1024;
+      worker_connections  1024;
     }
-
+    
     pid /tmp/nginx.pid;
-
+    
     http {
-        include       mime.types;
-        default_type  application/octet-stream;
-        sendfile        on;
-        keepalive_timeout  65;
-        server {
-          listen       8443 ssl;
-          server_name  localhost;
-          ssl_certificate      /etc/ssl/certs/tls.crt;
-          ssl_certificate_key  /etc/ssl/certs/tls.key;
-          ssl_protocols TLSv1.2;
-          ssl_ciphers AESGCM:-aNULL:-DH:-kRSA:@STRENGTH;
-          ssl_prefer_server_ciphers on;
-          location / {
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $http_host;
-            proxy_pass http://127.0.0.1:8889/;
-          }
+      include       mime.types;
+      default_type  application/octet-stream;
+      sendfile        on;
+      keepalive_timeout  65;
+      server {
+        listen       8443 ssl;
+        server_name  localhost;
+        ssl_certificate      /etc/ssl/certs/tls.crt;
+        ssl_certificate_key  /etc/ssl/certs/tls.key;
+        ssl_protocols TLSv1.2;
+        ssl_ciphers AESGCM:-aNULL:-DH:-kRSA:@STRENGTH;
+        ssl_prefer_server_ciphers on;
+        location / {
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $http_host;
+          proxy_pass http://127.0.0.1:8889/;
         }
+      }
     }
 kind: ConfigMap
 metadata:

diff --git a/...observability/v1.2.0/karavi-topology.yaml → ...observability/v1.5.0/karavi-topology.yaml b/...observability/v1.2.0/karavi-topology.yaml → ...observability/v1.5.0/karavi-topology.yaml
diff --git a/samples/storage_csm_powerflex_v260.yaml b/samples/storage_csm_powerflex_v260.yaml
@@ -156,14 +156,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: false
-      configVersion: v1.4.0
+      configVersion: v1.5.0
       components:
         - name: topology
           # enabled: Enable/Disable topology
           enabled: false
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.4.0
+          image: dellemc/csm-topology:v1.5.0
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -188,7 +188,7 @@ spec:
           # enabled: Enable/Disable PowerFlex metrics
           enabled: false
           # image: Defines PowerFlex metrics image. This shouldn't be changed
-          image: dellemc/csm-metrics-powerflex:v1.4.0
+          image: dellemc/csm-metrics-powerflex:v1.5.0
           envs:
             # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex
             # Allowed values: int

diff --git a/samples/storage_csm_powerscale_v260.yaml b/samples/storage_csm_powerscale_v260.yaml
@@ -321,14 +321,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: false
-      configVersion: v1.4.0
+      configVersion: v1.5.0
       components: 
         - name: topology
           # enabled: Enable/Disable topology
           enabled: false
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.4.0
+          image: dellemc/csm-topology:v1.5.0
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -354,7 +354,7 @@ spec:
           enabled: false
           # image: Defines PowerScale metrics image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-metrics-powerscale:v1.1.0
+          image: dellemc/csm-metrics-powerscale:v1.2.0
           envs:
             # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale
             # Allowed values: int