From 7783d612257c5abaf8b1822751e926ed22925d95 Mon Sep 17 00:00:00 2001 From: vprashar2929 Date: Sun, 1 Dec 2024 19:08:36 +0530 Subject: [PATCH] feat(compose): add fallback scrape protocol for Scaphandre service This update modifies the Prometheus scrape config for the Scaphandre service to use the fallback scrape protocol * Resolving an issue where Prometheus `latest` was unable to scrape Scaphandre service due to invalid `Content-Type` header in response * Switch Prometheus to use `latest` Signed-off-by: vprashar2929 --- manifests/compose/dev/prometheus/scrape-configs/dev.yaml | 2 ++ manifests/compose/monitoring/prometheus/Dockerfile | 2 +- .../validation/metal/prometheus/scrape-configs/metal.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/compose/dev/prometheus/scrape-configs/dev.yaml b/manifests/compose/dev/prometheus/scrape-configs/dev.yaml index b8d34a85e8..01d271ccc1 100644 --- a/manifests/compose/dev/prometheus/scrape-configs/dev.yaml +++ b/manifests/compose/dev/prometheus/scrape-configs/dev.yaml @@ -6,6 +6,8 @@ scrape_configs: - job_name: scaphandre static_configs: - targets: [scaphandre:8080] + scheme: http + fallback_scrape_protocol: PrometheusText1.0.0 - job_name: node-exporter static_configs: diff --git a/manifests/compose/monitoring/prometheus/Dockerfile b/manifests/compose/monitoring/prometheus/Dockerfile index 68e3e398c1..99c3a7c392 100644 --- a/manifests/compose/monitoring/prometheus/Dockerfile +++ b/manifests/compose/monitoring/prometheus/Dockerfile @@ -1,3 +1,3 @@ -FROM quay.io/prometheus/prometheus:v2.55.0 +FROM quay.io/prometheus/prometheus:latest COPY /prometheus.yml /etc/prometheus/prometheus.yml diff --git a/manifests/compose/validation/metal/prometheus/scrape-configs/metal.yaml b/manifests/compose/validation/metal/prometheus/scrape-configs/metal.yaml index fcbcb6f99d..0f0280c14f 100644 --- a/manifests/compose/validation/metal/prometheus/scrape-configs/metal.yaml +++ b/manifests/compose/validation/metal/prometheus/scrape-configs/metal.yaml @@ -6,6 +6,8 @@ scrape_configs: - job_name: scaphandre static_configs: - targets: [scaphandre:8080] + scheme: http + fallback_scrape_protocol: PrometheusText1.0.0 - job_name: metal static_configs: