From 57097b8ff8f716eaa49cadcad7f7f473280d3dd3 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Mon, 6 Jul 2026 22:26:08 +1000
Subject: [PATCH] observability: scrape ceph-csi metrics via VMServiceScrape

The ceph-csi cephfs/rbd charts already expose http-metrics services but
nothing scraped them. Add native VMServiceScrape CRs (the cluster has no
Prometheus-Operator CRDs, only VM-native ones) so the observability
VMAgent (selectAllByDefault) collects ceph-csi grpc/csi metrics.
---
 apps/base/csi-cephfs/kustomization.yaml    |  1 +
 apps/base/csi-cephfs/vmservicescrape.yaml  | 15 +++++++++++++++
 apps/base/csi-cephrbd/kustomization.yaml   |  1 +
 apps/base/csi-cephrbd/vmservicescrape.yaml | 15 +++++++++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 apps/base/csi-cephfs/vmservicescrape.yaml
 create mode 100644 apps/base/csi-cephrbd/vmservicescrape.yaml

diff --git a/apps/base/csi-cephfs/kustomization.yaml b/apps/base/csi-cephfs/kustomization.yaml
index 5849aad..cd444d8 100644
--- a/apps/base/csi-cephfs/kustomization.yaml
+++ b/apps/base/csi-cephfs/kustomization.yaml
@@ -7,3 +7,4 @@ resources:
   - vaultauth.yaml
   - vaultstaticsecret.yaml
   - storageclass.yaml
+  - vmservicescrape.yaml
diff --git a/apps/base/csi-cephfs/vmservicescrape.yaml b/apps/base/csi-cephfs/vmservicescrape.yaml
new file mode 100644
index 0000000..3362347
--- /dev/null
+++ b/apps/base/csi-cephfs/vmservicescrape.yaml
@@ -0,0 +1,15 @@
+---
+# Scrape the ceph-csi-cephfs nodeplugin + provisioner http-metrics endpoints.
+# Picked up by the observability VMAgent (selectAllByDefault).
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: ceph-csi-cephfs
+  namespace: csi-cephfs
+spec:
+  selector:
+    matchLabels:
+      app: ceph-csi-cephfs
+  endpoints:
+    - port: http-metrics
+      path: /metrics
diff --git a/apps/base/csi-cephrbd/kustomization.yaml b/apps/base/csi-cephrbd/kustomization.yaml
index 5849aad..cd444d8 100644
--- a/apps/base/csi-cephrbd/kustomization.yaml
+++ b/apps/base/csi-cephrbd/kustomization.yaml
@@ -7,3 +7,4 @@ resources:
   - vaultauth.yaml
   - vaultstaticsecret.yaml
   - storageclass.yaml
+  - vmservicescrape.yaml
diff --git a/apps/base/csi-cephrbd/vmservicescrape.yaml b/apps/base/csi-cephrbd/vmservicescrape.yaml
new file mode 100644
index 0000000..ed08260
--- /dev/null
+++ b/apps/base/csi-cephrbd/vmservicescrape.yaml
@@ -0,0 +1,15 @@
+---
+# Scrape the ceph-csi-rbd nodeplugin + provisioner http-metrics endpoints.
+# Picked up by the observability VMAgent (selectAllByDefault).
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: ceph-csi-rbd
+  namespace: csi-cephrbd
+spec:
+  selector:
+    matchLabels:
+      app: ceph-csi-rbd
+  endpoints:
+    - port: http-metrics
+      path: /metrics