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

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

perf(prometheus): udpate the prometheus dep vsn
This commit is contained in:
JianBo He 2023-06-08 21:34:50 +08:00 committed by GitHub
parent 641166a67a dc01b7109e
commit 034caaf20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_prometheus/grafana_template/ErlangVM.json
View File

@ -1207,7 +1207,7 @@
"type": "prometheus", "type": "prometheus",
"uid": "${datasource}" "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", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "Run queue length", "legendFormat": "Run queue length",

2
apps/emqx_prometheus/rebar.config
View File

@ -3,7 +3,7 @@
{deps, [ {deps, [
{emqx, {path, "../emqx"}}, {emqx, {path, "../emqx"}},
{emqx_utils, {path, "../emqx_utils"}}, {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}]}. {edoc_opts, [{preprocess, true}]}.

3
apps/emqx_prometheus/src/emqx_prometheus_schema.erl
View File

@ -170,4 +170,7 @@ validate_push_gateway_server(Url) ->
%% for CI test, CI don't load the whole emqx_conf_schema. %% for CI test, CI don't load the whole emqx_conf_schema.
translation(Name) -> 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). emqx_conf_schema:translation(Name).

3
changes/ce/perf-10941.en.md Normal file
View File

@ -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`