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

Merge pull request #12402 from JimMoen/fix-prom-function-clause 

fix(prom_stats): merge cl_consistented data into per nodes data
This commit is contained in:
JianBo He 2024-01-26 15:06:49 +08:00 committed by GitHub
parent e29a80d568 308cde53b9
commit cb8c84098e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,9 @@ collect_mf(_Registry, _Callback) ->
collect(<<"json">>) ->
RawData = emqx_prometheus_cluster:raw_data(?MODULE, ?GET_PROM_DATA_MODE()),
(maybe_license_collect_json_data(RawData))#{
stats => collect_stats_json_data(RawData),
stats => collect_stats_json_data(
?MG(stats_data, RawData), ?MG(stats_data_cluster_consistented, RawData)
),
metrics => collect_vm_json_data(?MG(vm_data, RawData)),
packets => collect_json_data(?MG(emqx_packet_data, RawData)),
messages => collect_json_data(?MG(emqx_message_data, RawData)),
@ -986,11 +988,15 @@ catch_all(DataFun) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% merge / zip formatting funcs for type `application/json`
collect_stats_json_data(RawData) ->
StatsData = ?MG(stats_data, RawData),
StatsClData = ?MG(stats_data_cluster_consistented, RawData),
D = maps:merge(StatsData, StatsClData),
collect_json_data(D).
collect_stats_json_data(StatsData, StatsClData) ->
StatsDatas = collect_json_data_(StatsData),
CLData = hd(collect_json_data_(StatsClData)),
lists:map(
fun(NodeData) ->
maps:merge(NodeData, CLData)
end,
StatsDatas
).
%% always return json array
collect_cert_json_data(Data) ->