yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: `shared_subscriptions` is cluster consistented

This commit is contained in:
JimMoen 2024-03-15 12:57:01 +08:00
parent 3f93780d8c
commit e56bee618b
No known key found for this signature in database
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_dashboard/src/emqx_dashboard_monitor.erl
View File

@ -264,6 +264,8 @@ merge_cluster_rate(Node, Cluster) ->
NCluster#{topics => V}; NCluster#{topics => V};
(retained_msg_count, V, NCluster) -> (retained_msg_count, V, NCluster) ->
NCluster#{retained_msg_count => V}; NCluster#{retained_msg_count => V};
(shared_subscriptions, V, NCluster) ->
NCluster#{shared_subscriptions => V};
(license_quota, V, NCluster) -> (license_quota, V, NCluster) ->
NCluster#{license_quota => V}; NCluster#{license_quota => V};
%% for cluster sample, ignore node_uptime %% for cluster sample, ignore node_uptime

7
apps/emqx_prometheus/src/emqx_prometheus.erl
View File

@ -511,8 +511,6 @@ stats_metric_meta() ->
{emqx_subscribers_max, gauge, 'subscribers.max'}, {emqx_subscribers_max, gauge, 'subscribers.max'},
{emqx_subscriptions_count, gauge, 'subscriptions.count'}, {emqx_subscriptions_count, gauge, 'subscriptions.count'},
{emqx_subscriptions_max, gauge, 'subscriptions.max'}, {emqx_subscriptions_max, gauge, 'subscriptions.max'},
{emqx_subscriptions_shared_count, gauge, 'subscriptions.shared.count'},
{emqx_subscriptions_shared_max, gauge, 'subscriptions.shared.max'},
%% delayed %% delayed
{emqx_delayed_count, gauge, 'delayed.count'}, {emqx_delayed_count, gauge, 'delayed.count'},
{emqx_delayed_max, gauge, 'delayed.max'} {emqx_delayed_max, gauge, 'delayed.max'}
@ -525,7 +523,10 @@ stats_metric_cluster_consistened_meta() ->
{emqx_topics_count, gauge, 'topics.count'}, {emqx_topics_count, gauge, 'topics.count'},
%% retained %% retained
{emqx_retained_count, gauge, 'retained.count'}, {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) -> stats_data(Mode) ->