From 9cd32f3cc7029720156add0b22840dec2a2770bd Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Wed, 15 Feb 2023 13:54:56 +0530 Subject: [PATCH 1/2] Move Prometheus path to `/api/v1/metrics` --- server/src/main.rs | 4 ++++ server/src/metrics/mod.rs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/main.rs b/server/src/main.rs index 18174dc5c..791dbff89 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -363,6 +363,10 @@ fn ingest_path() -> String { "/ingest".to_string() } +pub fn metrics_path() -> String { + format!("{}/metrics", base_path()) +} + fn alert_path(stream_name: &str) -> String { format!("{}/alert", logstream_path(stream_name)) } diff --git a/server/src/metrics/mod.rs b/server/src/metrics/mod.rs index 3ef884b28..4376c8463 100644 --- a/server/src/metrics/mod.rs +++ b/server/src/metrics/mod.rs @@ -22,7 +22,7 @@ use actix_web_prometheus::{PrometheusMetrics, PrometheusMetricsBuilder}; use lazy_static::lazy_static; use prometheus::{HistogramOpts, HistogramVec, IntCounterVec, IntGaugeVec, Opts, Registry}; -use crate::metadata::STREAM_INFO; +use crate::{metadata::STREAM_INFO, metrics_path}; pub const METRICS_NAMESPACE: &str = env!("CARGO_PKG_NAME"); @@ -87,7 +87,7 @@ pub fn build_metrics_handler() -> PrometheusMetrics { let prometheus = PrometheusMetricsBuilder::new(METRICS_NAMESPACE) .registry(registry) - .endpoint("/metrics") + .endpoint(metrics_path().as_str()) .build() .expect("Prometheus initialization"); From 955e98871a2cf328ef4ac56f8a1cec19587d1f6d Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Wed, 15 Feb 2023 13:58:24 +0530 Subject: [PATCH 2/2] fmt fix --- server/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main.rs b/server/src/main.rs index 791dbff89..3c260a803 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -364,7 +364,7 @@ fn ingest_path() -> String { } pub fn metrics_path() -> String { - format!("{}/metrics", base_path()) + format!("{}/metrics", base_path()) } fn alert_path(stream_name: &str) -> String {