fix: ove kps to crds

henrywhitaker3 · henrywhitaker3 · commit cd5eca3b9a6d · 2024-03-05T14:31:49.000Z
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/dashboards/kustomization.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/dashboards/kustomization.yaml
@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+  - name: srep-dashboards
+    files:
+      - srep-api.json
+    options:
+      labels:
+        grafana_dashboard: "1"
+      annotations:
+        grafana_folder: SREP
+  - name: misc-dashboards
+    files:
+      - proxmox.json
+    options:
+      labels:
+        grafana_dashboard: "1"
+      annotations:
+        grafana_folder: Custom
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/kustomization.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/kustomization.yaml
@@ -3,8 +3,13 @@ kind: Kustomization
 namespace: monitoring
 
 resources:
-  - secrets/grafana.yaml
-  - secrets/alertmanager.yaml
+  - secrets
+  - scrapeconfigs
+  - dashboards
+
+patches:
+  - path: patches/prometheuses.yaml
+  - path: patches/prometheusagents.yaml
 
 helmCharts:
   - name: kube-prometheus-stack
@@ -13,25 +18,3 @@ helmCharts:
     version: "56.21.1"
     repo: https://prometheus-community.github.io/helm-charts
     valuesFile: values.yaml
-
-patches:
-  - path: patches/prometheuses.yaml
-  - path: patches/prometheusagents.yaml
-
-configMapGenerator:
-  - name: srep-dashboards
-    files:
-      - dashboards/srep-api.json
-    options:
-      labels:
-        grafana_dashboard: "1"
-      annotations:
-        grafana_folder: SREP
-  - name: misc-dashboards
-    files:
-      - dashboards/proxmox.json
-    options:
-      labels:
-        grafana_dashboard: "1"
-      annotations:
-        grafana_folder: Custom
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/haproxy.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/haproxy.yaml
@@ -0,0 +1,11 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ScrapeConfig
+metadata:
+  name: haproxy
+spec:
+  staticConfigs:
+    - targets:
+        - 'jump.lab:8404'
+        - 'lb-1.lab:8404'
+        - 'lb-2.lab:8404'
+  metricsPath: /metrics
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/k8s-annotations.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/k8s-annotations.yaml
@@ -0,0 +1,52 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ScrapeConfig
+metadata:
+  name: kubernetes-service-endpoints
+spec:
+  kubernetesSDConfigs:
+    - role: service
+  relabelings:
+    # annotation 'prometheus.io/scrape' must be set to 'true'
+    - action: keep
+      regex: "true"
+      source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+
+    # service cannot be in kube-system or prom namespaces
+    - action: drop
+      regex: (kube-system|prom)
+      source_labels: [__meta_kubernetes_namespace]
+
+    # service port name must end with word 'metrics'
+    - action: keep
+      regex: .*metrics
+      source_labels: [__meta_kubernetes_service_port_name]
+
+    # allow override of http scheme
+    - action: replace
+      regex: (https?)
+      source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
+      target_label: __scheme__
+
+    # allow override of default /metrics path
+    - action: replace
+      regex: (.+)
+      source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
+      target_label: __metrics_path__
+
+    # allow override of default port
+    - action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: $1:$2
+      source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
+      target_label: __address__
+
+    - action: labelmap
+      regex: __meta_kubernetes_service_label_(.+)
+
+    - action: replace
+      source_labels: [__meta_kubernetes_namespace]
+      target_label: kubernetes_namespace
+
+    - action: replace
+      source_labels: [__meta_kubernetes_service_name]
+      target_label: kubernetes_name
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/kustomization.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - haproxy.yaml
+  - node-exporter.yaml
+  - pve.yaml
+  - k8s-annotations.yaml
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/node-exporter.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/node-exporter.yaml
@@ -0,0 +1,23 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ScrapeConfig
+metadata:
+  name: node_exporter
+spec:
+  staticConfigs:
+    - targets:
+        - 'pihole.lab:9100'
+        - 'lb-1.lab:9100'
+        - 'lb-2.lab:9100'
+        - 'vpn-1.lab:9100'
+        - 'vpn-2.lab:9100'
+        - 'jump.lab:9100'
+        - 'proxmox-1.lab:9100'
+        - 'proxmox-2.lab:9100'
+        - 'k3s-control-1.lab:9100'
+        - 'k3s-control-2.lab:9100'
+        - 'k3s-control-3.lab:9100'
+        - 'k3s-worker-1.lab:9100'
+        - 'k3s-worker-2.lab:9100'
+        - 'mariadb-1.lab:9100'
+        - 'mariadb-2.lab:9100'
+  metricsPath: /metrics
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/pve.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/scrapeconfigs/pve.yaml
@@ -0,0 +1,19 @@
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: ScrapeConfig
+metadata:
+  name: pve
+spec:
+  staticConfigs:
+    - targets:
+        - proxmox-1.lab
+        - proxmox-2.lab
+  metricsPath: /pve
+  params:
+    module: [default]
+  relabelings:
+    - sourceLabels: [__address__]
+      targetLabel: __param_target
+    - sourceLabels: [__param_target]
+      targetLabel: instance
+    - targetLabel: __address__
+      replacement: proxmox-exporter.monitoring.svc:9221
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/secrets/kustomization.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/secrets/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - alertmanager.yaml
+  - grafana.yaml
diff --git a/argo/cluster/monitoring/kube-prometheus-stack/chart/values.yaml b/argo/cluster/monitoring/kube-prometheus-stack/chart/values.yaml
@@ -310,104 +310,6 @@ prometheus:
 
     retention: 7d
 
-    additionalScrapeConfigs:
-      - job_name: kubernetes-service-endpoints
-        kubernetes_sd_configs:
-        - role: service
-        relabel_configs:
-
-        # annotation 'prometheus.io/scrape' must be set to 'true'
-        - action: keep
-          regex: true
-          source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
-
-        # service cannot be in kube-system or prom namespaces
-        - action: drop
-          regex: (kube-system|prom)
-          source_labels: [__meta_kubernetes_namespace]
-
-        # service port name must end with word 'metrics'
-        - action: keep
-          regex: .*metrics
-          source_labels: [__meta_kubernetes_service_port_name]
-
-        # allow override of http scheme
-        - action: replace
-          regex: (https?)
-          source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
-          target_label: __scheme__
-
-        # allow override of default /metrics path
-        - action: replace
-          regex: (.+)
-          source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
-          target_label: __metrics_path__
-
-        # allow override of default port
-        - action: replace
-          regex: ([^:]+)(?::\d+)?;(\d+)
-          replacement: $1:$2
-          source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
-          target_label: __address__
-
-        - {action: labelmap, regex: __meta_kubernetes_service_label_(.+)}
-
-        - action: replace
-          source_labels: [__meta_kubernetes_namespace]
-          target_label: kubernetes_namespace
-
-        - action: replace
-          source_labels: [__meta_kubernetes_service_name]
-          target_label: kubernetes_name
-
-      - job_name: 'haproxy'
-        static_configs:
-          - targets:
-            - 'jump.lab:8404'
-            - 'lb-1.lab:8404'
-            - 'lb-2.lab:8404'
-
-      - job_name: 'mariadb'
-        static_configs:
-          - targets:
-            - 'mariadb-1.lab:9104'
-            - 'mariadb-2.lab:9104'
-
-      - job_name: 'node_exporter'
-        static_configs:
-          - targets:
-            - 'pihole.lab:9100'
-            - 'lb-1.lab:9100'
-            - 'lb-2.lab:9100'
-            - 'vpn-1.lab:9100'
-            - 'vpn-2.lab:9100'
-            - 'jump.lab:9100'
-            - 'proxmox-1.lab:9100'
-            - 'proxmox-2.lab:9100'
-            - 'k3s-control-1.lab:9100'
-            - 'k3s-control-2.lab:9100'
-            - 'k3s-control-3.lab:9100'
-            - 'k3s-worker-1.lab:9100'
-            - 'k3s-worker-2.lab:9100'
-            - 'mariadb-1.lab:9100'
-            - 'mariadb-2.lab:9100'
-
-      - job_name: 'pve'
-        static_configs:
-          - targets:
-            - proxmox-1.lab
-            - proxmox-2.lab
-        metrics_path: /pve
-        params:
-          module: [default]
-        relabel_configs:
-          - source_labels: [__address__]
-            target_label: __param_target
-          - source_labels: [__param_target]
-            target_label: instance
-          - target_label: __address__
-            replacement: proxmox-exporter.monitoring.svc:9221
-
     storageSpec:
       volumeClaimTemplate:
         spec:
