Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-01 16:14:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

middleware/metrics: cleanup (#355)

Browse Source 
* middleware/metrics: add more metrics

middleware/cache:
Add metrics for number of elements in the cache. Also export the total
size. Update README to detail the new metrics.

middleware/metrics

Move metrics into subpackage called "vars". This breaks the import
cycle and is cleaner. This allows vars.Report to be used in the
the dnsserver to log refused queries.

middleware/metrics: tests

Add tests to the metrics framework. The metrics/test subpackage allows
scraping of the local server. Do a few test scrape of the metrics that
are defined in the metrics middleware.

This also allows metrics integration tests to check if the caching and
dnssec middleware export their metrics correctly.

* update README

* typos

* fix tests
This commit is contained in:
Miek Gieben
2016-10-26 10:01:52 +01:00
committed by GitHub
parent 6d9d60081d
commit 219bfd0493
39 changed files with 828 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
middleware/auto/walk.go
View File

@@ -13,26 +13,26 @@ import (
)
// Walk will recursively walk of the file under l.directory and adds the one that match l.re.
func (z *Zones) Walk(l loader) error {
func (a Auto) Walk() error {
// TODO(miek): should add something so that we don't stomp on each other.
toDelete := make(map[string]bool)
for _, n := range z.Names() {
for _, n := range a.Zones.Names() {
toDelete[n] = true
}
filepath.Walk(l.directory, func(path string, info os.FileInfo, err error) error {
filepath.Walk(a.loader.directory, func(path string, info os.FileInfo, err error) error {
if info.IsDir() {
return nil
}
match, origin := matches(l.re, info.Name(), l.template)
match, origin := matches(a.loader.re, info.Name(), a.loader.template)
if !match {
return nil
}
if _, ok := z.Z[origin]; ok {
if _, ok := a.Zones.Z[origin]; ok {
// we already have this zone
toDelete[origin] = false
return nil
@@ -50,10 +50,14 @@ func (z *Zones) Walk(l loader) error {
return nil
}
zo.NoReload = l.noReload
zo.TransferTo = l.transferTo
zo.NoReload = a.loader.noReload
zo.TransferTo = a.loader.transferTo
z.Insert(zo, origin)
a.Zones.Add(zo, origin)
if a.metrics != nil {
a.metrics.AddZone(origin)
}
zo.Notify()
@@ -68,7 +72,13 @@ func (z *Zones) Walk(l loader) error {
if !ok {
continue
}
z.Delete(origin)
if a.metrics != nil {
a.metrics.RemoveZone(origin)
}
a.Zones.Remove(origin)
log.Printf("[INFO] Deleting zone `%s'", origin)
}