From 7949c95acbc6e96177ecbc0d4b5114ad8927b037 Mon Sep 17 00:00:00 2001
From: Massaki Archambault <marchambault@badjware.dev>
Date: Sat, 28 Aug 2021 16:48:00 -0400
Subject: [PATCH] add longhorn monitoring

---
 .../kube-state-metrics.yaml                   | 15 ---------
 .../kube-state-metrics/kustomization.yaml     |  5 +--
 .../prometheus-operator.yaml                  |  7 -----
 kustomize/bases/prometheus/kustomization.yaml |  5 ++-
 .../generic-any-namespaces.yaml               | 14 +++++++++
 .../kubelet.yaml}                             | 31 +------------------
 .../prometheus/servicemonitors/longhorn.yaml  | 16 ++++++++++
 .../servicemonitors/prometheus.yaml           | 13 ++++++++
 8 files changed, 49 insertions(+), 57 deletions(-)
 delete mode 100644 kustomize/bases/kube-state-metrics/kube-state-metrics.yaml
 delete mode 100644 kustomize/bases/prometheus-operator/prometheus-operator.yaml
 create mode 100644 kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml
 rename kustomize/bases/prometheus/{servicemonitors.yaml => servicemonitors/kubelet.yaml} (59%)
 create mode 100644 kustomize/bases/prometheus/servicemonitors/longhorn.yaml
 create mode 100644 kustomize/bases/prometheus/servicemonitors/prometheus.yaml

diff --git a/kustomize/bases/kube-state-metrics/kube-state-metrics.yaml b/kustomize/bases/kube-state-metrics/kube-state-metrics.yaml
deleted file mode 100644
index 7e2ecec..0000000
--- a/kustomize/bases/kube-state-metrics/kube-state-metrics.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: badjware/v1
-kind: RemoteResources
-metadata:
-  name: kube-state-metrics
-resources:
-  - url: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/master/examples/standard/cluster-role-binding.yaml
-    sha256: 47d33684e45f1aa6a9f10af998e485e76608f92885f2558d436dbd91f87738aa
-  - url: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/master/examples/standard/cluster-role.yaml
-    sha256: 26e6b749f1956fcab55f48f2a25b5195c686b814a3546640a3ed2f3485b5b0af
-  - url: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/master/examples/standard/deployment.yaml
-    sha256: 716fa3a4bcb50daebd2040cdf3d9abd0978f4a0222e220b8b86ab020dca7d5aa
-  - url: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/master/examples/standard/service-account.yaml
-    sha256: d356059416f2ead70b7d27a6fc9cc3e091a8f21f7022ce23da96ed5d871c018b
-  - url: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/master/examples/standard/service.yaml
-    sha256: e110496c646d2d7b41311ef88d315f239d3505785d99ffd8d0a1f9ec9832eb84
\ No newline at end of file
diff --git a/kustomize/bases/kube-state-metrics/kustomization.yaml b/kustomize/bases/kube-state-metrics/kustomization.yaml
index f9d6b36..9042caf 100644
--- a/kustomize/bases/kube-state-metrics/kustomization.yaml
+++ b/kustomize/bases/kube-state-metrics/kustomization.yaml
@@ -7,7 +7,4 @@ resources:
   - https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.1.1/examples/standard/service.yaml
 
 commonLabels:
-  app.kubernetes.io/name: kube-state-metrics
-
-# generators:
-#   - kube-state-metrics.yaml
\ No newline at end of file
+  app.kubernetes.io/name: kube-state-metrics
\ No newline at end of file
diff --git a/kustomize/bases/prometheus-operator/prometheus-operator.yaml b/kustomize/bases/prometheus-operator/prometheus-operator.yaml
deleted file mode 100644
index 59cc737..0000000
--- a/kustomize/bases/prometheus-operator/prometheus-operator.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: badjware/v1
-kind: RemoteResources
-metadata:
-  name: prometheus-operator
-resources:
-  - url: https://raw.githubusercontent.com/coreos/prometheus-operator/master/bundle.yaml
-    sha256: 557721b7638055102c150f68a924b6c4d0b36439a0fb87cb0cddbaf89e1c2c57
\ No newline at end of file
diff --git a/kustomize/bases/prometheus/kustomization.yaml b/kustomize/bases/prometheus/kustomization.yaml
index cfc8ea5..e7cfed2 100644
--- a/kustomize/bases/prometheus/kustomization.yaml
+++ b/kustomize/bases/prometheus/kustomization.yaml
@@ -3,4 +3,7 @@ resources:
   - prometheus-rbac.yaml
   - prometheus-ingress.yaml
   - traefik-podmonitor.yaml
-  - servicemonitors.yaml
\ No newline at end of file
+  - servicemonitors/generic-any-namespaces.yaml
+  - servicemonitors/kubelet.yaml
+  - servicemonitors/longhorn.yaml
+  - servicemonitors/prometheus.yaml
\ No newline at end of file
diff --git a/kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml b/kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml
new file mode 100644
index 0000000..cdfe005
--- /dev/null
+++ b/kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml
@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: servicemonitor-http
+  labels:
+    monitor: prometheus
+spec:
+  namespaceSelector:
+    any: true
+  selector:
+    matchLabels:
+      monitor: prometheus
+  endpoints:
+    - port: http
diff --git a/kustomize/bases/prometheus/servicemonitors.yaml b/kustomize/bases/prometheus/servicemonitors/kubelet.yaml
similarity index 59%
rename from kustomize/bases/prometheus/servicemonitors.yaml
rename to kustomize/bases/prometheus/servicemonitors/kubelet.yaml
index 9fa89cf..e1711dc 100644
--- a/kustomize/bases/prometheus/servicemonitors.yaml
+++ b/kustomize/bases/prometheus/servicemonitors/kubelet.yaml
@@ -1,19 +1,5 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
-metadata:
-  name: prometheus
-  labels:
-    app.kubernetes.io/name: prometheus
-    monitor: prometheus
-spec:
-  selector:
-    matchLabels:
-      operated-prometheus: "true"
-  endpoints:
-    - port: web
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
 metadata:
   name: kubelet
   labels:
@@ -43,19 +29,4 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-        insecureSkipVerify: true
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: servicemonitor-http
-  labels:
-    monitor: prometheus
-spec:
-  namespaceSelector:
-    any: true
-  selector:
-    matchLabels:
-      monitor: prometheus
-  endpoints:
-    - port: http
+        insecureSkipVerify: true
\ No newline at end of file
diff --git a/kustomize/bases/prometheus/servicemonitors/longhorn.yaml b/kustomize/bases/prometheus/servicemonitors/longhorn.yaml
new file mode 100644
index 0000000..fd9f168
--- /dev/null
+++ b/kustomize/bases/prometheus/servicemonitors/longhorn.yaml
@@ -0,0 +1,16 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: longhorn
+  labels:
+    app.kubernetes.io/name: longhorn
+    monitor: prometheus
+spec:
+  selector:
+    matchLabels:
+      app: longhorn-manager
+  namespaceSelector:
+    matchNames:
+    - longhorn-system
+  endpoints:
+  - port: manager
diff --git a/kustomize/bases/prometheus/servicemonitors/prometheus.yaml b/kustomize/bases/prometheus/servicemonitors/prometheus.yaml
new file mode 100644
index 0000000..4d97715
--- /dev/null
+++ b/kustomize/bases/prometheus/servicemonitors/prometheus.yaml
@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: prometheus
+  labels:
+    app.kubernetes.io/name: prometheus
+    monitor: prometheus
+spec:
+  selector:
+    matchLabels:
+      operated-prometheus: "true"
+  endpoints:
+    - port: web
\ No newline at end of file