Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add probe_dns_query_succeeded metric #990

Merged
merged 1 commit into from
Dec 1, 2022
+28 −12
Merged

Add probe_dns_query_succeeded metric #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions prober/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ func ProbeDNS(ctx context.Context, target string, module config.Module, registry
Name: "probe_dns_additional_rrs",
Help: "Returns number of entries in the additional resource record list",
})
probeDNSQuerySucceeded := prometheus.NewGauge(prometheus.GaugeOpts{
Name: "probe_dns_query_succeeded",
Help: "Displays whether or not the query was executed successfully",
})

for _, lv := range []string{"resolve", "connect", "request"} {
probeDNSDurationGaugeVec.WithLabelValues(lv)
Expand All @@ -151,6 +155,7 @@ func ProbeDNS(ctx context.Context, target string, module config.Module, registry
registry.MustRegister(probeDNSAnswerRRSGauge)
registry.MustRegister(probeDNSAuthorityRRSGauge)
registry.MustRegister(probeDNSAdditionalRRSGauge)
registry.MustRegister(probeDNSQuerySucceeded)

qc := uint16(dns.ClassINET)
if module.DNS.QueryClass != "" {
Expand Down Expand Up @@ -274,6 +279,7 @@ func ProbeDNS(ctx context.Context, target string, module config.Module, registry
probeDNSAnswerRRSGauge.Set(float64(len(response.Answer)))
probeDNSAuthorityRRSGauge.Set(float64(len(response.Ns)))
probeDNSAdditionalRRSGauge.Set(float64(len(response.Extra)))
probeDNSQuerySucceeded.Set(1)

if qt == dns.TypeSOA {
probeDNSSOAGauge = prometheus.NewGauge(prometheus.GaugeOpts{
Expand Down
34 changes: 22 additions & 12 deletions prober/dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,10 @@ func TestRecursiveDNSResponse(t *testing.T) {
t.Fatal(err)
}
expectedResults := map[string]float64{
"probe_dns_answer_rrs": 2,
"probe_dns_authority_rrs": 0,
"probe_dns_additional_rrs": 0,
"probe_dns_answer_rrs": 2,
"probe_dns_authority_rrs": 0,
"probe_dns_additional_rrs": 0,
"probe_dns_query_succeeded": 1,
}
if !test.Probe.Recursion {
expectedResults["probe_dns_answer_rrs"] = 0
Expand Down Expand Up @@ -382,9 +383,10 @@ func TestAuthoritativeDNSResponse(t *testing.T) {
t.Fatal(err)
}
expectedResults := map[string]float64{
"probe_dns_answer_rrs": 1,
"probe_dns_authority_rrs": 2,
"probe_dns_additional_rrs": 3,
"probe_dns_answer_rrs": 1,
"probe_dns_authority_rrs": 2,
"probe_dns_additional_rrs": 3,
"probe_dns_query_succeeded": 1,
}
if test.Probe.QueryType == "SOA" {
expectedResults["probe_dns_serial"] = 1000
Expand Down Expand Up @@ -456,10 +458,17 @@ func TestServfailDNSResponse(t *testing.T) {
t.Fatal(err)
}
expectedResults := map[string]float64{
"probe_dns_answer_rrs": 0,
"probe_dns_authority_rrs": 0,
"probe_dns_additional_rrs": 0,
"probe_dns_answer_rrs": 0,
"probe_dns_authority_rrs": 0,
"probe_dns_additional_rrs": 0,
"probe_dns_query_succeeded": 1,
}

// Handle case where ProbeDNS fails before executing the query because of an invalid query type
if test.Probe.QueryType == "NOT_A_VALID_QUERY_TYPE" {
expectedResults["probe_dns_query_succeeded"] = 0
}

checkRegistryResults(expectedResults, mfs, t)
}
}
Expand Down Expand Up @@ -638,9 +647,10 @@ func TestDNSMetrics(t *testing.T) {
"request": {},
},
},
"probe_dns_answer_rrs": nil,
"probe_dns_authority_rrs": nil,
"probe_dns_additional_rrs": nil,
"probe_dns_answer_rrs": nil,
"probe_dns_authority_rrs": nil,
"probe_dns_additional_rrs": nil,
"probe_dns_query_succeeded": nil,
}

checkMetrics(expectedMetrics, mfs, t)
Expand Down