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

chore: namespace metrics by type

This commit is contained in:
Thales Macedo Garitezi 2024-07-25 11:17:29 -03:00
parent 87e4e2340d
commit 30259284d1
2 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/emqx_cluster_link/src/emqx_cluster_link_api.erl
View File

@ -288,21 +288,24 @@ format_metrics(Node, RouterMetrics, ResourceMetrics) ->
#{ #{
node => Node, node => Node,
metrics => #{ metrics => #{
?route_metric => Routes, router => #{
?route_metric => Routes
},
forwarding => #{
'matched' => Get([counters, 'matched'], ResourceMetrics),
'success' => Get([counters, 'success'], ResourceMetrics),
'failed' => Get([counters, 'failed'], ResourceMetrics),
'dropped' => Get([counters, 'dropped'], ResourceMetrics),
'retried' => Get([counters, 'retried'], ResourceMetrics),
'received' => Get([counters, 'received'], ResourceMetrics),
'matched' => Get([counters, 'matched'], ResourceMetrics), 'queuing' => Get([gauges, 'queuing'], ResourceMetrics),
'success' => Get([counters, 'success'], ResourceMetrics), 'inflight' => Get([gauges, 'inflight'], ResourceMetrics),
'failed' => Get([counters, 'failed'], ResourceMetrics),
'dropped' => Get([counters, 'dropped'], ResourceMetrics),
'retried' => Get([counters, 'retried'], ResourceMetrics),
'received' => Get([counters, 'received'], ResourceMetrics),
'queuing' => Get([gauges, 'queuing'], ResourceMetrics), 'rate' => Get([rate, 'matched', current], ResourceMetrics),
'inflight' => Get([gauges, 'inflight'], ResourceMetrics), 'rate_last5m' => Get([rate, 'matched', last5m], ResourceMetrics),
'rate_max' => Get([rate, 'matched', max], ResourceMetrics)
'rate' => Get([rate, 'matched', current], ResourceMetrics), }
'rate_last5m' => Get([rate, 'matched', last5m], ResourceMetrics),
'rate_max' => Get([rate, 'matched', max], ResourceMetrics)
} }
}. }.

120
apps/emqx_cluster_link/test/emqx_cluster_link_api_SUITE.erl
View File

@ -478,52 +478,64 @@ t_metrics(Config) ->
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{ <<"metrics">> := #{
<<"routes">> := 0, <<"router">> := #{
<<"matched">> := _, <<"routes">> := 0
<<"success">> := _, },
<<"failed">> := _, <<"forwarding">> := #{
<<"dropped">> := _, <<"matched">> := _,
<<"retried">> := _, <<"success">> := _,
<<"received">> := _, <<"failed">> := _,
<<"queuing">> := _, <<"dropped">> := _,
<<"inflight">> := _, <<"retried">> := _,
<<"rate">> := _, <<"received">> := _,
<<"rate_last5m">> := _, <<"queuing">> := _,
<<"rate_max">> := _ <<"inflight">> := _,
<<"rate">> := _,
<<"rate_last5m">> := _,
<<"rate_max">> := _
}
}, },
<<"node_metrics">> := [ <<"node_metrics">> := [
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{ <<"metrics">> := #{
<<"routes">> := 0, <<"router">> := #{
<<"matched">> := _, <<"routes">> := 0
<<"success">> := _, },
<<"failed">> := _, <<"forwarding">> := #{
<<"dropped">> := _, <<"matched">> := _,
<<"retried">> := _, <<"success">> := _,
<<"received">> := _, <<"failed">> := _,
<<"queuing">> := _, <<"dropped">> := _,
<<"inflight">> := _, <<"retried">> := _,
<<"rate">> := _, <<"received">> := _,
<<"rate_last5m">> := _, <<"queuing">> := _,
<<"rate_max">> := _ <<"inflight">> := _,
<<"rate">> := _,
<<"rate_last5m">> := _,
<<"rate_max">> := _
}
} }
}, },
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{ <<"metrics">> := #{
<<"routes">> := 0, <<"router">> := #{
<<"matched">> := _, <<"routes">> := 0
<<"success">> := _, },
<<"failed">> := _, <<"forwarding">> := #{
<<"dropped">> := _, <<"matched">> := _,
<<"retried">> := _, <<"success">> := _,
<<"received">> := _, <<"failed">> := _,
<<"queuing">> := _, <<"dropped">> := _,
<<"inflight">> := _, <<"retried">> := _,
<<"rate">> := _, <<"received">> := _,
<<"rate_last5m">> := _, <<"queuing">> := _,
<<"rate_max">> := _ <<"inflight">> := _,
<<"rate">> := _,
<<"rate_last5m">> := _,
<<"rate_max">> := _
}
} }
} }
] ]
@ -532,15 +544,15 @@ t_metrics(Config) ->
), ),
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 0}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}},
<<"node_metrics">> := [ <<"node_metrics">> := [
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
}, },
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
} }
] ]
}}, }},
@ -556,15 +568,15 @@ t_metrics(Config) ->
%% cluster. %% cluster.
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 0}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}},
<<"node_metrics">> := [ <<"node_metrics">> := [
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
}, },
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
} }
] ]
}}, }},
@ -572,15 +584,15 @@ t_metrics(Config) ->
), ),
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 0}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}},
<<"node_metrics">> := [ <<"node_metrics">> := [
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
}, },
#{ #{
<<"node">> := _, <<"node">> := _,
<<"metrics">> := #{<<"routes">> := 0} <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}}
} }
] ]
}}, }},
@ -608,10 +620,10 @@ t_metrics(Config) ->
10, 10,
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 4}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 4}},
<<"node_metrics">> := [ <<"node_metrics">> := [
#{<<"metrics">> := #{<<"routes">> := 2}}, #{<<"metrics">> := #{<<"router">> := #{<<"routes">> := 2}}},
#{<<"metrics">> := #{<<"routes">> := 2}} #{<<"metrics">> := #{<<"router">> := #{<<"routes">> := 2}}}
] ]
}}, }},
get_metrics(source, SourceName) get_metrics(source, SourceName)
@ -619,7 +631,7 @@ t_metrics(Config) ->
), ),
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 0}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}},
<<"node_metrics">> := _ <<"node_metrics">> := _
}}, }},
get_metrics(target, TargetName) get_metrics(target, TargetName)
@ -640,10 +652,10 @@ t_metrics(Config) ->
10, 10,
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 2}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 2}},
<<"node_metrics">> := [ <<"node_metrics">> := [
#{<<"metrics">> := #{<<"routes">> := 1}}, #{<<"metrics">> := #{<<"router">> := #{<<"routes">> := 1}}},
#{<<"metrics">> := #{<<"routes">> := 1}} #{<<"metrics">> := #{<<"router">> := #{<<"routes">> := 1}}}
] ]
}}, }},
get_metrics(source, SourceName) get_metrics(source, SourceName)
@ -678,7 +690,7 @@ t_metrics(Config) ->
10, 10,
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 0}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 0}},
<<"node_metrics">> := _ <<"node_metrics">> := _
}}, }},
get_metrics(source, SourceName) get_metrics(source, SourceName)
@ -700,7 +712,7 @@ t_metrics(Config) ->
10, 10,
?assertMatch( ?assertMatch(
{200, #{ {200, #{
<<"metrics">> := #{<<"routes">> := 2}, <<"metrics">> := #{<<"router">> := #{<<"routes">> := 2}},
<<"node_metrics">> := _ <<"node_metrics">> := _
}}, }},
get_metrics(source, SourceName) get_metrics(source, SourceName)