From 19c2288a4b3537d654163124292d41ab4ac28f74 Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Tue, 7 Feb 2023 15:42:55 +0100 Subject: [PATCH 1/3] feat(emqx_prometheus): expose live_connections stats to prometheus --- apps/emqx_prometheus/src/emqx_prometheus.erl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl index a66f275f8..4712a43c8 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus.erl @@ -219,6 +219,10 @@ emqx_collect(emqx_connections_count, Stats) -> gauge_metric(?C('connections.count', Stats)); emqx_collect(emqx_connections_max, Stats) -> gauge_metric(?C('connections.max', Stats)); +emqx_collect(emqx_live_connections_count, Stats) -> + gauge_metric(?C('live_connections.count', Stats)); +emqx_collect(emqx_live_connections_max, Stats) -> + gauge_metric(?C('live_connections.max', Stats)); %% sessions emqx_collect(emqx_sessions_count, Stats) -> gauge_metric(?C('sessions.count', Stats)); @@ -460,6 +464,8 @@ emqx_stats() -> [ emqx_connections_count, emqx_connections_max, + emqx_live_connections_count, + emqx_live_connections_max, emqx_sessions_count, emqx_sessions_max, emqx_topics_count, From 784ec0c0a524f76211f31aac60324bc479bf636a Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Tue, 7 Feb 2023 15:53:40 +0100 Subject: [PATCH 2/3] chore: bump VSN --- apps/emqx_prometheus/src/emqx_prometheus.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 31f8cbfaf..013de63fb 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -2,7 +2,7 @@ {application, emqx_prometheus, [ {description, "Prometheus for EMQX"}, % strict semver, bump manually! - {vsn, "5.0.4"}, + {vsn, "5.0.5"}, {modules, []}, {registered, [emqx_prometheus_sup]}, {applications, [kernel, stdlib, prometheus, emqx]}, From 06df3a912632b8644c487ba84ca7a446a5ec57f4 Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Tue, 7 Feb 2023 15:47:41 +0100 Subject: [PATCH 3/3] chore: add changes --- changes/v5.0.17/feat-9930.en.md | 1 + changes/v5.0.17/feat-9930.zh.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 changes/v5.0.17/feat-9930.en.md create mode 100644 changes/v5.0.17/feat-9930.zh.md diff --git a/changes/v5.0.17/feat-9930.en.md b/changes/v5.0.17/feat-9930.en.md new file mode 100644 index 000000000..1747bb23e --- /dev/null +++ b/changes/v5.0.17/feat-9930.en.md @@ -0,0 +1 @@ +Expose the stats `live_connections.count` and `live_connections.max` to Prometheus. diff --git a/changes/v5.0.17/feat-9930.zh.md b/changes/v5.0.17/feat-9930.zh.md new file mode 100644 index 000000000..d17c1cf68 --- /dev/null +++ b/changes/v5.0.17/feat-9930.zh.md @@ -0,0 +1 @@ +将统计数据 `live_connections.count` 和 `live_connections.max` 公开给 Prometheus.