From 7a2f25cb64831cb9c4ecde8883566d32ea0e0678 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Mon, 3 Jul 2023 21:22:23 +0200
Subject: [PATCH] feat: add zabbix-proxy to monitoring stack

---
 README.md                                     |  1 +
 .../monitoring/prometheus-stack.jsonnet       | 23 +------------------
 k8s-manifests/monitoring/zabbix-proxy.jsonnet | 21 +++++++++++++++++
 3 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 k8s-manifests/monitoring/zabbix-proxy.jsonnet

diff --git a/README.md b/README.md
index d4716a3..f681435 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
     * selfsigned issuer
     * LetsEncrypt issuers (Prod and Staging)
   * [prometheus and grafana](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
+  * [zabbix-proxy](https://git.zabbix.com/projects/ZT/repos/kubernetes-helm/browse?at=refs%2Fheads%2Frelease%2F6.4)
   * [loki](https://grafana.com/docs/loki/latest/)
   * [keel](https://keel.sh)
   * [reloader](https://github.com/stakater/Reloader)
diff --git a/k8s-manifests/monitoring/prometheus-stack.jsonnet b/k8s-manifests/monitoring/prometheus-stack.jsonnet
index faadffb..7e51eb8 100644
--- a/k8s-manifests/monitoring/prometheus-stack.jsonnet
+++ b/k8s-manifests/monitoring/prometheus-stack.jsonnet
@@ -32,28 +32,7 @@ app + {
     kubeControllerManager:
       enabled: false
     alertmanager:
-      config:
-        global:
-          resolve_timeout: 5m
-        route:
-          group_by: ['alertname', 'cluster']
-          group_wait: 30s
-          group_interval: 5m
-          repeat_interval: 12h
-          receiver: 'pushover'
-          routes:
-            - receiver: 'null'
-              matchers:
-                - alertname="Watchdog"
-            - receiver: 'null'
-              matchers:
-                - alertname="InfoInhibitor"
-        receivers:
-          - name: 'null'
-          - name: 'pushover'
-            pushover_configs:
-              - user_key: x9PipXt1zGOU31OJH9Osv18BFrlRhw
-                token: aqvce1uukerhxhayxdq85wgtdh2c5r
+      enabled: false
     prometheus:
       prometheusSpec:
         storageSpec:
diff --git a/k8s-manifests/monitoring/zabbix-proxy.jsonnet b/k8s-manifests/monitoring/zabbix-proxy.jsonnet
new file mode 100644
index 0000000..92016b4
--- /dev/null
+++ b/k8s-manifests/monitoring/zabbix-proxy.jsonnet
@@ -0,0 +1,21 @@
+local app = import "../../_templates/argocd_app.libsonnet";
+
+[
+app + {
+  name:: "zabbix-proxy",
+  namespace:: "monitoring",
+  chart:: "zabbix-helm-chrt",
+  repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/6.4",
+  version:: "1.3.*",
+  values:: |||
+    zabbixAgent:
+      enabled: false
+    zabbixProxy:
+      env:
+        - name: ZBX_HOSTNAME
+          value: zabbix-proxy
+        - name: ZBX_SERVER_HOST
+          value: "zabbix.smsvc.net"
+  |||
+}
+]