reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2561 from weaveworks/issues/2560-fix-dns-ipam-metrics

Browse Source 
Do not expose IPAM or DNS metrics if weave does not run IPAM or DNS
This commit is contained in:
Adam Harrison authored and GitHub committed 2016-10-26 14:24:43 +01:00
2 parents a5ff7ab8df 5c2e878c64
commit 4b77662e3b
1 file changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files
prog/weaver/metrics.go
+8 -4
View File
@@ -62,13 +62,17 @@ var metrics []metric = []metric{
}},
{desc("weave_ips", "Number of IP addresses.", "state"),
func(s WeaveStatus, desc *prometheus.Desc, ch chan<- prometheus.Metric) {
ch <- intGauge(desc, s.IPAM.RangeNumIPs, "total")
ch <- intGauge(desc, s.IPAM.ActiveIPs, "local-used")
if s.IPAM != nil {
ch <- intGauge(desc, s.IPAM.RangeNumIPs, "total")
ch <- intGauge(desc, s.IPAM.ActiveIPs, "local-used")
}
}},
{desc("weave_dns_entries", "Number of DNS entries.", "state"),
func(s WeaveStatus, desc *prometheus.Desc, ch chan<- prometheus.Metric) {
ch <- intGauge(desc, countDNSEntries(s.DNS.Entries), "total")
ch <- intGauge(desc, countDNSEntriesForPeer(s.Router.Name, s.DNS.Entries), "local")
if s.DNS != nil {
ch <- intGauge(desc, countDNSEntries(s.DNS.Entries), "total")
ch <- intGauge(desc, countDNSEntriesForPeer(s.Router.Name, s.DNS.Entries), "local")
}
}},
{desc("weave_flows", "Number of FastDP flows."),
func(s WeaveStatus, desc *prometheus.Desc, ch chan<- prometheus.Metric) {