5f41d8eb1f
Make normalize return multiple "hosts" (= reverse zones) when a non-octet boundary cidr is given. Added pkg/cidr package that holds the cidr calculation routines; felt they didn't really fit dnsutil. This change means the IPNet return parameter isn't needed, the hosts are all correct. The tests that tests this is also removed: TestSplitHostPortReverse The fallout was that zoneAddr _also_ doesn't need the IPNet member, that in turn make it visible that zoneAddr in address.go duplicated a bunch of stuff from register.go; removed/refactored that too. Created a plugin.OriginsFromArgsOrServerBlock to help plugins do the right things, by consuming ZONE arguments; this now expands reverse zones correctly. This is mostly mechanical. Remove the reverse test in plugin/kubernetes which is a copy-paste from a core test (which has since been fixed). Remove MustNormalize as it has no plugin users. This change is not backwards compatible to plugins that have a ZONE argument that they parse in the setup util. All in-tree plugins have been updated. Signed-off-by: Miek Gieben <miek@miek.nl>
105 lines
2.6 KiB
Go
105 lines
2.6 KiB
Go
package metrics
|
|
|
|
import (
|
|
"net"
|
|
"runtime"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/coremain"
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/plugin/metrics/vars"
|
|
clog "github.com/coredns/coredns/plugin/pkg/log"
|
|
"github.com/coredns/coredns/plugin/pkg/uniq"
|
|
)
|
|
|
|
var (
|
|
log = clog.NewWithPlugin("prometheus")
|
|
u = uniq.New()
|
|
registry = newReg()
|
|
)
|
|
|
|
func init() { plugin.Register("prometheus", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
m, err := parse(c)
|
|
if err != nil {
|
|
return plugin.Error("prometheus", err)
|
|
}
|
|
m.Reg = registry.getOrSet(m.Addr, m.Reg)
|
|
|
|
c.OnStartup(func() error { m.Reg = registry.getOrSet(m.Addr, m.Reg); u.Set(m.Addr, m.OnStartup); return nil })
|
|
c.OnRestartFailed(func() error { m.Reg = registry.getOrSet(m.Addr, m.Reg); u.Set(m.Addr, m.OnStartup); return nil })
|
|
|
|
c.OnStartup(func() error { return u.ForEach() })
|
|
c.OnRestartFailed(func() error { return u.ForEach() })
|
|
|
|
c.OnStartup(func() error {
|
|
conf := dnsserver.GetConfig(c)
|
|
for _, h := range conf.ListenHosts {
|
|
addrstr := conf.Transport + "://" + net.JoinHostPort(h, conf.Port)
|
|
for _, p := range conf.Handlers() {
|
|
vars.PluginEnabled.WithLabelValues(addrstr, conf.Zone, p.Name()).Set(1)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
c.OnRestartFailed(func() error {
|
|
conf := dnsserver.GetConfig(c)
|
|
for _, h := range conf.ListenHosts {
|
|
addrstr := conf.Transport + "://" + net.JoinHostPort(h, conf.Port)
|
|
for _, p := range conf.Handlers() {
|
|
vars.PluginEnabled.WithLabelValues(addrstr, conf.Zone, p.Name()).Set(1)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
c.OnRestart(m.OnRestart)
|
|
c.OnRestart(func() error { vars.PluginEnabled.Reset(); return nil })
|
|
c.OnFinalShutdown(m.OnFinalShutdown)
|
|
|
|
// Initialize metrics.
|
|
buildInfo.WithLabelValues(coremain.CoreVersion, coremain.GitCommit, runtime.Version()).Set(1)
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
m.Next = next
|
|
return m
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func parse(c *caddy.Controller) (*Metrics, error) {
|
|
met := New(defaultAddr)
|
|
|
|
i := 0
|
|
for c.Next() {
|
|
if i > 0 {
|
|
return nil, plugin.ErrOnce
|
|
}
|
|
i++
|
|
|
|
zones := plugin.OriginsFromArgsOrServerBlock(nil /* args */, c.ServerBlockKeys)
|
|
for _, z := range zones {
|
|
met.AddZone(z)
|
|
}
|
|
args := c.RemainingArgs()
|
|
|
|
switch len(args) {
|
|
case 0:
|
|
case 1:
|
|
met.Addr = args[0]
|
|
_, _, e := net.SplitHostPort(met.Addr)
|
|
if e != nil {
|
|
return met, e
|
|
}
|
|
default:
|
|
return met, c.ArgErr()
|
|
}
|
|
}
|
|
return met, nil
|
|
}
|
|
|
|
// defaultAddr is the address the where the metrics are exported by default.
|
|
const defaultAddr = "localhost:9153"
|