ソースを参照

Merge pull request #10941 from HJianBo/enhance-prometheus-sampe-perf

perf(prometheus): udpate the prometheus dep vsn
JianBo He 2 年 前
コミット
034caaf20f

+ 1 - 1
apps/emqx_prometheus/grafana_template/ErlangVM.json

@@ -1207,7 +1207,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "erlang_vm_statistics_run_queues_length_total{job=~\"$job\", instance=\"$instance\"}",
+          "expr": "erlang_vm_statistics_run_queues_length{job=~\"$job\", instance=\"$instance\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Run queue length",

+ 1 - 1
apps/emqx_prometheus/rebar.config

@@ -3,7 +3,7 @@
 {deps, [
     {emqx, {path, "../emqx"}},
     {emqx_utils, {path, "../emqx_utils"}},
-    {prometheus, {git, "https://github.com/deadtrickster/prometheus.erl", {tag, "v4.8.1"}}}
+    {prometheus, {git, "https://github.com/emqx/prometheus.erl", {tag, "v4.10.0.1"}}}
 ]}.
 
 {edoc_opts, [{preprocess, true}]}.

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

@@ -170,4 +170,7 @@ validate_push_gateway_server(Url) ->
 
 %% for CI test, CI don't load the whole emqx_conf_schema.
 translation(Name) ->
+    %% translate 'vm_dist_collector', 'mnesia_collector', 'vm_statistics_collector',
+    %% 'vm_system_info_collector', 'vm_memory_collector', 'vm_msacc_collector'
+    %% to prometheus envrionments
     emqx_conf_schema:translation(Name).

+ 3 - 0
changes/ce/perf-10941.en.md

@@ -0,0 +1,3 @@
+Improve the collection speed of Prometheus metrics when setting
+`prometheus.vm_dist_collector=disabled` and
+metric `erlang_vm_statistics_run_queues_length_total` is renamed to `erlang_vm_statistics_run_queues_length`