Removed main from all Prometheus metric names

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index 755a0f07403cab33c27111527678d7b61549f14e..1aa7e6457fd3f228830f245b3dcdf6fbdf949e5c 100644 (file)
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -395,7 +395,7 @@ static void connectionThread(int sock, ComboAddress remote, string password, str
           std::string metricName = std::get<0>(e);
 
           // Prometheus suggest using '_' instead of '-'
-          std::string prometheusMetricName = "dnsdist_main_" + boost::replace_all_copy(metricName, "-", "_");
+          std::string prometheusMetricName = "dnsdist_" + boost::replace_all_copy(metricName, "-", "_");
 
           MetricDefinition metricDetails; 
 
@@ -427,7 +427,7 @@ static void connectionThread(int sock, ComboAddress remote, string password, str
         }
 
         auto states = g_dstates.getLocal();
-        const string statesbase = "dnsdist_main_servers_";
+        const string statesbase = "dnsdist_servers_";
         
         for (const auto& state : *states) {
           string serverName;
@@ -457,7 +457,7 @@ static void connectionThread(int sock, ComboAddress remote, string password, str
           boost::replace_all(frontName, ".", "_");
           string proto = (front->udpFD >= 0 ? "udp" : "tcp");
 
-          output << "dnsdist_main_frontend_queries{frontend=\"" << frontName << "\",proto=\"" << proto
+          output << "dnsdist_frontend_queries{frontend=\"" << frontName << "\",proto=\"" << proto
               << "\"} " << front->queries.load() << "\n";
         }
 
@@ -473,7 +473,7 @@ static void connectionThread(int sock, ComboAddress remote, string password, str
           }
           const string label = "{pool=\"" + poolName + "\"}";
           const std::shared_ptr<ServerPool> pool = entry.second;
-          output << "dnsdist_main_pools_servers" << label << " " << pool->countServers(false) << "\n";
+          output << "dnsdist_pools_servers" << label << " " << pool->countServers(false) << "\n";
 
           if (pool->packetCache != nullptr) {
             const auto& cache = pool->packetCache;

diff --git a/pdns/dnsdistdist/docs/guides/webserver.rst b/pdns/dnsdistdist/docs/guides/webserver.rst
index 989fb4422359d7533a3b1ba81f5ca325e484c646..6d666217a945a680bd4397ed2b9fd1a7d99d2730 100644 (file)
--- a/pdns/dnsdistdist/docs/guides/webserver.rst
+++ b/pdns/dnsdistdist/docs/guides/webserver.rst
@@ -121,147 +121,141 @@ URL Endpoints
       X-Permitted-Cross-Domain-Policies: none
       X-Xss-Protection: 1; mode=block
 
-
-      # HELP dnsdist_main_responses Number of responses received from backends
-      # TYPE dnsdist_main_responses counter
-      dnsdist_main_responses 0
-      # HELP dnsdist_main_servfail_responses Number of SERVFAIL answers received from backends
-      # TYPE dnsdist_main_servfail_responses counter
-      dnsdist_main_servfail_responses 0
-      # HELP dnsdist_main_queries Number of received queries
-      # TYPE dnsdist_main_queries counter
-      dnsdist_main_queries 0
-      # HELP dnsdist_main_acl_drops Number of packets dropped because of the ACL
-      # TYPE dnsdist_main_acl_drops counter
-      dnsdist_main_acl_drops 0
-      # HELP dnsdist_main_rule_drop Number of queries dropped because of a rule
-      # TYPE dnsdist_main_rule_drop counter
-      dnsdist_main_rule_drop 0
-      # HELP dnsdist_main_rule_nxdomain Number of NXDomain answers returned because of a rule
-      # TYPE dnsdist_main_rule_nxdomain counter
-      dnsdist_main_rule_nxdomain 0
-      # HELP dnsdist_main_rule_refused Number of Refused answers returned because of a rule
-      # TYPE dnsdist_main_rule_refused counter
-      dnsdist_main_rule_refused 0
-      # HELP dnsdist_main_rule_servfail Number of SERVFAIL answers received because of a rule
-      # TYPE dnsdist_main_rule_servfail counter
-      dnsdist_main_rule_servfail 0
-      # HELP dnsdist_main_self_answered Number of self-answered responses
-      # TYPE dnsdist_main_self_answered counter
-      dnsdist_main_self_answered 0
-      # HELP dnsdist_main_downstream_timeouts Number of queries not answered in time by a backend
-      # TYPE dnsdist_main_downstream_timeouts counter
-      dnsdist_main_downstream_timeouts 0
-      # HELP dnsdist_main_downstream_send_errors Number of errors when sending a query to a backend
-      # TYPE dnsdist_main_downstream_send_errors counter
-      dnsdist_main_downstream_send_errors 0
-      # HELP dnsdist_main_trunc_failures Number of errors encountered while truncating an answer
-      # TYPE dnsdist_main_trunc_failures counter
-      dnsdist_main_trunc_failures 0
-      # HELP dnsdist_main_no_policy Number of queries dropped because no server was available
-      # TYPE dnsdist_main_no_policy counter
-      dnsdist_main_no_policy 0
-      # HELP dnsdist_main_latency0_1 Number of queries answered in less than 1ms
-      # TYPE dnsdist_main_latency0_1 counter
-      dnsdist_main_latency0_1 0
-      # HELP dnsdist_main_latency1_10 Number of queries answered in 1-10 ms
-      # TYPE dnsdist_main_latency1_10 counter
-      dnsdist_main_latency1_10 0
-      # HELP dnsdist_main_latency10_50 Number of queries answered in 10-50 ms
-      # TYPE dnsdist_main_latency10_50 counter
-      dnsdist_main_latency10_50 0
-      # HELP dnsdist_main_latency50_100 Number of queries answered in 50-100 ms
-      # TYPE dnsdist_main_latency50_100 counter
-      dnsdist_main_latency50_100 0
-      # HELP dnsdist_main_latency100_1000 Number of queries answered in 100-1000 ms
-      # TYPE dnsdist_main_latency100_1000 counter
-      dnsdist_main_latency100_1000 0
-      # HELP dnsdist_main_latency_slow Number of queries answered in more than 1 second
-      # TYPE dnsdist_main_latency_slow counter
-      dnsdist_main_latency_slow 0
-      # HELP dnsdist_main_latency_avg100 Average response latency in microseconds of the last 100 packets
-      # TYPE dnsdist_main_latency_avg100 gauge
-      dnsdist_main_latency_avg100 0
-      # HELP dnsdist_main_latency_avg1000 Average response latency in microseconds of the last 1000 packets
-      # TYPE dnsdist_main_latency_avg1000 gauge
-      dnsdist_main_latency_avg1000 0
-      # HELP dnsdist_main_latency_avg10000 Average response latency in microseconds of the last 10000 packets
-      # TYPE dnsdist_main_latency_avg10000 gauge
-      dnsdist_main_latency_avg10000 0
-      # HELP dnsdist_main_latency_avg1000000 Average response latency in microseconds of the last 1000000 packets
-      # TYPE dnsdist_main_latency_avg1000000 gauge
-      dnsdist_main_latency_avg1000000 0
-      # HELP dnsdist_main_uptime Uptime of the dnsdist process in seconds
-      # TYPE dnsdist_main_uptime gauge
-      dnsdist_main_uptime 42
-      # HELP dnsdist_main_real_memory_usage Current memory usage in bytes
-      # TYPE dnsdist_main_real_memory_usage gauge
-      dnsdist_main_real_memory_usage 11292672
-      # HELP dnsdist_main_noncompliant_queries Number of queries dropped as non-compliant
-      # TYPE dnsdist_main_noncompliant_queries counter
-      dnsdist_main_noncompliant_queries 0
-      # HELP dnsdist_main_noncompliant_responses Number of answers from a backend dropped as non-compliant
-      # TYPE dnsdist_main_noncompliant_responses counter
-      dnsdist_main_noncompliant_responses 0
-      # HELP dnsdist_main_rdqueries Number of received queries with the recursion desired bit set
-      # TYPE dnsdist_main_rdqueries counter
-      dnsdist_main_rdqueries 0
-      # HELP dnsdist_main_empty_queries Number of empty queries received from clients
-      # TYPE dnsdist_main_empty_queries counter
-      dnsdist_main_empty_queries 0
-      # HELP dnsdist_main_cache_hits Number of times an answer was retrieved from cache
-      # TYPE dnsdist_main_cache_hits counter
-      dnsdist_main_cache_hits 0
-      # HELP dnsdist_main_cache_misses Number of times an answer not found in the cache
-      # TYPE dnsdist_main_cache_misses counter
-      dnsdist_main_cache_misses 0
-      # HELP dnsdist_main_cpu_user_msec Milliseconds spent by dnsdist in the user state
-      # TYPE dnsdist_main_cpu_user_msec counter
-      dnsdist_main_cpu_user_msec 58
-      # HELP dnsdist_main_cpu_sys_msec Milliseconds spent by dnsdist in the system state
-      # TYPE dnsdist_main_cpu_sys_msec counter
-      dnsdist_main_cpu_sys_msec 35
-      # HELP dnsdist_main_fd_usage Number of currently used file descriptors
-      # TYPE dnsdist_main_fd_usage gauge
-      dnsdist_main_fd_usage 18
-      # HELP dnsdist_main_dyn_blocked Number of queries dropped because of a dynamic block
-      # TYPE dnsdist_main_dyn_blocked counter
-      dnsdist_main_dyn_blocked 0
-      # HELP dnsdist_main_dyn_block_nmg_size Number of dynamic blocks entries
-      # TYPE dnsdist_main_dyn_block_nmg_size gauge
-      dnsdist_main_dyn_block_nmg_size 0
-      dnsdist_main_servers_queries{server="9_9_9_9:53"} 0
-      dnsdist_main_servers_drops{server="9_9_9_9:53"} 0
-      dnsdist_main_servers_latency{server="9_9_9_9:53"} 0
-      dnsdist_main_servers_senderrors{server="9_9_9_9:53"} 0
-      dnsdist_main_servers_outstanding{server="9_9_9_9:53"} 0
-      dnsdist_main_servers_queries{server="8_8_8_8:53"} 0
-      dnsdist_main_servers_drops{server="8_8_8_8:53"} 0
-      dnsdist_main_servers_latency{server="8_8_8_8:53"} 0
-      dnsdist_main_servers_senderrors{server="8_8_8_8:53"} 0
-      dnsdist_main_servers_outstanding{server="8_8_8_8:53"} 0
-      dnsdist_main_servers_queries{server="::1:53"} 0
-      dnsdist_main_servers_drops{server="::1:53"} 0
-      dnsdist_main_servers_latency{server="::1:53"} 0
-      dnsdist_main_servers_senderrors{server="::1:53"} 0
-      dnsdist_main_servers_outstanding{server="::1:53"} 0
-      dnsdist_main_servers_queries{server="194_109_6_66:53"} 0
-      dnsdist_main_servers_drops{server="194_109_6_66:53"} 0
-      dnsdist_main_servers_latency{server="194_109_6_66:53"} 0
-      dnsdist_main_servers_senderrors{server="194_109_6_66:53"} 0
-      dnsdist_main_servers_outstanding{server="194_109_6_66:53"} 0
-      dnsdist_main_frontend_queries{frontend="127_0_0_1:5300",proto="udp"} 0
-      dnsdist_main_frontend_queries{frontend="127_0_0_1:5300",proto="tcp"} 0
-      dnsdist_main_pools_servers{pool="_default_"} 4
-      dnsdist_pool_cache_size{pool="_default_"} 1000
+      # HELP dnsdist_responses Number of responses received from backends
+      # TYPE dnsdist_responses counter
+      dnsdist_responses 0
+      # HELP dnsdist_servfail_responses Number of SERVFAIL answers received from backends
+      # TYPE dnsdist_servfail_responses counter
+      dnsdist_servfail_responses 0
+      # HELP dnsdist_queries Number of received queries
+      # TYPE dnsdist_queries counter
+      dnsdist_queries 1
+      # HELP dnsdist_acl_drops Number of packets dropped because of the ACL
+      # TYPE dnsdist_acl_drops counter
+      dnsdist_acl_drops 0
+      # HELP dnsdist_rule_drop Number of queries dropped because of a rule
+      # TYPE dnsdist_rule_drop counter
+      dnsdist_rule_drop 0
+      # HELP dnsdist_rule_nxdomain Number of NXDomain answers returned because of a rule
+      # TYPE dnsdist_rule_nxdomain counter
+      dnsdist_rule_nxdomain 0
+      # HELP dnsdist_rule_refused Number of Refused answers returned because of a rule
+      # TYPE dnsdist_rule_refused counter
+      dnsdist_rule_refused 0
+      # HELP dnsdist_rule_servfail Number of SERVFAIL answers received because of a rule
+      # TYPE dnsdist_rule_servfail counter
+      dnsdist_rule_servfail 0
+      # HELP dnsdist_self_answered Number of self-answered responses
+      # TYPE dnsdist_self_answered counter
+      dnsdist_self_answered 0
+      # HELP dnsdist_downstream_timeouts Number of queries not answered in time by a backend
+      # TYPE dnsdist_downstream_timeouts counter
+      dnsdist_downstream_timeouts 0
+      # HELP dnsdist_downstream_send_errors Number of errors when sending a query to a backend
+      # TYPE dnsdist_downstream_send_errors counter
+      dnsdist_downstream_send_errors 0
+      # HELP dnsdist_trunc_failures Number of errors encountered while truncating an answer
+      # TYPE dnsdist_trunc_failures counter
+      dnsdist_trunc_failures 0
+      # HELP dnsdist_no_policy Number of queries dropped because no server was available
+      # TYPE dnsdist_no_policy counter
+      dnsdist_no_policy 1
+      # HELP dnsdist_latency0_1 Number of queries answered in less than 1ms
+      # TYPE dnsdist_latency0_1 counter
+      dnsdist_latency0_1 0
+      # HELP dnsdist_latency1_10 Number of queries answered in 1-10 ms
+      # TYPE dnsdist_latency1_10 counter
+      dnsdist_latency1_10 0
+      # HELP dnsdist_latency10_50 Number of queries answered in 10-50 ms
+      # TYPE dnsdist_latency10_50 counter
+      dnsdist_latency10_50 0
+      # HELP dnsdist_latency50_100 Number of queries answered in 50-100 ms
+      # TYPE dnsdist_latency50_100 counter
+      dnsdist_latency50_100 0
+      # HELP dnsdist_latency100_1000 Number of queries answered in 100-1000 ms
+      # TYPE dnsdist_latency100_1000 counter
+      dnsdist_latency100_1000 0
+      # HELP dnsdist_latency_slow Number of queries answered in more than 1 second
+      # TYPE dnsdist_latency_slow counter
+      dnsdist_latency_slow 0
+      # HELP dnsdist_latency_avg100 Average response latency in microseconds of the last 100 packets
+      # TYPE dnsdist_latency_avg100 gauge
+      dnsdist_latency_avg100 0
+      # HELP dnsdist_latency_avg1000 Average response latency in microseconds of the last 1000 packets
+      # TYPE dnsdist_latency_avg1000 gauge
+      dnsdist_latency_avg1000 0
+      # HELP dnsdist_latency_avg10000 Average response latency in microseconds of the last 10000 packets
+      # TYPE dnsdist_latency_avg10000 gauge
+      dnsdist_latency_avg10000 0
+      # HELP dnsdist_latency_avg1000000 Average response latency in microseconds of the last 1000000 packets
+      # TYPE dnsdist_latency_avg1000000 gauge
+      dnsdist_latency_avg1000000 0
+      # HELP dnsdist_uptime Uptime of the dnsdist process in seconds
+      # TYPE dnsdist_uptime gauge
+      dnsdist_uptime 15
+      # HELP dnsdist_real_memory_usage Current memory usage in bytes
+      # TYPE dnsdist_real_memory_usage gauge
+      dnsdist_real_memory_usage 10268672
+      # HELP dnsdist_noncompliant_queries Number of queries dropped as non-compliant
+      # TYPE dnsdist_noncompliant_queries counter
+      dnsdist_noncompliant_queries 0
+      # HELP dnsdist_noncompliant_responses Number of answers from a backend dropped as non-compliant
+      # TYPE dnsdist_noncompliant_responses counter
+      dnsdist_noncompliant_responses 0
+      # HELP dnsdist_rdqueries Number of received queries with the recursion desired bit set
+      # TYPE dnsdist_rdqueries counter
+      dnsdist_rdqueries 1
+      # HELP dnsdist_empty_queries Number of empty queries received from clients
+      # TYPE dnsdist_empty_queries counter
+      dnsdist_empty_queries 0
+      # HELP dnsdist_cache_hits Number of times an answer was retrieved from cache
+      # TYPE dnsdist_cache_hits counter
+      dnsdist_cache_hits 0
+      # HELP dnsdist_cache_misses Number of times an answer not found in the cache
+      # TYPE dnsdist_cache_misses counter
+      dnsdist_cache_misses 1
+      # HELP dnsdist_cpu_user_msec Milliseconds spent by dnsdist in the user state
+      # TYPE dnsdist_cpu_user_msec counter
+      dnsdist_cpu_user_msec 8
+      # HELP dnsdist_cpu_sys_msec Milliseconds spent by dnsdist in the system state
+      # TYPE dnsdist_cpu_sys_msec counter
+      dnsdist_cpu_sys_msec 20
+      # HELP dnsdist_fd_usage Number of currently used file descriptors
+      # TYPE dnsdist_fd_usage gauge
+      dnsdist_fd_usage 17
+      # HELP dnsdist_dyn_blocked Number of queries dropped because of a dynamic block
+      # TYPE dnsdist_dyn_blocked counter
+      dnsdist_dyn_blocked 0
+      # HELP dnsdist_dyn_block_nmg_size Number of dynamic blocks entries
+      # TYPE dnsdist_dyn_block_nmg_size gauge
+      dnsdist_dyn_block_nmg_size 0
+      dnsdist_servers_queries{server="1_1_1_1"} 0
+      dnsdist_servers_drops{server="1_1_1_1"} 0
+      dnsdist_servers_latency{server="1_1_1_1"} 0
+      dnsdist_servers_senderrors{server="1_1_1_1"} 0
+      dnsdist_servers_outstanding{server="1_1_1_1"} 0
+      dnsdist_servers_order{server="1_1_1_1"} 1
+      dnsdist_servers_weight{server="1_1_1_1"} 1
+      dnsdist_servers_queries{server="1_0_0_1"} 0
+      dnsdist_servers_drops{server="1_0_0_1"} 0
+      dnsdist_servers_latency{server="1_0_0_1"} 0
+      dnsdist_servers_senderrors{server="1_0_0_1"} 0
+      dnsdist_servers_outstanding{server="1_0_0_1"} 0
+      dnsdist_servers_order{server="1_0_0_1"} 1
+      dnsdist_servers_weight{server="1_0_0_1"} 2
+      dnsdist_frontend_queries{frontend="127_0_0_1:1153",proto="udp"} 0
+      dnsdist_frontend_queries{frontend="127_0_0_1:1153",proto="tcp"} 1
+      dnsdist_pools_servers{pool="_default_"} 2
+      dnsdist_pool_cache_size{pool="_default_"} 200000
       dnsdist_pool_cache_entries{pool="_default_"} 0
       dnsdist_pool_cache_hits{pool="_default_"} 0
-      dnsdist_pool_cache_misses{pool="_default_"} 0
+      dnsdist_pool_cache_misses{pool="_default_"} 1
       dnsdist_pool_cache_deferred_inserts{pool="_default_"} 0
       dnsdist_pool_cache_deferred_lookups{pool="_default_"} 0
       dnsdist_pool_cache_lookup_collisions{pool="_default_"} 0
       dnsdist_pool_cache_insert_collisions{pool="_default_"} 0
       dnsdist_pool_cache_ttl_too_shorts{pool="_default_"} 0
+      dnsdist_querycount_queries{qname="kernel_org_"} 1
 
   **Example prometheus configuration**: