Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(prometheus): Disable authorization for metrics scraping endpoint #8299

Merged
merged 1 commit into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES-5.0.md
@@ -0,0 +1,5 @@
# 5.0.1

## Enhancements

* Removed management API auth for prometheus scraping endpoint /api/v5/prometheus/stats [PR](https://github.com/emqx/emqx/pull/8299)
9 changes: 3 additions & 6 deletions apps/emqx_authn/src/emqx_authn.appup.src
@@ -1,8 +1,5 @@
%% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"0.1.0",
[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]},
zmstone marked this conversation as resolved.
Show resolved Hide resolved
{<<".*">>,[]}],
[{"0.1.0",
[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}]}.
[{"0.1.0",[{load_module,emqx_authn_utils,brutal_purge,soft_purge,[]}]}],
[{"0.1.0",[{load_module,emqx_authn_utils,brutal_purge,soft_purge,[]}]}]}.
11 changes: 5 additions & 6 deletions apps/emqx_authz/src/emqx_authz.appup.src
@@ -1,8 +1,7 @@
%% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"0.1.1",
[{load_module,emqx_authn_utils,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}],
[{"0.1.1",
[{load_module,emqx_authn_utils,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}]}.
[{"0.1.0",[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]},
{"0.1.1",[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]}],
ieQu1 marked this conversation as resolved.
Show resolved Hide resolved
[{"0.1.0",[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]},
{"0.1.1",[{load_module,emqx_authz_utils,brutal_purge,soft_purge,[]}]}]}.
2 changes: 1 addition & 1 deletion apps/emqx_prometheus/src/emqx_prometheus.app.src
Expand Up @@ -2,7 +2,7 @@
{application, emqx_prometheus, [
{description, "Prometheus for EMQX"},
% strict semver, bump manually!
{vsn, "5.0.0"},
{vsn, "5.0.1"},
{modules, []},
{registered, [emqx_prometheus_sup]},
{applications, [kernel, stdlib, prometheus, emqx]},
Expand Down
5 changes: 5 additions & 0 deletions apps/emqx_prometheus/src/emqx_prometheus.appup.src
@@ -0,0 +1,5 @@
%% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"5.0.0",[{load_module,emqx_prometheus_api,brutal_purge,soft_purge,[]}]}],
[{"5.0.0",[{load_module,emqx_prometheus_api,brutal_purge,soft_purge,[]}]}]}.
1 change: 1 addition & 0 deletions apps/emqx_prometheus/src/emqx_prometheus_api.erl
Expand Up @@ -67,6 +67,7 @@ schema("/prometheus/stats") ->
get =>
#{
description => <<"Get Prometheus Data">>,
security => [],
responses =>
#{200 => prometheus_data_schema()}
}
Expand Down
5 changes: 5 additions & 0 deletions scripts/update-appup.sh
Expand Up @@ -8,6 +8,11 @@
set -euo pipefail
set -x

[ -d _checkouts ] && {
echo "Checkouts directory has been found, the resulting appup files will be incorrect. Exiting."
exit 1
}

usage() {
echo "$0 PROFILE"
}
Expand Down
26 changes: 14 additions & 12 deletions scripts/update_appup.escript
Expand Up @@ -479,18 +479,20 @@ check_appup(App, Upgrade, Downgrade, OldUpgrade, OldDowngrade) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

render_appup(App, File, Up, Down) ->
IsCheck = getopt(check),
case do_read_appup(File) of
{ok, {U, D}} when U =:= Up andalso D =:= Down ->
ok;
{ok, {OldU, OldD}} when IsCheck ->
check_appup(App, Up, Down, OldU, OldD);
{ok, {_, _}} ->
do_render_appup(File, Up, Down);
{error, enoent} when IsCheck ->
%% failed to read old file, exit
log("ERROR: ~s is missing", [File]),
set_invalid()
case getopt(check) of
true ->
case do_read_appup(File) of
{ok, {U, D}} when U =:= Up andalso D =:= Down ->
ok;
{ok, {OldU, OldD}} ->
check_appup(App, Up, Down, OldU, OldD);
{error, enoent} ->
%% failed to read old file, exit
log("ERROR: ~s is missing", [File]),
set_invalid()
end;
false ->
do_render_appup(File, Up, Down)
end.

do_render_appup(File, Up, Down) ->
Expand Down