From 0632d629cbd0448dbd4eb864e3787c39db9a8c9d Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Mon, 10 Jul 2023 16:32:29 +0800 Subject: [PATCH 1/3] fix: bad prometheus schema for headers --- apps/emqx_prometheus/src/emqx_prometheus.app.src | 2 +- apps/emqx_prometheus/src/emqx_prometheus_api.erl | 10 ++++------ apps/emqx_prometheus/src/emqx_prometheus_schema.erl | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 7252e4436..40a1bd498 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -2,7 +2,7 @@ {application, emqx_prometheus, [ {description, "Prometheus for EMQX"}, % strict semver, bump manually! - {vsn, "5.0.13"}, + {vsn, "5.0.14"}, {modules, []}, {registered, [emqx_prometheus_sup]}, {applications, [kernel, stdlib, prometheus, emqx, emqx_management]}, diff --git a/apps/emqx_prometheus/src/emqx_prometheus_api.erl b/apps/emqx_prometheus/src/emqx_prometheus_api.erl index c2bfaefc8..987386b61 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus_api.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus_api.erl @@ -130,10 +130,8 @@ prometheus_data_schema() -> description => <<"Get Prometheus Data. Note that support for JSON output is deprecated and will be removed in v5.2.">>, content => - #{ - 'application/json' => - #{schema => #{type => object}}, - 'text/plain' => - #{schema => #{type => string}} - } + [ + {'text/plain', #{schema => #{type => string}}}, + {'application/json', #{schema => #{type => object}}} + ] }. diff --git a/apps/emqx_prometheus/src/emqx_prometheus_schema.erl b/apps/emqx_prometheus/src/emqx_prometheus_schema.erl index 3300e8b28..3884f7065 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus_schema.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus_schema.erl @@ -59,7 +59,7 @@ fields("prometheus") -> ?HOCON( list({string(), string()}), #{ - default => [], + default => #{}, required => false, converter => fun ?MODULE:convert_headers/1, desc => ?DESC(headers) From 1b5d55cdbb3a965bbff6a2031b1483f3321b723c Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Mon, 10 Jul 2023 16:47:16 +0800 Subject: [PATCH 2/3] fix: delete bad link in emqx_prometheus --- apps/emqx_prometheus/src/emqx_prometheus.app.src | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 40a1bd498..e6ee145ff 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -11,7 +11,6 @@ {licenses, ["Apache-2.0"]}, {maintainers, ["EMQX Team "]}, {links, [ - {"Homepage", "https://emqx.io/"}, - {"Github", "https://github.com/emqx/emqx-prometheus"} + {"Homepage", "https://emqx.io/"} ]} ]}. From dc32822f6f0eb85f57d6c302bca0e2ae2af4bef0 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Mon, 10 Jul 2023 16:51:31 +0800 Subject: [PATCH 3/3] chore: add changelog for 11237 --- changes/ce/fix-11237.en.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/ce/fix-11237.en.md diff --git a/changes/ce/fix-11237.en.md b/changes/ce/fix-11237.en.md new file mode 100644 index 000000000..d6220040e --- /dev/null +++ b/changes/ce/fix-11237.en.md @@ -0,0 +1 @@ +The `headers` default value in /prometheus API should be a map instead of a list.