From 9e16f33c315a33d540e53bebc277a548ffaa3847 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Tue, 30 Jan 2024 18:15:29 +0800 Subject: [PATCH] test: `/prometheus/stats` endpoint format in json --- .../test/emqx_prometheus_SUITE.erl | 32 ++++++++++--------- .../test/emqx_prometheus_api_SUITE.erl | 15 +++++---- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl b/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl index 2d85f2a05..0e5e9c31e 100644 --- a/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl +++ b/apps/emqx_prometheus/test/emqx_prometheus_SUITE.erl @@ -22,21 +22,23 @@ -compile(nowarn_export_all). -compile(export_all). --define(LEGACY_CONF_DEFAULT, << - "prometheus {\n" - " push_gateway_server = \"http://127.0.0.1:9091\"\n" - " interval = \"1s\"\n" - " headers = { Authorization = \"some-authz-tokens\"}\n" - " job_name = \"${name}~${host}\"\n" - " enable = true\n" - " vm_dist_collector = disabled\n" - " mnesia_collector = disabled\n" - " vm_statistics_collector = disabled\n" - " vm_system_info_collector = disabled\n" - " vm_memory_collector = disabled\n" - " vm_msacc_collector = disabled\n" - "}\n" ->>). +-define(CLUSTER_RPC_SHARD, emqx_cluster_rpc_shard). +%% erlfmt-ignore +-define(LEGACY_CONF_DEFAULT, <<" +prometheus { + push_gateway_server = \"http://127.0.0.1:9091\" + interval = \"1s\" + headers = { Authorization = \"some-authz-tokens\"} + job_name = \"${name}~${host}\" + enable = true + vm_dist_collector = disabled + mnesia_collector = disabled + vm_statistics_collector = disabled + vm_system_info_collector = disabled + vm_memory_collector = disabled + vm_msacc_collector = disabled +} +">>). -define(CONF_DEFAULT, #{ <<"prometheus">> => diff --git a/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl b/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl index 79fd0ef91..134aa82a6 100644 --- a/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl +++ b/apps/emqx_prometheus/test/emqx_prometheus_api_SUITE.erl @@ -279,20 +279,23 @@ t_stats_no_auth_api(_) -> ok end, emqx_dashboard_listener:regenerate_minirest_dispatch(), - Json = [{"accept", "application/json"}], - request_stats(Json, []). + Headers = accept_josn_header(), + request_stats(Headers, []). t_stats_auth_api(_) -> {ok, _} = emqx:update_config([prometheus, enable_basic_auth], true), emqx_dashboard_listener:regenerate_minirest_dispatch(), Auth = emqx_mgmt_api_test_util:auth_header_(), - JsonAuth = [{"accept", "application/json"}, Auth], - request_stats(JsonAuth, Auth), + Headers = [Auth | accept_josn_header()], + request_stats(Headers, Auth), ok. -request_stats(JsonAuth, Auth) -> +accept_josn_header() -> + [{"accept", "application/json"}]. + +request_stats(Headers, Auth) -> Path = emqx_mgmt_api_test_util:api_path(["prometheus", "stats"]), - {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path, "", JsonAuth), + {ok, Response} = emqx_mgmt_api_test_util:request_api(get, Path, "", Headers), Data = emqx_utils_json:decode(Response, [return_maps]), ?assertMatch(#{<<"client">> := _, <<"delivery">> := _}, Data), {ok, _} = emqx_mgmt_api_test_util:request_api(get, Path, "", Auth),