From 78cb013a397be1710d82e8b7f08cbbcf81a8c639 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Wed, 28 Sep 2022 13:33:17 +0200 Subject: [PATCH] Rename prometheus remote logging metric, as suggested by @wojas --- pdns/rec_channel_rec.cc | 4 ++-- pdns/recursordist/rec-main.cc | 2 +- pdns/ws-recursor.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc index 075f505837..149f68606b 100644 --- a/pdns/rec_channel_rec.cc +++ b/pdns/rec_channel_rec.cc @@ -1563,8 +1563,8 @@ static void registerAllStats1() addGetStat("auth-rcode-answers", []() { return toAuthRCodeStatsMap("auth-rcode-answers", g_stats.authRCode); }); - addGetStat("remote-logger", []() { - return toRemoteLoggerStatsMap("remote-logger"); + addGetStat("remote-logger-count", []() { + return toRemoteLoggerStatsMap("remote-logger-count"); }); } diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index ba51c19a76..730e7bc728 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -2771,7 +2771,7 @@ int main(int argc, char** argv) for (size_t idx = 0; idx < 128; idx++) { defaultAPIDisabledStats += ", ecs-v6-response-bits-" + std::to_string(idx + 1); } - std::string defaultDisabledStats = defaultAPIDisabledStats + ", cumul-clientanswers, cumul-authanswers, policy-hits, proxy-mapping-total, remote-logger"; + std::string defaultDisabledStats = defaultAPIDisabledStats + ", cumul-clientanswers, cumul-authanswers, policy-hits, proxy-mapping-total, remote-logger-count"; ::arg().set("stats-api-blacklist", "List of statistics that are disabled when retrieving the complete list of statistics via the API (deprecated)") = defaultAPIDisabledStats; ::arg().set("stats-carbon-blacklist", "List of statistics that are prevented from being exported via Carbon (deprecated)") = defaultDisabledStats; diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc index d1f7604136..fbc971e5b7 100644 --- a/pdns/ws-recursor.cc +++ b/pdns/ws-recursor.cc @@ -1161,7 +1161,7 @@ const std::map MetricDefinitionStorage::d_metrics "Count of RCodes returned by authoritative servers")}, // For multicounters, state the first - {"remote-logger-o-0", + {"remote-logger-count-o-0", MetricDefinition(PrometheusMetricType::multicounter, "Number of remote logging events")}, }; -- 2.47.2