diff --git a/apps/emqx_prometheus/rebar.config b/apps/emqx_prometheus/rebar.config index 649437765..578881d71 100644 --- a/apps/emqx_prometheus/rebar.config +++ b/apps/emqx_prometheus/rebar.config @@ -4,6 +4,7 @@ {emqx, {path, "../emqx"}}, {emqx_utils, {path, "../emqx_utils"}}, {emqx_auth, {path, "../emqx_auth"}}, + {emqx_resource, {path, "../emqx_resource"}}, {prometheus, {git, "https://github.com/emqx/prometheus.erl", {tag, "v4.10.0.2"}}} ]}. diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 75c608087..9e9952d6c 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -5,7 +5,7 @@ {vsn, "5.0.19"}, {modules, []}, {registered, [emqx_prometheus_sup]}, - {applications, [kernel, stdlib, prometheus, emqx, emqx_auth, emqx_management]}, + {applications, [kernel, stdlib, prometheus, emqx, emqx_auth, emqx_resource, emqx_management]}, {mod, {emqx_prometheus_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_prometheus/src/emqx_prometheus_cluster.erl b/apps/emqx_prometheus/src/emqx_prometheus_cluster.erl index 02209be22..c4f1dc3b8 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus_cluster.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus_cluster.erl @@ -16,6 +16,7 @@ -module(emqx_prometheus_cluster). -include("emqx_prometheus.hrl"). +-include_lib("emqx_resource/include/emqx_resource.hrl"). -export([ raw_data/2, @@ -194,11 +195,11 @@ logic_sum(_, _) -> boolean_to_number(true) -> 1; boolean_to_number(false) -> 0. -status_to_number(connected) -> 1; -%% for auth -status_to_number(stopped) -> 0; -%% for data_integration -status_to_number(disconnected) -> 0. +status_to_number(?status_connected) -> 1; +status_to_number(?status_connecting) -> 0; +status_to_number(?status_disconnected) -> 0; +status_to_number(?rm_status_stopped) -> 0; +status_to_number(_) -> 0. metric_names(MetricWithType) when is_list(MetricWithType) -> [Name || {Name, _Type} <- MetricWithType].