aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2020-02-19 09:57:42 +0100
committerGravatar GitHub <noreply@github.com> 2020-02-19 08:57:42 +0000
commited1841c36f8633d7bd6ea3bc8a22eb16ce67377e (patch)
treeb4aa54f83c6b72d273a17a8fcbec0077514f17be
parentc8a6b16d86a5fadc8b4dba9ce3c6e65e12fd5b3a (diff)
downloadcoredns-ed1841c36f8633d7bd6ea3bc8a22eb16ce67377e.tar.gz
coredns-ed1841c36f8633d7bd6ea3bc8a22eb16ce67377e.tar.zst
coredns-ed1841c36f8633d7bd6ea3bc8a22eb16ce67377e.zip
metrics: add type to latency as well (#3685)
Automatically submitted.
-rw-r--r--plugin/metrics/README.md2
-rw-r--r--plugin/metrics/vars/report.go3
-rw-r--r--plugin/metrics/vars/vars.go2
3 files changed, 4 insertions, 3 deletions
diff --git a/plugin/metrics/README.md b/plugin/metrics/README.md
index 5aec4e97b..3379919c9 100644
--- a/plugin/metrics/README.md
+++ b/plugin/metrics/README.md
@@ -13,7 +13,7 @@ The following metrics are exported:
* `coredns_build_info{version, revision, goversion}` - info about CoreDNS itself.
* `coredns_panic_count_total{}` - total number of panics.
* `coredns_dns_request_count_total{server, zone, proto, family}` - total query count.
-* `coredns_dns_request_duration_seconds{server, zone}` - duration to process each query.
+* `coredns_dns_request_duration_seconds{server, zone, type}` - duration to process each query.
* `coredns_dns_request_size_bytes{server, zone, proto}` - size of the request in bytes.
* `coredns_dns_request_do_count_total{server, zone}` - queries that have the DO bit set
* `coredns_dns_request_type_count_total{server, zone, type}` - counter of queries per zone and type.
diff --git a/plugin/metrics/vars/report.go b/plugin/metrics/vars/report.go
index 77ed281f2..b0a9950ce 100644
--- a/plugin/metrics/vars/report.go
+++ b/plugin/metrics/vars/report.go
@@ -21,7 +21,6 @@ func Report(server string, req request.Request, zone, rcode string, size int, st
typ := req.QType()
RequestCount.WithLabelValues(server, zone, net, fam).Inc()
- RequestDuration.WithLabelValues(server, zone).Observe(time.Since(start).Seconds())
if req.Do() {
RequestDo.WithLabelValues(server, zone).Inc()
@@ -29,8 +28,10 @@ func Report(server string, req request.Request, zone, rcode string, size int, st
if _, known := monitorType[typ]; known {
RequestType.WithLabelValues(server, zone, dns.Type(typ).String()).Inc()
+ RequestDuration.WithLabelValues(server, zone, dns.Type(typ).String()).Observe(time.Since(start).Seconds())
} else {
RequestType.WithLabelValues(server, zone, other).Inc()
+ RequestDuration.WithLabelValues(server, zone, other).Observe(time.Since(start).Seconds())
}
ResponseSize.WithLabelValues(server, zone, net).Observe(float64(size))
diff --git a/plugin/metrics/vars/vars.go b/plugin/metrics/vars/vars.go
index 3adee1d76..6d896e88a 100644
--- a/plugin/metrics/vars/vars.go
+++ b/plugin/metrics/vars/vars.go
@@ -21,7 +21,7 @@ var (
Name: "request_duration_seconds",
Buckets: plugin.TimeBuckets,
Help: "Histogram of the time (in seconds) each request took.",
- }, []string{"server", "zone"})
+ }, []string{"server", "zone", "type"})
RequestSize = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: plugin.Namespace,