From f217f8eae7f205314e70fe20e3306b2378c268b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri@k-space.ee>
Date: Mon, 28 Aug 2023 20:57:06 +0300
Subject: [PATCH] monitoring: Clean up blackbox-exporter

---
 monitoring/blackbox-exporter.yaml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/monitoring/blackbox-exporter.yaml b/monitoring/blackbox-exporter.yaml
index e16b3a3..7dec767 100644
--- a/monitoring/blackbox-exporter.yaml
+++ b/monitoring/blackbox-exporter.yaml
@@ -18,6 +18,8 @@ spec:
         - https://members.k-space.ee/
         - https://nextcloud.k-space.ee/
         - http://minio.infra.k-space.ee:9001/login
+        - http://external-console.minio-clusters.k-space.ee/login
+        - http://shared-console.minio-clusters.k-space.ee/login
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: Probe
@@ -41,14 +43,12 @@ metadata:
 spec:
   prober:
     url: blackbox-exporter
-    path: /metrics
+    path: /probe
   module: tcp_connect
   targets:
     staticConfig:
       static:
         - dc1.ad.k-space.ee:636
-        - dc2.ad.k-space.ee:636
-        - dc3.ad.k-space.ee:636
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: Probe
@@ -57,7 +57,7 @@ metadata:
 spec:
   prober:
     url: blackbox-exporter
-    path: /metrics
+    path: /probe
   module: tcp_connect
   targets:
     staticConfig:
@@ -67,6 +67,22 @@ spec:
         - mariadb.infra.k-space.ee:3306
 ---
 apiVersion: monitoring.coreos.com/v1
+kind: Probe
+metadata:
+  name: wildduck
+spec:
+  prober:
+    url: blackbox-exporter
+    path: /probe
+  module: tcp_connect
+  targets:
+    staticConfig:
+      static:
+        - mail.k-space.ee:25
+        - mail.k-space.ee:465
+        - mail.k-space.ee:993
+---
+apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: blackbox-exporter
@@ -168,6 +184,9 @@ spec:
       containers:
       - name: blackbox-exporter
         image: prom/blackbox-exporter:v0.20.0
+        ports:
+          - name: http
+            containerPort: 9115
         volumeMounts:
         - name: blackbox-exporter-config
           mountPath: /etc/blackbox_exporter