--- a/config/scrape_main.yaml	Fri Jun 23 23:53:24 2023 -0700
+++ b/config/scrape_main.yaml	Fri Jun 23 23:54:38 2023 -0700
@@ -99,6 +99,15 @@
       - {if: '{job="jsregistry",        __port_number="4873"}', action: drop}
       - {if: '{job="photoprism",        __port_number="2342"}', action: drop}
       - {if: '{job="net-route-input",   __port_number="80"}', action: drop}
+
+      # discovery is also matching redundant container ports that it also catches with the service
+      - {if: '{job="lanscape",        __port_number="8001"}', action: drop}
+      - {if: '{job="lanscape",        __port_number="8002"}', action: drop}
+      - {if: '{job="collector",        __port_number="8001"}', action: drop}
+      - {if: '{job="collector",        __port_number="8002"}', action: drop}
+      - {if: '{job="racc-console",        __port_number="8002"}', action: drop}
+      - {if: '{job="antigen-web",        __port_number="8001"}', action: drop}
+
   
   # # seems like this would match more stuff, but all I get is coredns
   # - job_name: 'old_coredns'
@@ -120,6 +129,17 @@
         replacement: "${1}:9273"
         action: replace
 
+  - job_name: "smartctl"
+    scrape_interval: 1h
+    scheme: http
+    kubernetes_sd_configs: [{ role: node }]
+    relabel_configs:
+      - source_labels: [__address__]
+        regex: "(.*):(\\d+)"
+        target_label: __address__
+        replacement: "${1}:9633"
+        action: replace
+
   - job_name: "net-routes"
     static_configs:
       - targets:
@@ -135,10 +155,20 @@
       - targets:
           - pipe:9991
 
-  - job_name: "zfs"
+  - job_name: "pomerium"
     static_configs:
       - targets:
-          - bang:9985
+          - pomerium-metrics.pomerium.svc:9090
+          - cert-manager.cert-manager.svc:9402
+
+
+  - job_name: "zfs"
+    scrape_interval: 1h
+    static_configs:
+      - targets:
+          # running in in k8s, but not in SD
+          - ditto:9634
+          - ditto:9986
 
   - job_name: "ping"
     scrape_interval: 2m

--- a/config/scrape_ssl.yaml	Fri Jun 23 23:53:24 2023 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-scrape_configs:
-  - job_name: "prober"
-    scrape_interval: 24h
-    metrics_path: /probe
-    params:
-      module: [https]
-    static_configs:
-      - targets:
-          # sync with /my/doc/ssl/letsencrypt/run.py
-          - fantasyfamegame.com
-          - bigast.com
-          - bigasterisk.com
-    relabel_configs:
-      - source_labels: [__address__]
-        target_label: __param_target
-      - source_labels: [__param_target]
-        target_label: instance
-      - target_label: __address__
-        replacement: prober