chore: Fix dependency on service-monitor and collect metrics from kube-scheduler and kube-controller (#103)

Author: nahsi

flux/clusters/ephemeral/grafana-ingress.yml

@@ -4,7 +4,7 @@ kind: Namespace
 metadata:
   name: monitoring
   labels:
-    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/component: spectrum-monitoring
     pod-security.kubernetes.io/enforce: privileged
 ---
 apiVersion: networking.k8s.io/v1

flux/components/kubevirt/app/kustomization.yml

@@ -5,7 +5,6 @@ resources:
   - https://github.com/kubevirt/kubevirt/releases/download/v1.4.0/kubevirt-cr.yaml
   - https://github.com/kubevirt/containerized-data-importer/releases/download/v1.61.0/cdi-operator.yaml
   - https://github.com/kubevirt/containerized-data-importer/releases/download/v1.61.0/cdi-cr.yaml
-  # - service-monitor.yml
 patches:
   - target:
       kind: Deployment

flux/monitoring/configs/flux/kustomization.yaml

@@ -14,6 +14,6 @@ configMapGenerator:
         grafana_folder: "Flux"
       labels:
         grafana_dashboard: "1"
-        app.kubernetes.io/part-of: flux
-        app.kubernetes.io/component: monitoring
+        app.kubernetes.io/part-of: spectrum-monitoring
+        app.kubernetes.io/component: flux
         kustomize.toolkit.fluxcd.io/substitute: disabled

flux/monitoring/configs/flux/podmonitor.yaml

@@ -3,8 +3,8 @@ kind: PodMonitor
 metadata:
   name: flux-system
   labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/part-of: spectrum-monitoring
+    app.kubernetes.io/component: flux
 spec:
   namespaceSelector:
     matchNames:

flux/monitoring/configs/kubernetes/kustomization.yml

@@ -5,8 +5,8 @@ generatorOptions:
   disableNameSuffixHash: true
   labels:
     grafana_dashboard: "1"
-    app.kubernetes.io/component: monitoring
-    app.kubernetes.io/part-of: kubernetes
+    app.kubernetes.io/component: kubernetes
+    app.kubernetes.io/part-of: spectrum-monitoring
 commonAnnotations:
   grafana_folder: "Kubernetes"
 
@@ -26,7 +26,3 @@ configMapGenerator:
   - name: dashboards-k8s-views-pods
     files:
       - https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/refs/tags/v2.5.3/dashboards/k8s-views-pods.json
-
-  - name: dashboards-k8s-kubevirt
-    files:
-      - https://raw.githubusercontent.com/aenix-io/cozystack/refs/tags/v0.23.1/dashboards/kubevirt/kubevirt-control-plane.json

flux/monitoring/configs/kubevirt.yml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: kubevirt-monitoring
+  namespace: flux-system
+spec:
+  interval: 1m0s
+  path: ./flux/monitoring/configs/kubevirt
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: spectrum
+    namespace: flux-system
+  dependsOn:
+    - name: kubevirt
+      namespace: flux-system

flux/monitoring/configs/kubevirt/kustomization.yml

@@ -0,0 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: monitoring
+resources:
+  - service-monitor.yml
+generatorOptions:
+  disableNameSuffixHash: true
+  labels:
+    grafana_dashboard: "1"
+    app.kubernetes.io/part-of: spectrum-monitoring
+    app.kubernetes.io/component: kubevirt
+commonAnnotations:
+  grafana_folder: "Kubevirt"
+
+configMapGenerator:
+  - name: dashboards-k8s-kubevirt
+    files:
+      - https://raw.githubusercontent.com/aenix-io/cozystack/refs/tags/v0.23.1/dashboards/kubevirt/kubevirt-control-plane.json

flux/components/kubevirt/app/service-monitor.yml renamed to flux/monitoring/configs/kubevirt/service-monitor.yml

@@ -2,14 +2,16 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: kubevirt
-  namespace: kubevirt
   labels:
-    app.kubernetes.io/part-of: kubevirt
-    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/part-of: spectrum-monitoring
+    app.kubernetes.io/component: kubevirt
 spec:
   selector:
     matchLabels:
       prometheus.kubevirt.io: "true"
+  namespaceSelector:
+    matchNames:
+    - kubevirt
   endpoints:
   - port: metrics
     scheme: https

flux/monitoring/configs/kustomization.yml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
 resources:
   - flux
   - system
   - kubernetes
+  - kubevirt.yml

flux/monitoring/configs/system/kustomization.yml

@@ -10,4 +10,5 @@ configMapGenerator:
         grafana_folder: "System"
       labels:
         grafana_dashboard: "1"
-        app.kubernetes.io/component: monitoring
+        app.kubernetes.io/component: system
+        app.kubernetes.io/part-of: spectrum-monitoring