Add stale cache replies to metrics.

This commit is contained in:
Simon Kelley
2022-09-12 14:50:17 +01:00
parent 0076481dfd
commit 1ba4ae2830
4 changed files with 5 additions and 1 deletions

View File

@@ -1729,6 +1729,8 @@ void dump_cache(time_t now)
daemon->cachesize, daemon->metrics[METRIC_DNS_CACHE_LIVE_FREED], daemon->metrics[METRIC_DNS_CACHE_INSERTED]); daemon->cachesize, daemon->metrics[METRIC_DNS_CACHE_LIVE_FREED], daemon->metrics[METRIC_DNS_CACHE_INSERTED]);
my_syslog(LOG_INFO, _("queries forwarded %u, queries answered locally %u"), my_syslog(LOG_INFO, _("queries forwarded %u, queries answered locally %u"),
daemon->metrics[METRIC_DNS_QUERIES_FORWARDED], daemon->metrics[METRIC_DNS_LOCAL_ANSWERED]); daemon->metrics[METRIC_DNS_QUERIES_FORWARDED], daemon->metrics[METRIC_DNS_LOCAL_ANSWERED]);
if (option_bool(OPT_STALE_CACHE))
my_syslog(LOG_INFO, _("queries answered from stale cache %u"), daemon->metrics[METRIC_DNS_STALE_ANSWERED]);
#ifdef HAVE_AUTH #ifdef HAVE_AUTH
my_syslog(LOG_INFO, _("queries for authoritative zones %u"), daemon->metrics[METRIC_DNS_AUTH_ANSWERED]); my_syslog(LOG_INFO, _("queries for authoritative zones %u"), daemon->metrics[METRIC_DNS_AUTH_ANSWERED]);
#endif #endif

View File

@@ -1799,7 +1799,7 @@ void receive_query(struct listener *listen, time_t now)
#endif #endif
send_from(listen->fd, option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND), send_from(listen->fd, option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND),
(char *)header, m, &source_addr, &dst_addr, if_index); (char *)header, m, &source_addr, &dst_addr, if_index);
daemon->metrics[METRIC_DNS_LOCAL_ANSWERED]++; daemon->metrics[stale ? METRIC_DNS_STALE_ANSWERED : METRIC_DNS_LOCAL_ANSWERED]++;
} }
if (m == 0 || stale) if (m == 0 || stale)

View File

@@ -22,6 +22,7 @@ const char * metric_names[] = {
"dns_queries_forwarded", "dns_queries_forwarded",
"dns_auth_answered", "dns_auth_answered",
"dns_local_answered", "dns_local_answered",
"dns_stale_answered",
"bootp", "bootp",
"pxe", "pxe",
"dhcp_ack", "dhcp_ack",

View File

@@ -21,6 +21,7 @@ enum {
METRIC_DNS_QUERIES_FORWARDED, METRIC_DNS_QUERIES_FORWARDED,
METRIC_DNS_AUTH_ANSWERED, METRIC_DNS_AUTH_ANSWERED,
METRIC_DNS_LOCAL_ANSWERED, METRIC_DNS_LOCAL_ANSWERED,
METRIC_DNS_STALE_ANSWERED,
METRIC_BOOTP, METRIC_BOOTP,
METRIC_PXE, METRIC_PXE,
METRIC_DHCPACK, METRIC_DHCPACK,