From e56bee618b438a32dc52cf9eeae9085f558f8c66 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 15 Mar 2024 12:57:01 +0800 Subject: [PATCH] fix: `shared_subscriptions` is cluster consistented --- apps/emqx_dashboard/src/emqx_dashboard_monitor.erl | 2 ++ apps/emqx_prometheus/src/emqx_prometheus.erl | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl b/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl index cfbec3eb8..b136742d0 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_monitor.erl @@ -264,6 +264,8 @@ merge_cluster_rate(Node, Cluster) -> NCluster#{topics => V}; (retained_msg_count, V, NCluster) -> NCluster#{retained_msg_count => V}; + (shared_subscriptions, V, NCluster) -> + NCluster#{shared_subscriptions => V}; (license_quota, V, NCluster) -> NCluster#{license_quota => V}; %% for cluster sample, ignore node_uptime diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl index b2aca37b6..9782fe242 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus.erl @@ -511,8 +511,6 @@ stats_metric_meta() -> {emqx_subscribers_max, gauge, 'subscribers.max'}, {emqx_subscriptions_count, gauge, 'subscriptions.count'}, {emqx_subscriptions_max, gauge, 'subscriptions.max'}, - {emqx_subscriptions_shared_count, gauge, 'subscriptions.shared.count'}, - {emqx_subscriptions_shared_max, gauge, 'subscriptions.shared.max'}, %% delayed {emqx_delayed_count, gauge, 'delayed.count'}, {emqx_delayed_max, gauge, 'delayed.max'} @@ -525,7 +523,10 @@ stats_metric_cluster_consistened_meta() -> {emqx_topics_count, gauge, 'topics.count'}, %% retained {emqx_retained_count, gauge, 'retained.count'}, - {emqx_retained_max, gauge, 'retained.max'} + {emqx_retained_max, gauge, 'retained.max'}, + %% shared subscriptions + {emqx_subscriptions_shared_count, gauge, 'subscriptions.shared.count'}, + {emqx_subscriptions_shared_max, gauge, 'subscriptions.shared.max'} ]. stats_data(Mode) ->