Преглед на файлове

chore: rename the metric name

JianBo He преди 1 година
родител
ревизия
2bb595a212
променени са 2 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 3 3
      apps/emqx_prometheus/src/emqx_prometheus.erl
  2. 3 3
      apps/emqx_prometheus/test/emqx_prometheus_data_SUITE.erl

+ 3 - 3
apps/emqx_prometheus/src/emqx_prometheus.erl

@@ -500,7 +500,7 @@ emqx_collect(K = emqx_license_expiry_at, D) -> gauge_metric(?MG(K, D));
 %% Certs
 emqx_collect(K = emqx_cert_expiry_at, D) -> gauge_metrics(?MG(K, D));
 %% Cluster RPC
-emqx_collect(K = emqx_cluster_rpc_txid, D) -> gauge_metrics(?MG(K, D));
+emqx_collect(K = emqx_conf_sync_txid, D) -> gauge_metrics(?MG(K, D));
 %% Mria
 %% ========== core
 emqx_collect(K = emqx_mria_last_intercepted_trans, D) -> gauge_metrics(?MG(K, D, []));
@@ -1009,7 +1009,7 @@ not_after_epoch(_) ->
 %%========================================
 
 cluster_rpc_meta() ->
-    [{emqx_cluster_rpc_txid, gauge, undefined}].
+    [{emqx_conf_sync_txid, gauge, undefined}].
 
 %%========================================
 %% Mria
@@ -1042,7 +1042,7 @@ cluster_rpc_data(Mode) ->
         end,
     DataFun = fun() -> emqx_cluster_rpc:get_current_tnx_id() end,
     #{
-        emqx_cluster_rpc_txid => [{Labels, catch_all(DataFun)}]
+        emqx_conf_sync_txid => [{Labels, catch_all(DataFun)}]
     }.
 
 mria_data(Mode) ->

+ 3 - 3
apps/emqx_prometheus/test/emqx_prometheus_data_SUITE.erl

@@ -336,7 +336,7 @@ metric_meta(<<"emqx_vm_total_memory">>) -> ?meta(0, 1, 1);
 metric_meta(<<"emqx_vm_used_memory">>) -> ?meta(0, 1, 1);
 metric_meta(<<"emqx_cluster_nodes_running">>) -> ?meta(0, 1, 1);
 metric_meta(<<"emqx_cluster_nodes_stopped">>) -> ?meta(0, 1, 1);
-metric_meta(<<"emqx_cluster_rpc_txid">>) -> ?meta(0, 1, 1);
+metric_meta(<<"emqx_conf_sync_txid">>) -> ?meta(0, 1, 1);
 %% END
 metric_meta(<<"emqx_cert_expiry_at">>) -> ?meta(2, 2, 2);
 metric_meta(<<"emqx_license_expiry_at">>) -> ?meta(0, 0, 0);
@@ -648,7 +648,7 @@ assert_json_data__cluster_rpc(Ms, Mode) when
 ->
     ?assertMatch(
         #{
-            emqx_cluster_rpc_txid := _
+            emqx_conf_sync_txid := _
         },
         Ms
     );
@@ -657,7 +657,7 @@ assert_json_data__cluster_rpc(Ms, ?PROM_DATA_MODE__ALL_NODES_UNAGGREGATED) ->
         fun(M) ->
             ?assertMatch(
                 #{
-                    emqx_cluster_rpc_txid := _
+                    emqx_conf_sync_txid := _
                 },
                 M
             )