From c419fc2f59e31ae5bd08b94f719901423e6e19cc Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:20:46 +0300 Subject: [PATCH 01/16] Add monitoring.yaml for grafana --- manifests/grafana/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/grafana/monitoring.yaml diff --git a/manifests/grafana/monitoring.yaml b/manifests/grafana/monitoring.yaml new file mode 100644 index 0000000..44c1701 --- /dev/null +++ b/manifests/grafana/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: grafana +'# targets': +- : +'# scheme': http +'# external_check': + url: https://grafana.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://grafana.dvirlabs.com + tag: grafana From e91fef4096d94e36343d946f23a2be13193bd253 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:21:05 +0300 Subject: [PATCH 02/16] Add monitoring.yaml for prometheus --- manifests/prometheus/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/prometheus/monitoring.yaml diff --git a/manifests/prometheus/monitoring.yaml b/manifests/prometheus/monitoring.yaml new file mode 100644 index 0000000..52fb77a --- /dev/null +++ b/manifests/prometheus/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: prometheus +'# targets': +- : +'# scheme': http +'# external_check': + url: https://prometheus.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://prometheus.dvirlabs.com + tag: prometheus From ec97a5cac8298f932e74fcfb794f143f8e447bea Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:21:09 +0300 Subject: [PATCH 03/16] Add monitoring.yaml for prometheus-int --- manifests/prometheus-int/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/prometheus-int/monitoring.yaml diff --git a/manifests/prometheus-int/monitoring.yaml b/manifests/prometheus-int/monitoring.yaml new file mode 100644 index 0000000..81f51f4 --- /dev/null +++ b/manifests/prometheus-int/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: prometheus-int +'# targets': +- : +'# scheme': http +'# external_check': + url: https://prometheus-int.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://prometheus-int.dvirlabs.com + tag: prometheus-int From 41833b9f8418ccb00c81bdeeaf1cbdb130082db0 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:21:12 +0300 Subject: [PATCH 04/16] Add monitoring.yaml for alertmanager --- manifests/alertmanager/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/alertmanager/monitoring.yaml diff --git a/manifests/alertmanager/monitoring.yaml b/manifests/alertmanager/monitoring.yaml new file mode 100644 index 0000000..6fd8402 --- /dev/null +++ b/manifests/alertmanager/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: alertmanager +'# targets': +- : +'# scheme': http +'# external_check': + url: https://alertmanager.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://alertmanager.dvirlabs.com + tag: alertmanager From 21df160a7fd7310fb001cd8002a3ea19bf01ba18 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:21:34 +0300 Subject: [PATCH 05/16] Add monitoring.yaml for kibana --- manifests/kibana/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/kibana/monitoring.yaml diff --git a/manifests/kibana/monitoring.yaml b/manifests/kibana/monitoring.yaml new file mode 100644 index 0000000..3da49ef --- /dev/null +++ b/manifests/kibana/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: kibana +'# targets': +- : +'# scheme': http +'# external_check': + url: https://kibana.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://kibana.dvirlabs.com + tag: kibana From a8521bd7a4a15c30e312bbb4bc4518018ab75bb9 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:21:38 +0300 Subject: [PATCH 06/16] Add monitoring.yaml for kibana-int --- manifests/kibana-int/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/kibana-int/monitoring.yaml diff --git a/manifests/kibana-int/monitoring.yaml b/manifests/kibana-int/monitoring.yaml new file mode 100644 index 0000000..a98534b --- /dev/null +++ b/manifests/kibana-int/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: kibana-int +'# targets': +- : +'# scheme': http +'# external_check': + url: https://kibana-int.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical +uptime_kuma: + enabled: true + url: https://kibana-int.dvirlabs.com + tag: kibana-int From 87d587be02235a76cc123b0ccc90ba7ca33a3a1a Mon Sep 17 00:00:00 2001 From: auto-sync Date: Tue, 22 Jul 2025 08:23:50 +0000 Subject: [PATCH 07/16] auto: update Prometheus scrape config --- .../additional-scrape-configs.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml b/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml index 49c9acb..409574d 100644 --- a/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml +++ b/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml @@ -14,18 +14,6 @@ stringData: - targets: - harbor-core.dev-tools.svc.cluster.local:8001 - - job_name: vault - static_configs: - - targets: - - vault.dev-tools.svc.cluster.local:8200 - metrics_path: /v1/sys/metrics - scheme: http - - job_name: woodpecker - static_configs: - - targets: - - woodpecker.dev-tools.svc.cluster.local:9000 - bearer_token: prometheusmetricstoken - scheme: https - job_name: gitea static_configs: - targets: From 00d6d09942b6c10ace453894babc792909ad0c3a Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:42:33 +0300 Subject: [PATCH 08/16] Add monitoring.yaml for grafana --- manifests/grafana/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/grafana/monitoring.yaml b/manifests/grafana/monitoring.yaml index 44c1701..771a605 100644 --- a/manifests/grafana/monitoring.yaml +++ b/manifests/grafana/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: grafana -'# targets': -- : -'# scheme': http -'# external_check': - url: https://grafana.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://grafana.dvirlabs.com - tag: grafana + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://grafana.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From 26298cf793f942597355bd43f74668fb5dfda185 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:42:41 +0300 Subject: [PATCH 09/16] Add monitoring.yaml for prometheus --- manifests/prometheus/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/prometheus/monitoring.yaml b/manifests/prometheus/monitoring.yaml index 52fb77a..5153563 100644 --- a/manifests/prometheus/monitoring.yaml +++ b/manifests/prometheus/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: prometheus -'# targets': -- : -'# scheme': http -'# external_check': - url: https://prometheus.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://prometheus.dvirlabs.com - tag: prometheus + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://prometheus.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From 5c7a927a1228b21b49772faceea5382481dab3e7 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:47:12 +0300 Subject: [PATCH 10/16] Add monitoring.yaml for prometheus-int --- manifests/prometheus-int/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/prometheus-int/monitoring.yaml b/manifests/prometheus-int/monitoring.yaml index 81f51f4..0430c80 100644 --- a/manifests/prometheus-int/monitoring.yaml +++ b/manifests/prometheus-int/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: prometheus-int -'# targets': -- : -'# scheme': http -'# external_check': - url: https://prometheus-int.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://prometheus-int.dvirlabs.com - tag: prometheus-int + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://prometheus-int.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From bef0bf08485bfc915393600f3d3280cd9a936263 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:47:16 +0300 Subject: [PATCH 11/16] Add monitoring.yaml for alertmanager --- manifests/alertmanager/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/alertmanager/monitoring.yaml b/manifests/alertmanager/monitoring.yaml index 6fd8402..cb11678 100644 --- a/manifests/alertmanager/monitoring.yaml +++ b/manifests/alertmanager/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: alertmanager -'# targets': -- : -'# scheme': http -'# external_check': - url: https://alertmanager.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://alertmanager.dvirlabs.com - tag: alertmanager + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://alertmanager.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From fbc73fe48a20d04041be3bdba20df8f1f042ef98 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:47:52 +0300 Subject: [PATCH 12/16] Add monitoring.yaml for kibana --- manifests/kibana/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/kibana/monitoring.yaml b/manifests/kibana/monitoring.yaml index 3da49ef..5258c43 100644 --- a/manifests/kibana/monitoring.yaml +++ b/manifests/kibana/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: kibana -'# targets': -- : -'# scheme': http -'# external_check': - url: https://kibana.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://kibana.dvirlabs.com - tag: kibana + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://kibana.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From d9f27fbcc7bd5481100c884e9a47de632f91cdb6 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:47:58 +0300 Subject: [PATCH 13/16] Add monitoring.yaml for kibana-int --- manifests/kibana-int/monitoring.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/kibana-int/monitoring.yaml b/manifests/kibana-int/monitoring.yaml index a98534b..8b13976 100644 --- a/manifests/kibana-int/monitoring.yaml +++ b/manifests/kibana-int/monitoring.yaml @@ -1,15 +1,15 @@ enabled: true app: kibana-int -'# targets': -- : -'# scheme': http -'# external_check': - url: https://kibana-int.dvirlabs.com - expected_codes: - '502': critical - '404': warning - '1033': critical uptime_kuma: enabled: true url: https://kibana-int.dvirlabs.com - tag: kibana-int + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://kibana-int.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From 936d7e1e825a6fe7cd3dd5b4568ad1d90fa14e78 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:49:12 +0300 Subject: [PATCH 14/16] Add monitoring.yaml for kuma --- manifests/kuma/monitoring.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifests/kuma/monitoring.yaml diff --git a/manifests/kuma/monitoring.yaml b/manifests/kuma/monitoring.yaml new file mode 100644 index 0000000..e909a2c --- /dev/null +++ b/manifests/kuma/monitoring.yaml @@ -0,0 +1,15 @@ +enabled: true +app: kuma +uptime_kuma: + enabled: true + url: https://kuma.dvirlabs.com + tag: observability-stack +# targets: +# - : +# scheme: http +# external_check: +# url: https://kuma.dvirlabs.com +# expected_codes: +# '502': critical +# '404': warning +# '1033': critical From 4a987ef9644be1a93e2524f535d4fde26332f5c3 Mon Sep 17 00:00:00 2001 From: auto-sync Date: Thu, 24 Jul 2025 11:51:18 +0000 Subject: [PATCH 15/16] auto: update Prometheus scrape config --- .../additional-scrape-configs.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml b/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml index 409574d..2e41a85 100644 --- a/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml +++ b/manifests/prometheus-scrape-secret/additional-scrape-configs.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/name: prometheus type: Opaque stringData: - additional-scrape-configs.yaml: | + additional-scrape-configs.yaml: |+ # This content will be auto-updated by the pipeline - job_name: harbor static_configs: @@ -24,8 +24,4 @@ stringData: - targets: - minio.infra.svc.cluster.local:9000 - - job_name: nextcloud - static_configs: - - targets: - - nextcloud-exporter.my-apps.svc.cluster.local:9205 - scheme: http +... From a3fe3d30e350f0380919a52ba558682584e69962 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Thu, 24 Jul 2025 15:47:00 +0300 Subject: [PATCH 16/16] Add monitoring.yaml files for all apps --- manifests/alertmanager/monitoring.yaml | 12 ++++++------ manifests/grafana/monitoring.yaml | 12 ++++++------ manifests/kibana-int/monitoring.yaml | 12 ++++++------ manifests/kibana/monitoring.yaml | 12 ++++++------ manifests/kuma/monitoring.yaml | 12 ++++++------ manifests/prometheus-int/monitoring.yaml | 12 ++++++------ manifests/prometheus/monitoring.yaml | 12 ++++++------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/manifests/alertmanager/monitoring.yaml b/manifests/alertmanager/monitoring.yaml index cb11678..b537325 100644 --- a/manifests/alertmanager/monitoring.yaml +++ b/manifests/alertmanager/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://alertmanager.dvirlabs.com tag: observability-stack +external_check: + url: https://alertmanager.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://alertmanager.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/grafana/monitoring.yaml b/manifests/grafana/monitoring.yaml index 771a605..4c6edd8 100644 --- a/manifests/grafana/monitoring.yaml +++ b/manifests/grafana/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://grafana.dvirlabs.com tag: observability-stack +external_check: + url: https://grafana.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://grafana.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/kibana-int/monitoring.yaml b/manifests/kibana-int/monitoring.yaml index 8b13976..2df027f 100644 --- a/manifests/kibana-int/monitoring.yaml +++ b/manifests/kibana-int/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://kibana-int.dvirlabs.com tag: observability-stack +external_check: + url: https://kibana-int.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://kibana-int.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/kibana/monitoring.yaml b/manifests/kibana/monitoring.yaml index 5258c43..4b4727e 100644 --- a/manifests/kibana/monitoring.yaml +++ b/manifests/kibana/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://kibana.dvirlabs.com tag: observability-stack +external_check: + url: https://kibana.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://kibana.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/kuma/monitoring.yaml b/manifests/kuma/monitoring.yaml index e909a2c..98dd111 100644 --- a/manifests/kuma/monitoring.yaml +++ b/manifests/kuma/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://kuma.dvirlabs.com tag: observability-stack +external_check: + url: https://kuma.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://kuma.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/prometheus-int/monitoring.yaml b/manifests/prometheus-int/monitoring.yaml index 0430c80..37ce350 100644 --- a/manifests/prometheus-int/monitoring.yaml +++ b/manifests/prometheus-int/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://prometheus-int.dvirlabs.com tag: observability-stack +external_check: + url: https://prometheus-int.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://prometheus-int.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical diff --git a/manifests/prometheus/monitoring.yaml b/manifests/prometheus/monitoring.yaml index 5153563..145b3d7 100644 --- a/manifests/prometheus/monitoring.yaml +++ b/manifests/prometheus/monitoring.yaml @@ -4,12 +4,12 @@ uptime_kuma: enabled: true url: https://prometheus.dvirlabs.com tag: observability-stack +external_check: + url: https://prometheus.dvirlabs.com + expected_codes: + '502': critical + '404': warning + '1033': critical # targets: # - : # scheme: http -# external_check: -# url: https://prometheus.dvirlabs.com -# expected_codes: -# '502': critical -# '404': warning -# '1033': critical