monitoring: add additionalScrapeConfigs patch

hashbang · Jun 29, 2020 · 4e97da9 · 4e97da9
1 parent 0b04389
commit 4e97da9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 31 deletions.
diff --git a/monitoring/external/shell-servers.yaml b/monitoring/external/shell-servers.yaml
diff --git a/monitoring/kustomization.yaml b/monitoring/kustomization.yaml
@@ -6,11 +6,12 @@ resources:
   - cilium-service-monitor.yaml
   - ./loki
   - ./promtail
-  - external/shell-servers.yaml
+  - prometheus-additional-targets.yaml
 patches:
   - container-images.patch.yaml
   - cluster-wide.patch.yaml
   - grafana-dashboards.patch.yaml
+  - prometheus-additional-scrape-configs.patch.yaml
 patchesJson6902:
   - target:
       version: v1

diff --git a/monitoring/prometheus-additional-scrape-configs.patch.yaml b/monitoring/prometheus-additional-scrape-configs.patch.yaml
@@ -0,0 +1,9 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  namespace: monitoring
+  name: k8s
+spec:
+  additionalScrapeConfigs:
+    name: additional-scrape-configs
+    key: prometheus-additional.yaml
diff --git a/monitoring/prometheus-additional-targets.yaml b/monitoring/prometheus-additional-targets.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: additional-scrape-configs
+type: Opaque
+stringData:
+  prometheus-additional.yaml: |
+    - job_name: "prometheus"
+      static_configs:
+      - job_name: "shell-server"
+        targets:
+        - de1.hashbang.sh/metrics