chore(kube-monitoring) prometheus selector spec to plugindef

kube-monitoring/README.md

@@ -322,14 +322,14 @@ spec:
 | kubeMonitoring.prometheus.prometheusSpec.evaluationInterval | string | `""` | Interval between consecutive evaluations |
 | kubeMonitoring.prometheus.prometheusSpec.externalLabels | object | `{}` | External labels to add to any time series or alerts when communicating with external systems like Alertmanager |
 | kubeMonitoring.prometheus.prometheusSpec.logLevel | string | `""` | Log level to be configured for Prometheus |
-| kubeMonitoring.prometheus.prometheusSpec.podMonitorSelector.matchLabels | object | `{ plugin: <metadata.name> }` | PodMonitors to be selected for target discovery. |
-| kubeMonitoring.prometheus.prometheusSpec.probeSelector.matchLabels | object | `{ plugin: <metadata.name> }` | Probes to be selected for target discovery. |
+| kubeMonitoring.prometheus.prometheusSpec.podMonitorSelector | object | <pre>matchLabels<br>  plugin: <metadata.name></pre> | PodMonitors to be selected for target discovery. |
+| kubeMonitoring.prometheus.prometheusSpec.probeSelector | object | <pre>matchLabels<br>  plugin: <metadata.name></pre> | Probes to be selected for target discovery. |
 | kubeMonitoring.prometheus.prometheusSpec.retention | string | `""` | How long to retain metrics |
-| kubeMonitoring.prometheus.prometheusSpec.ruleSelector.matchLabels | object | `{ plugin: <metadata.name> }` | PrometheusRules to be selected for target discovery. If {}, select all PrometheusRules |
-| kubeMonitoring.prometheus.prometheusSpec.scrapeConfigSelector.matchLabels | object | `{ plugin: <metadata.name> }` | scrapeConfigs to be selected for target discovery. |
+| kubeMonitoring.prometheus.prometheusSpec.ruleSelector | object | <pre>matchLabels<br>  plugin: <metadata.name></pre> | PrometheusRules to be selected for target discovery. If {}, select all PrometheusRules |
+| kubeMonitoring.prometheus.prometheusSpec.scrapeConfigSelector | object | <pre>matchLabels<br>  plugin: <metadata.name></pre> | scrapeConfigs to be selected for target discovery. |
 | kubeMonitoring.prometheus.prometheusSpec.scrapeInterval | string | `""` | Interval between consecutive scrapes. Defaults to 30s |
 | kubeMonitoring.prometheus.prometheusSpec.scrapeTimeout | string | `""` | Number of seconds to wait for target to respond before erroring |
-| kubeMonitoring.prometheus.prometheusSpec.serviceMonitorSelector.matchLabels | object | `{ plugin: <metadata.name> }` | ServiceMonitors to be selected for target discovery. If {}, select all ServiceMonitors |
+| kubeMonitoring.prometheus.prometheusSpec.serviceMonitorSelector | object | <pre>matchLabels<br>  plugin: <metadata.name></pre> | ServiceMonitors to be selected for target discovery. If {}, select all ServiceMonitors |
 | kubeMonitoring.prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.resources | object | `{"requests":{"storage":"50Gi"}}` | How large the persistent volume should be to house the Prometheus database. Default 50Gi. |
 | kubeMonitoring.prometheus.tlsConfig.caCert | string | `"Secret"` | CA certificate to verify technical clients at Prometheus Ingress |
 

kube-monitoring/charts/Chart.yaml

@@ -8,7 +8,7 @@ maintainers:
 name: kube-monitoring
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 7.2.0
+version: 7.2.1
 keywords:
   - operator
   - prometheus

kube-monitoring/charts/values.yaml

@@ -372,42 +372,32 @@ kubeMonitoring:
       # How long to retain metrics
       # retention: 10d
 
-      serviceMonitorSelector:
-        # -- ServiceMonitors to be selected for target discovery.
-        # If {}, select all ServiceMonitors
-        # @default -- `{ plugin: <metadata.name> }`
-        # @section -- Prometheus options
-        matchLabels:
-          plugin: "{{ $.Release.Name }}"
-
-      podMonitorSelector:
-        # -- PodMonitors to be selected for target discovery.
-        # @default -- `{ plugin: <metadata.name> }`
-        # @section -- Prometheus options
-        matchLabels:
-          plugin: "{{ $.Release.Name }}"
-
-      probeSelector:
-        # -- Probes to be selected for target discovery.
-        # @default -- `{ plugin: <metadata.name> }`
-        # @section -- Prometheus options
-        matchLabels:
-          plugin: "{{ $.Release.Name }}"
-
-      scrapeConfigSelector:
-        # -- scrapeConfigs to be selected for target discovery.
-        # @default -- `{ plugin: <metadata.name> }`
-        # @section -- Prometheus options
-        matchLabels:
-          plugin: "{{ $.Release.Name }}"
-
-      ruleSelector:
-        # -- PrometheusRules to be selected for target discovery.
-        # If {}, select all PrometheusRules
-        # @default -- `{ plugin: <metadata.name> }`
-        # @section -- Prometheus options
-        matchLabels:
-          plugin: "{{ $.Release.Name }}"
+      # -- ServiceMonitors to be selected for target discovery.
+      # If {}, select all ServiceMonitors
+      # @default -- <pre>matchLabels<br>  plugin: <metadata.name></pre>
+      # @section -- Prometheus options
+      serviceMonitorSelector: {}
+
+      # -- PodMonitors to be selected for target discovery.
+      # @default -- <pre>matchLabels<br>  plugin: <metadata.name></pre>
+      # @section -- Prometheus options
+      podMonitorSelector: {}
+
+      # -- Probes to be selected for target discovery.
+      # @default -- <pre>matchLabels<br>  plugin: <metadata.name></pre>
+      # @section -- Prometheus options
+      probeSelector: {}
+
+      # -- scrapeConfigs to be selected for target discovery.
+      # @default -- <pre>matchLabels<br>  plugin: <metadata.name></pre>
+      # @section -- Prometheus options
+      scrapeConfigSelector: {}
+
+      # -- PrometheusRules to be selected for target discovery.
+      # If {}, select all PrometheusRules
+      # @default -- <pre>matchLabels<br>  plugin: <metadata.name></pre>
+      # @section -- Prometheus options
+      ruleSelector: {}
 
       storageSpec:
         volumeClaimTemplate:

kube-monitoring/plugindefinition.yaml

@@ -6,7 +6,7 @@ kind: PluginDefinition
 metadata:
   name: kube-monitoring
 spec:
-  version: 8.2.0
+  version: 8.2.1
   displayName: Kubernetes monitoring
   description: Native deployment and management of Prometheus along with Kubernetes cluster monitoring components.
   docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/README.md
@@ -15,7 +15,7 @@ spec:
     # renovate depName=ghcr.io/cloudoperators/greenhouse-extensions/charts/kube-monitoring
     name: kube-monitoring
     repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-    version: 7.2.0
+    version: 7.2.1
   options:
     - name: global.commonLabels
       description: Labels to add to all resources. This can be used to add a support group or service to all alerts.
@@ -101,3 +101,38 @@ spec:
       default: false
       required: false
       type: bool
+    - name: kubeMonitoring.prometheus.prometheusSpec.serviceMonitorSelector
+      description:
+      default: 
+        matchLabels:
+          plugin: "{{ $.Release.Name }}"
+      required: false
+      type: map
+    - name: kubeMonitoring.prometheus.prometheusSpec.podMonitorSelector
+      description:
+      default: 
+        matchLabels:
+          plugin: "{{ $.Release.Name }}"
+      required: false
+      type: map
+    - name: kubeMonitoring.prometheus.prometheusSpec.probeSelector
+      description:
+      default: 
+        matchLabels:
+          plugin: "{{ $.Release.Name }}"
+      required: false
+      type: map
+    - name: kubeMonitoring.prometheus.prometheusSpec.scrapeConfigSelector
+      description:
+      default: 
+        matchLabels:
+          plugin: "{{ $.Release.Name }}"
+      required: false
+      type: map
+    - name: kubeMonitoring.prometheus.prometheusSpec.ruleSelector
+      description:
+      default: 
+        matchLabels:
+          plugin: "{{ $.Release.Name }}"
+      required: false
+      type: map