Rename prometheus remote logging metric, as suggested by @wojas

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 075f505837d459172b562c0a4eb8ebf76324805a..149f68606ba7a318f726af94a22cb88b3b9412c8 100644 (file)
--- 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 ba51c19a76e37a027cc1df8b6bfd4a409f5d6725..730e7bc72827fce7643b047e28f772a4eefe1347 100644 (file)
--- 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 d1f76041365abb2a74678bc1812f814472e154d0..fbc971e5b72707cf42b8038ea7f6fbfd604c576d 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -1161,7 +1161,7 @@ const std::map<std::string, MetricDefinition> 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")},
 };