Refactor prometheus. Bump prometheus version

Author: mmontes11

Makefile

@@ -1,7 +1,7 @@
 ROOK_VERSION ?= v1.15.2
 ROOK_URL ?= https://raw.githubusercontent.com/rook/rook/refs/tags/$(ROOK_VERSION)/deploy/examples/crds.yaml
 
-PROMETHEUS_VERSION ?= 63.1.0
+PROMETHEUS_VERSION ?= 70.0.1
 PROMETHEUS_URL ?= https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-$(PROMETHEUS_VERSION)/kube-prometheus-stack-$(PROMETHEUS_VERSION).tgz
 
 CERT_MANAGER_VERSION ?= v1.16.1
@@ -27,7 +27,7 @@ prometheus-crds: ### Get prometheus CRDs to be installed by flux.
 			rm -rf kube-prometheus-stack/; \
 	fi
 	curl -sL $(PROMETHEUS_URL) | tar xz -C .
-	cp kube-prometheus-stack/charts/crds/crds/*.yaml  infrastructure/kube-prometheus-stack/prometheus-crds
+	cp kube-prometheus-stack/charts/crds/crds/*.yaml  infrastructure/prometheus/crds
 	rm -rf kube-prometheus-stack/
 
 .PHONY: cert-manager-crds

clusters/homelab/monitoring.yaml

@@ -40,14 +40,14 @@ spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./infrastructure/kube-prometheus-stack/prometheus-crds
+  path: ./infrastructure/prometheus/crds
   prune: true
   timeout: 5m
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: kube-prometheus-stack
+  name: prometheus
   namespace: flux-system
 spec:
   dependsOn:
@@ -58,39 +58,39 @@ spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./infrastructure/kube-prometheus-stack
+  path: ./infrastructure/prometheus
   prune: true
   timeout: 5m
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: kube-prometheus-stack-monitors
+  name: prometheus-monitors
   namespace: flux-system
 spec:
   dependsOn:
-    - name: kube-prometheus-stack
+    - name: prometheus
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./infrastructure/kube-prometheus-stack/monitors
+  path: ./infrastructure/prometheus/monitors
   prune: true
   timeout: 5m
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: prometheus-rules
+  name: prometheus-alerts
   namespace: flux-system
 spec:
   dependsOn:
-    - name: kube-prometheus-stack
+    - name: prometheus
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./infrastructure/kube-prometheus-stack/prometheus-rules
+  path: ./infrastructure/prometheus/alerts
   prune: true
   timeout: 5m
 ---
@@ -101,11 +101,11 @@ metadata:
   namespace: flux-system
 spec:
   dependsOn:
-    - name: kube-prometheus-stack
+    - name: prometheus
   interval: 5m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./infrastructure/kube-prometheus-stack/prometheus-scrapeconfigs
+  path: ./infrastructure/prometheus/scrapeconfigs
   prune: true
   timeout: 5m

infrastructure/kube-prometheus-stack/alertmanager-httproute.yaml renamed to infrastructure/prometheus/alertmanager-httproute.yaml

@@ -1,10 +1,10 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: prometheus-hardware-rules
+  name: hardware
 spec:
   groups:
-    - name: hardware-alerts
+    - name: hardware
       rules:
         - alert: HighTemperature
           expr: (node_hwmon_temp_celsius * on(instance, chip) group_left(chip_name) node_hwmon_chip_names) > 70

infrastructure/kube-prometheus-stack/alertmanager-sealedsecret.yaml renamed to infrastructure/prometheus/alertmanager-sealedsecret.yaml

@@ -13,6 +13,7 @@ spec:
       version: "9.3.0"
   interval: 1h0m0s
   values:
+    fullnameOverride: blackbox-exporter
     config:
       modules:
         icmp: