From d590287825ba7bd79c42fb6d3a1a68fef72341d7 Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:25:08 +0100 Subject: [PATCH 1/7] Create development.yml --- apps/api-status/development.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 apps/api-status/development.yml diff --git a/apps/api-status/development.yml b/apps/api-status/development.yml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/apps/api-status/development.yml @@ -0,0 +1 @@ + From 8a7fec78163fb100296c660fc66d34d1d8d9ac9d Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:36:41 +0100 Subject: [PATCH 2/7] Add blackbox exporter --- apps/api-status/development.yml | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/apps/api-status/development.yml b/apps/api-status/development.yml index 8b137891..05b88bdb 100644 --- a/apps/api-status/development.yml +++ b/apps/api-status/development.yml @@ -1 +1,41 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: blackbox-exporter + namespace: argocd +spec: + project: default + source: + repoURL: https://prometheus-community.github.io/helm-charts + chart: prometheus-blackbox-exporter + targetRevision: 8.17.0 + helm: + values: | + config: + modules: + http_2xx: + prober: http + timeout: 5s + http: + method: GET + serviceMonitor: + enabled: true + additionalRelabelings: + - sourceLabels: [__address__] + targetLabel: __param_target + - sourceLabels: [__param_target] + targetLabel: instance + - targetLabel: __address__ + replacement: blackbox-exporter.monitoring.svc.cluster.local:9115 + + targets: + - https://your-prod-api.company.com/health # Pending + + destination: + server: https://kubernetes.default.svc + namespace: monitoring + syncPolicy: + automated: + prune: true + selfHeal: true From a0bea8ceaa7aa42015aa4b5a7af25caee691648f Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:44:30 +0100 Subject: [PATCH 3/7] Use prod project name Co-authored-by: Samuel Jones --- apps/api-status/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api-status/development.yml b/apps/api-status/development.yml index 05b88bdb..6bab5028 100644 --- a/apps/api-status/development.yml +++ b/apps/api-status/development.yml @@ -4,7 +4,7 @@ metadata: name: blackbox-exporter namespace: argocd spec: - project: default + project: prod source: repoURL: https://prometheus-community.github.io/helm-charts chart: prometheus-blackbox-exporter From e460e569026d3299ddf287900b0b15b5b6c42e8a Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:45:46 +0100 Subject: [PATCH 4/7] Use prod Co-authored-by: Samuel Jones --- apps/api-status/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api-status/development.yml b/apps/api-status/development.yml index 6bab5028..348651a3 100644 --- a/apps/api-status/development.yml +++ b/apps/api-status/development.yml @@ -33,7 +33,7 @@ spec: - https://your-prod-api.company.com/health # Pending destination: - server: https://kubernetes.default.svc + name: prod namespace: monitoring syncPolicy: automated: From bfba069ee6dedc306c06be1f7c4a63ae853f04f1 Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:46:07 +0100 Subject: [PATCH 5/7] Use correct namespace Co-authored-by: Samuel Jones --- apps/api-status/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api-status/development.yml b/apps/api-status/development.yml index 348651a3..6becd19b 100644 --- a/apps/api-status/development.yml +++ b/apps/api-status/development.yml @@ -34,7 +34,7 @@ spec: destination: name: prod - namespace: monitoring + namespace: monitoring-system syncPolicy: automated: prune: true From 85eadfd5ec29435a4c5e480e3ce37b76f61b46c7 Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:50:06 +0100 Subject: [PATCH 6/7] Rename directory --- apps/{api-status => blackbox-exporter}/development.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename apps/{api-status => blackbox-exporter}/development.yml (100%) diff --git a/apps/api-status/development.yml b/apps/blackbox-exporter/development.yml similarity index 100% rename from apps/api-status/development.yml rename to apps/blackbox-exporter/development.yml From a4b225ba6397252a75258c4cefbbdc4b3e4fbbfb Mon Sep 17 00:00:00 2001 From: Samuel <47388695+Dagonite@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:23:52 +0100 Subject: [PATCH 7/7] Use relevant url Co-authored-by: Samuel Jones --- apps/blackbox-exporter/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/blackbox-exporter/development.yml b/apps/blackbox-exporter/development.yml index 6becd19b..8e052e49 100644 --- a/apps/blackbox-exporter/development.yml +++ b/apps/blackbox-exporter/development.yml @@ -30,7 +30,7 @@ spec: replacement: blackbox-exporter.monitoring.svc.cluster.local:9115 targets: - - https://your-prod-api.company.com/health # Pending + - https://reduce.isis.cclrc.ac.uk/fia/healthz # Pending destination: name: prod