From cdce4c3daab3603d077d536e5577205e7c4362d1 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Fri, 28 Feb 2025 21:18:24 -0600
Subject: [PATCH] change scrape config

---
 .../templates/scrape-config.yaml              | 48 ++-----------------
 .../kube-prometheus-stack/values.yaml         |  1 +
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
index e66ed79c4..bd05754d7 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
@@ -1,10 +1,10 @@
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: ScrapeConfig
 metadata:
-  name: node-ps08rp
+  name: external-nodes
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: node-ps08rp
+    app.kubernetes.io/name: external-nodes
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: metrics
@@ -12,50 +12,10 @@ metadata:
 spec:
   staticConfigs:
     - labels:
-        job: ps08rp
+        job: external-nodes
       targets:
         - ps08rp.alexlebens.net:9100
-  metricsPath: /metrics
-  scheme: HTTP
-
----
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: ScrapeConfig
-metadata:
-  name: node-ps09rp
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: node-ps09rp
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  staticConfigs:
-    - labels:
-        job: ps08rp
-      targets:
-        - ps08rp.alexlebens.net:9100
-  metricsPath: /metrics
-  scheme: HTTP
-
----
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: ScrapeConfig
-metadata:
-  name: node-ps10rp
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: node-ps10rp
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  staticConfigs:
-    - labels:
-        job: ps08rp
-      targets:
+        - ps08rp.alexlebens.net:910
         - node-exporter-ps10rp.boreal-beaufort.ts.net
   metricsPath: /metrics
   scheme: HTTP
diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
index d493cd5bc..0441670e6 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
@@ -138,6 +138,7 @@ kube-prometheus-stack:
       externalUrl: https://prometheus-cl01tl.boreal-beaufort.ts.net
       serviceMonitorSelectorNilUsesHelmValues: false
       podMonitorSelectorNilUsesHelmValues: false
+      scrapeConfigSelectorNilUsesHelmValues: false
       storageSpec:
         volumeClaimTemplate:
           spec: