Cleanup prometheus for homelab cluster

homelab/prometheus-agent.yml

@@ -3,52 +3,7 @@ prometheus:
   prometheusSpec:
       podMonitorSelectorNilUsesHelmValues: false
       serviceMonitorSelectorNilUsesHelmValues: false
-      additionalScrapeConfigs:
+      ruleSelectorNilUsesHelmValues: false
-      - 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
       remoteWrite:
       - name: monitoring
         url: http://grafana.gmem.ca:9001/api/v1/write

homelab/tclip.nix

@@ -15,11 +15,7 @@ in {
     };
   };
   kubernetes.resources.services.tclip = {
-    metadata.annotations = {
+    metadata.labels.app = appName;
-      "prometheus.io/port" = "9090";
-      "prometheus.io/scrape" = "true";
-      "prometheus.io/path" = "/metrics";
-    };
     spec = {
       selector.app = appName;
       ports.metrics = {
@@ -90,7 +86,10 @@ in {
               }
             ];
             envFrom = [{secretRef.name = "tclip-litestream-s3";}];
-            ports.metrics.containerPort = 9090;
+            ports.metrics = {
+              containerPort = 9090;
+              name = "metrics";
+            };
           };
         };
       };

homelab/vaultwarden.yml

@@ -33,7 +33,6 @@ spec:
           envFrom:
             - secretRef:
                 name: vaultwarden-litestream-s3
-
       containers:
       - name: vaultwarden
         image: docker.io/vaultwarden/server:testing
@@ -91,10 +90,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: vaultwarden
-  annotations:
+  labels:
-     prometheus.io/port: "9090"
+    app: vaultwarden
-     prometheus.io/scrape: "true"
-     prometheus.io/path: "/metrics"
 spec:
   selector:
     app: vaultwarden
@@ -104,7 +101,7 @@ spec:
     name: web
   - port: 9090
     targetPort: 9090
-    name: litestream-metrics
+    name: metrics
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

homelab/vrchat-prometheus-exporter.nix

@@ -14,11 +14,7 @@ in {
     };
   };
   kubernetes.resources.services.vrchat-prometheus-adapter = {
-    metadata.annotations = {
+    metadata.labels.app = appName;
-      "prometheus.io/port" = "6534";
-      "prometheus.io/scrape" = "true";
-      "prometheus.io/path" = "/metrics";
-    };
     spec = {
       selector.app = appName;
       ports.metrics = {