revert: undo all observability changes from today

Reverts hostname relabeling and etcd metrics changes

3 files changed, 1 insertions, 244 deletions

diff --git a/f3s/DRAFT-observability2.gmi b/f3s/DRAFT-observability2.gmi
deleted file mode 100644
index 74771fd..0000000
--- a/f3s/DRAFT-observability2.gmi
+++ /dev/null
@@ -1,204 +0,0 @@
-# f3s: Kubernetes with FreeBSD - Part 9: Observability Improvements
-
-## Introduction
-
-This post covers improvements to the observability stack set up in Part 8. The main focus is making the Node Exporter dashboards more readable by displaying hostnames instead of IP addresses, and enabling etcd metrics monitoring for the k3s cluster.
-
-=> ./2025-12-07-f3s-kubernetes-with-freebsd-part-8.html Part 8: Observability
-
-## Displaying hostnames instead of IP addresses
-
-The "Node Exporter / USE Method / Node" dashboard originally showed IP addresses for all instances. This made it difficult to quickly identify which host was which. The fix involves adding relabel configurations to Prometheus.
-
-### Relabeling external hosts (FreeBSD and OpenBSD)
-
-For the external FreeBSD and OpenBSD hosts scraped via the additional-scrape-configs.yaml, I added relabel_configs to map IP addresses to hostnames:
-
-```
-- job_name: 'node-exporter'
-  static_configs:
-    - targets:
-      - '192.168.2.130:9100'  # f0 via WireGuard
-      - '192.168.2.131:9100'  # f1 via WireGuard
-      - '192.168.2.132:9100'  # f2 via WireGuard
-      labels:
-        os: freebsd
-    - targets:
-      - '192.168.2.110:9100'  # blowfish via WireGuard
-      - '192.168.2.111:9100'  # fishfinger via WireGuard
-      labels:
-        os: openbsd
-  relabel_configs:
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.130:9100'
-      target_label: instance
-      replacement: 'f0.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.131:9100'
-      target_label: instance
-      replacement: 'f1.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.132:9100'
-      target_label: instance
-      replacement: 'f2.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.110:9100'
-      target_label: instance
-      replacement: 'blowfish.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.111:9100'
-      target_label: instance
-      replacement: 'fishfinger.buetow.org'
-```
-
-The relabel_configs section matches each IP:port combination and replaces the instance label with the corresponding hostname.
-
-### Relabeling Rocky Linux nodes
-
-The Rocky Linux k3s nodes (r0, r1, r2) are scraped via the kube-prometheus-stack's built-in node-exporter DaemonSet. To display hostnames for these, I added a relabeling configuration to the Helm values in persistence-values.yaml:
-
-```
-prometheus-node-exporter:
-  prometheus:
-    monitor:
-      relabelings:
-        - sourceLabels: [__meta_kubernetes_pod_node_name]
-          targetLabel: instance
-```
-
-This uses the Kubernetes node name metadata (__meta_kubernetes_pod_node_name) to set the instance label, which automatically gives us r0.lan.buetow.org, r1.lan.buetow.org, and r2.lan.buetow.org.
-
-## Enabling etcd metrics monitoring
-
-The etcd dashboard initially showed no data because k3s uses an embedded etcd that doesn't expose metrics by default.
-
-### Enabling etcd metrics in k3s
-
-On each control-plane node (r0, r1, r2), create /etc/rancher/k3s/config.yaml:
-
-```
-etcd-expose-metrics: true
-```
-
-Then restart k3s on each node:
-
-```
-systemctl restart k3s
-```
-
-After restarting, etcd metrics are available on port 2381:
-
-```
-curl http://127.0.0.1:2381/metrics | grep etcd
-```
-
-### Configuring Prometheus to scrape etcd
-
-In persistence-values.yaml, enable kubeEtcd with the node IP addresses:
-
-```
-kubeEtcd:
-  enabled: true
-  endpoints:
-    - 192.168.1.120
-    - 192.168.1.121
-    - 192.168.1.122
-  service:
-    enabled: true
-    port: 2381
-    targetPort: 2381
-```
-
-Apply the changes:
-
-```
-just upgrade
-```
-
-### Verifying etcd metrics
-
-After the changes, all etcd targets are being scraped:
-
-```
-kubectl exec -n monitoring prometheus-prometheus-kube-prometheus-prometheus-0 \
-  -c prometheus -- wget -qO- 'http://localhost:9090/api/v1/query?query=etcd_server_has_leader' | \
-  jq -r '.data.result[] | "\(.metric.instance): \(.value[1])"'
-```
-
-Output:
-
-```
-192.168.1.120:2381: 1
-192.168.1.121:2381: 1
-192.168.1.122:2381: 1
-```
-
-The etcd dashboard in Grafana now displays metrics including Raft proposals, leader elections, and peer round trip times.
-
-## Complete persistence-values.yaml
-
-The complete updated persistence-values.yaml:
-
-```
-prometheus-node-exporter:
-  prometheus:
-    monitor:
-      relabelings:
-        - sourceLabels: [__meta_kubernetes_pod_node_name]
-          targetLabel: instance
-
-kubeEtcd:
-  enabled: true
-  endpoints:
-    - 192.168.1.120
-    - 192.168.1.121
-    - 192.168.1.122
-  service:
-    enabled: true
-    port: 2381
-    targetPort: 2381
-
-prometheus:
-  prometheusSpec:
-    additionalScrapeConfigsSecret:
-      enabled: true
-      name: additional-scrape-configs
-      key: additional-scrape-configs.yaml
-    storageSpec:
-      volumeClaimTemplate:
-        spec:
-          storageClassName: ""
-          accessModes: ["ReadWriteOnce"]
-          resources:
-            requests:
-              storage: 10Gi
-          selector:
-            matchLabels:
-              type: local
-              app: prometheus
-
-grafana:
-  persistence:
-    enabled: true
-    type: pvc
-    existingClaim: "grafana-data-pvc"
-
-  initChownData:
-    enabled: false
-
-  podSecurityContext:
-    fsGroup: 911
-    runAsUser: 911
-    runAsGroup: 911
-```
-
-## Summary
-
-Two improvements were made to the observability stack:
-
-* Node Exporter instance labels now show hostnames (e.g., f0.lan.buetow.org) instead of IP addresses
-* Enabled etcd metrics monitoring for the k3s embedded etcd
-
-These changes make the Node Exporter dashboards more readable and provide visibility into etcd cluster health.
-
-=> https://codeberg.org/snonux/conf/src/branch/master/f3s/prometheus prometheus configuration on Codeberg
diff --git a/f3s/prometheus/additional-scrape-configs.yaml b/f3s/prometheus/additional-scrape-configs.yaml
index b8fc9fa..93035d8 100644
--- a/f3s/prometheus/additional-scrape-configs.yaml
+++ b/f3s/prometheus/additional-scrape-configs.yaml
@@ -11,24 +11,3 @@
       - '192.168.2.111:9100'  # fishfinger via WireGuard
       labels:
         os: openbsd
-  relabel_configs:
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.130:9100'
-      target_label: instance
-      replacement: 'f0.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.131:9100'
-      target_label: instance
-      replacement: 'f1.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.132:9100'
-      target_label: instance
-      replacement: 'f2.lan.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.110:9100'
-      target_label: instance
-      replacement: 'blowfish.buetow.org'
-    - source_labels: [__address__]
-      regex: '192\.168\.2\.111:9100'
-      target_label: instance
-      replacement: 'fishfinger.buetow.org'
diff --git a/f3s/prometheus/persistence-values.yaml b/f3s/prometheus/persistence-values.yaml
index 477410a..c7f3a2b 100644
--- a/f3s/prometheus/persistence-values.yaml
+++ b/f3s/prometheus/persistence-values.yaml
@@ -1,21 +1,3 @@
-prometheus-node-exporter:
-  prometheus:
-    monitor:
-      relabelings:
-        - sourceLabels: [__meta_kubernetes_pod_node_name]
-          targetLabel: instance
-
-kubeEtcd:
-  enabled: true
-  endpoints:
-    - 192.168.1.120
-    - 192.168.1.121
-    - 192.168.1.122
-  service:
-    enabled: true
-    port: 2381
-    targetPort: 2381
-
 prometheus:
   prometheusSpec:
     additionalScrapeConfigsSecret:
@@ -47,4 +29,4 @@ grafana:
   podSecurityContext:
     fsGroup: 911
     runAsUser: 911
-    runAsGroup: 911
+    runAsGroup: 911
\ No newline at end of file