From 52702caab10a6eb3e9363532767ec339704f633e Mon Sep 17 00:00:00 2001 From: User Kibab Date: Mon, 16 May 2022 14:50:03 +0200 Subject: [PATCH 1/6] Update config.yaml to match the latest NSD metrics While here, also run `go mod tidy` to update the Go modules settings. --- README.md | 2 +- bindata.go | 23 ++++++++++++++++------- config/config.yaml | 8 +++++++- go.sum | 6 ++++++ 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5900c17..fde164c 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This is only needed if you want to modify the embedded metric configuration file Install go-bindata. ``` -go get -u github.com/go-bindata/go-bindata/go-bindata +go install github.com/go-bindata/go-bindata/go-bindata@latest ``` Make any metric config modifications to `config/config.yaml`. diff --git a/bindata.go b/bindata.go index 611aad6..8cd4517 100644 --- a/bindata.go +++ b/bindata.go @@ -1,8 +1,6 @@ -// Code generated by go-bindata. +// Code generated for package main by go-bindata DO NOT EDIT. (@generated) // sources: // config/config.yaml -// DO NOT EDIT! - package main import ( @@ -49,26 +47,37 @@ type bindataFileInfo struct { modTime time.Time } +// Name return file name func (fi bindataFileInfo) Name() string { return fi.name } + +// Size return file size func (fi bindataFileInfo) Size() int64 { return fi.size } + +// Mode return file mode func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } + +// Mode return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } + +// IsDir return file whether a directory func (fi bindataFileInfo) IsDir() bool { - return false + return fi.mode&os.ModeDir != 0 } + +// Sys return file is sys mode func (fi bindataFileInfo) Sys() interface{} { return nil } -var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x56\x4d\x4f\x23\x39\x10\xbd\xe7\x57\x94\x98\xc3\x80\x06\x9a\xcb\x6a\xb4\xca\x0d\x01\xbb\xe2\xb0\x30\x22\x19\xed\x1e\x22\x21\xc7\xae\x4e\x7b\x71\xdb\x3d\x55\xd5\x24\x99\x5f\xbf\xb2\xdd\x01\xb2\xc2\x9d\xac\xf6\x80\x50\x5c\xee\xf7\x9e\x9f\xeb\xc3\x2d\x0a\x59\xcd\xd3\xc9\x27\xb8\x9f\xdd\xc0\x1f\xf9\xe7\xe4\x13\xcc\xd5\x33\x7a\xa8\x29\xb4\xd0\x88\x74\x3c\xbd\xbc\x5c\xaf\xd7\x95\x77\x1e\xc5\xa9\x25\x57\xde\x5d\x76\x14\xfe\x46\x2d\x7c\xe9\xd9\xc4\xbf\x0b\x1d\xbc\x50\x70\xd5\xaf\x55\x23\xad\x83\x93\xd9\xfc\x6a\x7e\x37\x9b\xdf\x5d\xc3\xf5\xc3\xf7\xfb\xf9\xed\xe3\xec\x64\x02\xe0\xfb\xb6\xfa\xd1\x23\x59\xe4\xe9\x04\x00\xa0\x41\xd7\x4d\xe1\xb3\xef\xdb\x25\x12\x84\x1a\x86\x28\x10\x6a\xb4\x2f\x68\xe0\x54\x1a\x04\xd1\x1d\x28\x6f\xa0\x37\xdd\xeb\x0e\x65\x0c\x1a\xe8\xbb\xb3\xea\x73\x82\x92\x6d\x87\x53\xd0\xa1\xf7\x82\x34\x01\x10\xdb\x62\xb5\x0c\x41\xf6\x98\xfa\x2e\xae\x83\xf5\xc0\xa8\x83\x37\x0c\x6c\xbd\x46\x88\x2c\x8c\xf4\x82\x04\x6b\xc5\xc0\xa2\x48\xd0\x54\xf0\xa7\x95\x06\x6a\x52\x5a\x6c\xf0\xca\xed\xbe\xda\xe3\x5c\xa9\x7e\x85\x3b\x46\x74\xaa\x63\x34\x7b\xa4\x89\xf2\x8d\xc7\x29\x96\xc8\x20\xf1\x98\x5d\x20\x39\x7f\xa7\x67\xa0\x3c\x96\x93\xed\x4f\xac\xcc\xb2\x32\x96\x9f\xf7\x38\x63\x20\x1a\xea\xd9\x54\x66\x09\xc1\x43\xdc\x92\x98\x96\x5b\xc1\x71\xb4\x16\xdb\x0f\xc1\xa2\xfa\x9b\xfb\x19\x18\x25\x6a\xa9\x38\xf9\xd8\x62\x1b\x68\x7b\x0c\xf0\xa6\x26\x53\x84\xce\x30\x50\x07\x82\x9f\xc1\x23\x08\x29\xcf\x35\x12\xa7\x8b\xf7\x41\x6c\x1d\x6f\xdd\x7a\x88\x30\xd0\x51\xd0\xc8\x7c\x0e\xb8\xd1\xae\x37\xc8\x30\x9f\xdd\xfd\x9e\x84\x1d\x23\x45\x07\x5f\xdb\x55\xd9\xb5\x28\xc1\x59\x16\xa8\xad\xc3\x37\xf3\x5e\xc9\xa2\x11\xd1\xd9\x88\x93\x10\xff\x03\x69\xc9\x81\x1c\x4e\x47\x78\xef\xeb\x33\x76\x02\xb2\xb6\x7a\xc8\xda\x94\xa3\xd1\x93\x7d\x1f\x46\xe9\x63\xdd\xa1\xf1\x87\x8a\x6e\x1d\x33\xef\x36\x5e\xf0\xc3\xb7\x79\xa1\xac\x76\x50\x48\x74\x08\xad\xb1\xba\x81\x5a\x59\x87\x26\xa3\x76\x8a\x18\x47\x70\x7b\xd3\x1d\xc0\x0c\xf1\xf0\xdf\x6f\xbe\x81\xed\x7e\x19\x07\xfa\x7a\x3c\xd2\xd7\x11\x24\xd1\x25\x49\x3a\x78\x8f\xa9\x44\x07\xb0\xf9\xf5\x21\x59\xa2\x8b\xb2\x0a\x68\x63\xd2\x94\xe7\x35\xd2\xd3\x3a\x3c\x29\x55\x40\xcd\x5b\x86\x8b\xbd\x7f\xb8\x7d\x7c\x7c\x78\x04\xd2\xc1\x60\xca\xa0\xb8\x1c\x7a\x81\xab\x2b\xa8\x9d\x5a\x9d\x83\x34\x36\x96\xd8\xbb\x24\x27\xac\x91\x48\x39\x1e\x11\x42\x9b\xc3\xc9\x10\xeb\x3a\x27\x44\x46\x4d\xdd\x7d\x48\x8e\x31\xc7\x46\xa0\x77\x87\xdb\x87\x4e\x7d\xa3\xb5\x72\x18\x9b\xd4\xa6\x2e\x61\x5f\xfd\xf5\xdb\x23\x10\xfe\xe8\x91\x85\xf3\x2c\xd4\xce\xa2\x17\x8e\x03\x49\x09\xac\x82\xe4\x5a\xcc\x2e\xc6\x46\xee\xb6\xa5\x51\x94\x4e\x42\xbd\xd7\x4a\xfe\x35\x19\x0a\x57\x35\xbf\x4e\x17\x02\x8c\x32\x02\x69\x28\x74\x5d\x11\x70\xe7\x7c\x92\xbb\x46\x42\x18\xf6\xc3\x12\xb5\xea\x39\xcd\xa2\xed\xae\x3e\x59\x79\x2b\x5b\xd0\x0d\xea\xe7\x02\x65\xec\x89\x55\xab\x58\xb0\xe4\x5a\x0e\xa6\x8d\x3c\xb8\x53\xc1\xbc\x41\x46\x50\x84\xc3\x7a\x3a\xa0\x0f\x70\x32\xd8\x7b\xb1\xa9\xe9\x04\xd0\x4b\x54\x3b\x46\xcd\x4e\xbd\x60\x81\x39\xc5\x8e\x21\x3e\x9e\xf5\xd3\xee\x49\x94\x1d\x6c\x22\x81\x53\x4b\x74\x0c\x71\xf4\x99\x38\x15\x38\xb4\x31\x99\x57\xb8\x81\x17\xe5\x7a\x8c\xaf\xa7\x06\x41\xab\x4e\x7a\x42\x58\x51\xe8\x3b\xb0\xde\xe0\x06\xb8\x09\xbd\x33\xd0\x2a\x19\x12\x35\x2f\x0f\x43\x35\x01\x83\x57\x2d\x42\xef\x0d\xd2\xc0\x34\x49\xff\x9e\x5e\x9f\x6a\xe9\xde\x17\x55\x14\xba\xa8\x4e\x17\xeb\x2f\x67\xd9\x8f\xf8\xe1\x34\xc6\x9e\x62\x28\x2d\x65\x80\x1c\x06\xb8\x80\xd7\xc0\x78\xf7\x4f\x1d\x20\xae\x6c\xd3\x17\xe5\xec\x5b\x54\xa1\x8b\x8d\xa4\xa0\x23\x07\xff\xb7\x92\x0c\x33\xa6\x42\x3b\xc5\x5c\x10\x91\x62\x1f\x6a\x78\x8b\x1c\x6d\x47\xfa\x64\x4c\x09\x8d\xd8\x41\x45\x37\xde\x22\xc5\x96\x90\xf2\x4f\x2b\x22\x8b\x26\x2b\x22\x94\x9e\x3c\x8c\x78\x93\xdf\x09\xa7\x0b\xf3\xe5\x6c\xb1\xff\xe4\xce\xa2\x72\xfc\x69\x88\x7c\xa8\x2c\x6f\x19\x37\xa9\x51\xde\xc4\xf6\xb1\xdc\xbe\x7f\x41\x0f\x8f\x92\x0f\xa5\xfd\x13\x00\x00\xff\xff\x66\xaf\x8d\x3d\x77\x0c\x00\x00") +var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x57\xc1\x6e\x1b\x37\x10\xbd\xeb\x2b\x06\xf1\x21\x09\x12\xaf\x2f\x85\x0f\xba\x19\x71\x5a\x14\x68\xed\xc0\x56\xd1\x1e\x04\x18\x14\x39\xab\x25\xcc\x25\x37\x33\xb3\x96\x94\xaf\x2f\x86\x5c\xd9\x56\xeb\x5d\xa9\xe8\xc9\x32\x87\x7c\xef\xf1\x71\x38\xc3\x6d\x51\xc8\x5b\x9e\xcf\xce\xe0\xe6\xfe\x1a\x7e\x2f\xff\xce\xce\x60\x61\x1e\x31\x42\x4d\xa9\x85\x46\xa4\xe3\xf9\xc5\x45\x64\x57\xb9\x64\xb9\x8a\x21\xa2\x04\xb3\xd2\x5f\x17\x18\x2f\x82\x11\x64\xb9\x68\x4d\xec\xcc\x1a\x59\x27\x9e\xdb\x14\x85\x52\xa8\x1a\x69\xc3\x19\x8b\x11\xcf\xe2\x2d\x9f\xdb\xd4\x47\x41\xe2\x19\x40\xec\xdb\xea\x7b\x8f\xe4\x91\xe7\x33\x00\x80\x06\x43\x37\x87\xf7\xb1\x6f\x57\x48\x90\x6a\x18\xa2\x40\x68\xd1\x3f\xa1\x83\x0f\xd2\x20\x88\xed\xc0\x44\x07\xbd\xeb\x9e\x67\x18\xe7\xd0\x41\xdf\x7d\xac\xde\x67\x28\xd9\x75\x38\x87\x81\x6c\x06\x20\xbe\xc5\x6a\x95\x92\x1c\x30\xf5\x9d\x8e\x83\x8f\xc0\x68\x53\x74\x0c\xec\xa3\x45\x50\x16\x46\x7a\x42\x82\x8d\x61\x60\x31\x24\xe8\x2a\xf8\xd3\x4b\x03\x35\x19\x2b\x3e\x45\x13\xf6\xab\x0e\x38\xd7\xa6\x5f\xe3\x9e\x11\x83\xe9\x18\xdd\x01\x69\xa6\x7c\xe1\x09\x86\x45\x19\x44\xb7\xd9\x25\x92\xcf\xaf\xf4\x0c\x94\xa7\x72\xb2\xff\x81\x95\x5b\x55\xce\xf3\xe3\x01\xa7\x06\xd4\xd0\x7c\x84\x2b\x48\x11\x74\x4a\x66\x5a\xed\x04\xa7\xd1\x5a\x6c\xdf\x04\x53\xf5\xd7\x37\xf7\xe0\x8c\x98\x95\xe1\xec\x63\x8b\x6d\xa2\xdd\x29\xc0\xdb\x9a\xdc\x28\x74\x81\x81\x3a\x11\xfc\x48\x11\x41\xc8\x44\xae\x91\x38\x1f\x7c\x4c\xe2\x6b\x3d\x75\x1f\x41\x61\xa0\xa3\x64\x91\xf9\x33\xe0\xd6\x86\xde\x21\xc3\xe2\xfe\xd7\x5f\xb2\xb0\x53\xa4\xd8\x14\x6b\xbf\x1e\x77\x4d\x25\x04\xcf\x02\xb5\x0f\xf8\x62\xde\x33\x99\x1a\xa1\xce\x2a\x4e\x46\xfc\x0f\xa4\x63\x0e\x94\x70\xde\xc2\x6b\x5f\x1f\xb1\x13\x90\x8d\xb7\x43\xd6\xe6\x1c\x55\x4f\x0e\x7d\x98\xa4\xd7\x7b\x87\x2e\x1e\xbb\x74\x1b\xcd\xbc\xaf\x7a\xc0\xb7\xdf\x16\x23\xd7\x6a\x0f\x85\x44\xc7\xd0\x1a\x6f\x1b\xa8\x8d\x0f\xe8\x0a\x6a\x67\x88\x71\x02\xb7\x77\xdd\x11\xcc\xa4\x9b\xff\xe3\xfa\x1b\xf8\xee\xa7\x69\xa0\xcb\xd3\x91\x2e\x27\x90\xc4\x8e\x49\xb2\x29\x46\xcc\x57\x74\x00\x5b\x7c\x39\x26\x4b\xec\xa8\xac\x11\xb4\x49\x69\x61\xec\x3c\xff\x0d\xf6\xdb\x7d\x96\x96\x7f\x3c\x17\x50\x42\xbd\x57\x7a\x2a\x92\x2b\x45\x51\x38\xcd\x78\xba\xfe\x4c\x79\x79\x12\xe5\xd4\x2e\x4d\xe4\x0d\xd2\xc3\x26\x3d\x18\x33\xc2\x5d\xa6\x0c\xe9\x7b\x73\xfb\xf5\xee\xee\xf6\x0e\xc8\x26\x87\xf9\x9e\xe8\x70\xea\x05\xae\xae\xa0\x0e\x66\xfd\x19\xa4\xf1\x5a\x48\x5e\x5d\x65\xc2\x1a\x89\x4c\xe0\x09\x21\xb4\x3d\x9e\xf2\x5a\xbd\x4a\xda\x17\xd4\xdc\xc3\x86\x2b\x30\xe5\xeb\x04\xf4\x7e\x73\x87\xd0\xb9\x3a\xb6\x5e\x8e\x63\x93\xd9\xd6\x63\xd8\x57\x7f\xfd\x7c\x07\x84\xdf\x7b\x64\xe1\xd2\xf9\x6d\xf0\x18\x85\xb5\xed\x1a\x81\x75\x92\x52\x71\x8a\x8b\xda\xae\xc2\x6e\xac\xe1\xe6\x9d\x50\x1f\xad\x91\x7f\xf4\xbf\x91\xa3\x5a\x7c\xc9\x07\x02\x8c\x32\x01\xe9\x28\x75\xdd\x28\xe0\xde\xf9\x2c\x77\x83\x84\x30\xcc\x87\x15\x5a\xd3\x73\xee\xb8\xbb\x7d\x15\x62\x13\xbd\xec\xc0\x36\x68\x1f\x47\x28\xb5\xf2\x57\xad\x61\xc1\x31\xd7\x4a\x30\x4f\xe4\xc1\x9d\x0a\x16\x0d\x32\xe6\xfc\x2e\xe3\x79\x83\x31\xc1\xbb\xc1\xde\xf3\x6d\x4d\xef\x00\xa3\xa8\xda\x29\x6a\x0e\xe6\x09\x47\x98\x73\xec\x14\xe2\xd3\x59\xcf\xf6\x0f\xc0\xe2\x60\xa3\x04\xc1\xac\x30\x30\x68\x83\x77\xda\xfb\x38\xb5\x9a\xcc\x6b\xdc\xc2\x93\x09\x3d\xea\x5b\xb1\x41\xb0\xa6\x93\x9e\x10\xd6\x94\xfa\x0e\x7c\x74\xb8\x05\x6e\x52\x1f\x1c\xb4\x46\x86\x44\x2d\xc3\xc3\xd3\x21\x03\x43\x34\x2d\x42\x1f\x1d\xd2\xc0\x34\xcb\x7f\x1e\x9e\x1f\xa6\xf9\xdc\x97\x95\x0a\x5d\x56\x1f\x96\x9b\x4f\x1f\x8b\x1f\xba\x70\xae\xb1\x07\x0d\xe5\xa1\x02\x50\xc2\x00\xe7\xf0\x1c\x98\xee\x71\xb9\x02\xe8\xc8\x2e\xaf\x18\xcf\xbe\x65\x95\x3a\x2d\x24\x23\x3a\x4a\xf0\x7f\x2b\x29\x30\x53\x2a\x6c\x30\xcc\x23\x22\x72\xec\x4d\x0d\x2f\x91\x93\xed\xc8\x4b\xa6\x94\xd0\x84\x1d\x34\xea\xc6\x4b\x64\xb4\x24\xe4\xfc\xb3\x86\xc8\xa3\x2b\x8a\x08\xa5\xa7\x08\x13\xde\x94\xd7\xd0\x87\xa5\xfb\xf4\x71\x79\xf8\x61\x51\x44\x95\xf8\xc3\x10\x79\x53\x59\x99\x32\x6d\x52\x63\xa2\xd3\xf2\xb1\xda\xbd\xfe\x4e\x18\x9e\x5e\x6f\x4a\xfb\x3b\x00\x00\xff\xff\x5f\xf8\x02\x7b\x65\x0d\x00\x00") func configYamlBytes() ([]byte, error) { return bindataRead( @@ -83,7 +92,7 @@ func configYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config.yaml", size: 3191, mode: os.FileMode(420), modTime: time.Unix(1521253698, 0)} + info := bindataFileInfo{name: "config.yaml", size: 3429, mode: os.FileMode(420), modTime: time.Unix(1652704485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -182,6 +191,7 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ "config.yaml": &bintree{configYaml, map[string]*bintree{}}, }} @@ -232,4 +242,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - diff --git a/config/config.yaml b/config/config.yaml index db08499..16c30c4 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,6 +1,6 @@ metrics: # NSD Metrics -# Taken from https://www.nlnetlabs.nl/projects/nsd/nsd-control.8.html "STATISTIC COUNTERS" +# Taken from https://nsd.docs.nlnetlabs.nl/en/latest/manpages/nsd-control.html#statistics-counters num.queries: help: 'number of queries received (the tcp and udp queries added up).' type: counter @@ -43,6 +43,12 @@ metrics: num.tcp6: help: 'number of connections over TCP ip6.' type: counter + num.tls: + help: 'number of connections over TLS ip4. TLS queries are not part of num.tcp.' + type: counter + num.tls6: + help: 'number of connections over TLS ip6. TLS queries are not part of num.tcp6.' + type: counter num.answer_wo_aa: help: 'number of answers with NOERROR rcode and without AA flag, this includes the referrals.' type: counter diff --git a/go.sum b/go.sum index cf6e501..0b842e5 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,7 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -28,8 +29,10 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -76,11 +79,14 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From b1889589d6299a341e31195985c9c5606ddd957f Mon Sep 17 00:00:00 2001 From: User Kibab Date: Fri, 14 Apr 2023 19:08:44 +0200 Subject: [PATCH 2/6] Update for nsd 4.6.1 --- config/config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/config.yaml b/config/config.yaml index 16c30c4..0dd4d4e 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -61,6 +61,9 @@ metrics: num.raxfr: help: 'number of AXFR requests from clients (that got served with reply).' type: counter + num.rixfr: + help: 'number of IXFR requests from clients (that got served with reply).' + type: counter num.truncated: help: 'number of answers with TC flag set.' type: counter From de43771837fef5478d5c98b077edde19309f50e8 Mon Sep 17 00:00:00 2001 From: User Kibab Date: Fri, 14 Apr 2023 19:11:01 +0200 Subject: [PATCH 3/6] Fix whitespace --- go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/go.sum b/go.sum index 0cfd792..d25fa85 100644 --- a/go.sum +++ b/go.sum @@ -42,4 +42,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - From 0cbfedbd524e7ef32bb7a40e92fe6f9fb562fb86 Mon Sep 17 00:00:00 2001 From: User Kibab Date: Fri, 14 Apr 2023 19:12:45 +0200 Subject: [PATCH 4/6] Check in a new bindata.go --- bindata.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindata.go b/bindata.go index 8cd4517..e33342d 100644 --- a/bindata.go +++ b/bindata.go @@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x57\xc1\x6e\x1b\x37\x10\xbd\xeb\x2b\x06\xf1\x21\x09\x12\xaf\x2f\x85\x0f\xba\x19\x71\x5a\x14\x68\xed\xc0\x56\xd1\x1e\x04\x18\x14\x39\xab\x25\xcc\x25\x37\x33\xb3\x96\x94\xaf\x2f\x86\x5c\xd9\x56\xeb\x5d\xa9\xe8\xc9\x32\x87\x7c\xef\xf1\x71\x38\xc3\x6d\x51\xc8\x5b\x9e\xcf\xce\xe0\xe6\xfe\x1a\x7e\x2f\xff\xce\xce\x60\x61\x1e\x31\x42\x4d\xa9\x85\x46\xa4\xe3\xf9\xc5\x45\x64\x57\xb9\x64\xb9\x8a\x21\xa2\x04\xb3\xd2\x5f\x17\x18\x2f\x82\x11\x64\xb9\x68\x4d\xec\xcc\x1a\x59\x27\x9e\xdb\x14\x85\x52\xa8\x1a\x69\xc3\x19\x8b\x11\xcf\xe2\x2d\x9f\xdb\xd4\x47\x41\xe2\x19\x40\xec\xdb\xea\x7b\x8f\xe4\x91\xe7\x33\x00\x80\x06\x43\x37\x87\xf7\xb1\x6f\x57\x48\x90\x6a\x18\xa2\x40\x68\xd1\x3f\xa1\x83\x0f\xd2\x20\x88\xed\xc0\x44\x07\xbd\xeb\x9e\x67\x18\xe7\xd0\x41\xdf\x7d\xac\xde\x67\x28\xd9\x75\x38\x87\x81\x6c\x06\x20\xbe\xc5\x6a\x95\x92\x1c\x30\xf5\x9d\x8e\x83\x8f\xc0\x68\x53\x74\x0c\xec\xa3\x45\x50\x16\x46\x7a\x42\x82\x8d\x61\x60\x31\x24\xe8\x2a\xf8\xd3\x4b\x03\x35\x19\x2b\x3e\x45\x13\xf6\xab\x0e\x38\xd7\xa6\x5f\xe3\x9e\x11\x83\xe9\x18\xdd\x01\x69\xa6\x7c\xe1\x09\x86\x45\x19\x44\xb7\xd9\x25\x92\xcf\xaf\xf4\x0c\x94\xa7\x72\xb2\xff\x81\x95\x5b\x55\xce\xf3\xe3\x01\xa7\x06\xd4\xd0\x7c\x84\x2b\x48\x11\x74\x4a\x66\x5a\xed\x04\xa7\xd1\x5a\x6c\xdf\x04\x53\xf5\xd7\x37\xf7\xe0\x8c\x98\x95\xe1\xec\x63\x8b\x6d\xa2\xdd\x29\xc0\xdb\x9a\xdc\x28\x74\x81\x81\x3a\x11\xfc\x48\x11\x41\xc8\x44\xae\x91\x38\x1f\x7c\x4c\xe2\x6b\x3d\x75\x1f\x41\x61\xa0\xa3\x64\x91\xf9\x33\xe0\xd6\x86\xde\x21\xc3\xe2\xfe\xd7\x5f\xb2\xb0\x53\xa4\xd8\x14\x6b\xbf\x1e\x77\x4d\x25\x04\xcf\x02\xb5\x0f\xf8\x62\xde\x33\x99\x1a\xa1\xce\x2a\x4e\x46\xfc\x0f\xa4\x63\x0e\x94\x70\xde\xc2\x6b\x5f\x1f\xb1\x13\x90\x8d\xb7\x43\xd6\xe6\x1c\x55\x4f\x0e\x7d\x98\xa4\xd7\x7b\x87\x2e\x1e\xbb\x74\x1b\xcd\xbc\xaf\x7a\xc0\xb7\xdf\x16\x23\xd7\x6a\x0f\x85\x44\xc7\xd0\x1a\x6f\x1b\xa8\x8d\x0f\xe8\x0a\x6a\x67\x88\x71\x02\xb7\x77\xdd\x11\xcc\xa4\x9b\xff\xe3\xfa\x1b\xf8\xee\xa7\x69\xa0\xcb\xd3\x91\x2e\x27\x90\xc4\x8e\x49\xb2\x29\x46\xcc\x57\x74\x00\x5b\x7c\x39\x26\x4b\xec\xa8\xac\x11\xb4\x49\x69\x61\xec\x3c\xff\x0d\xf6\xdb\x7d\x96\x96\x7f\x3c\x17\x50\x42\xbd\x57\x7a\x2a\x92\x2b\x45\x51\x38\xcd\x78\xba\xfe\x4c\x79\x79\x12\xe5\xd4\x2e\x4d\xe4\x0d\xd2\xc3\x26\x3d\x18\x33\xc2\x5d\xa6\x0c\xe9\x7b\x73\xfb\xf5\xee\xee\xf6\x0e\xc8\x26\x87\xf9\x9e\xe8\x70\xea\x05\xae\xae\xa0\x0e\x66\xfd\x19\xa4\xf1\x5a\x48\x5e\x5d\x65\xc2\x1a\x89\x4c\xe0\x09\x21\xb4\x3d\x9e\xf2\x5a\xbd\x4a\xda\x17\xd4\xdc\xc3\x86\x2b\x30\xe5\xeb\x04\xf4\x7e\x73\x87\xd0\xb9\x3a\xb6\x5e\x8e\x63\x93\xd9\xd6\x63\xd8\x57\x7f\xfd\x7c\x07\x84\xdf\x7b\x64\xe1\xd2\xf9\x6d\xf0\x18\x85\xb5\xed\x1a\x81\x75\x92\x52\x71\x8a\x8b\xda\xae\xc2\x6e\xac\xe1\xe6\x9d\x50\x1f\xad\x91\x7f\xf4\xbf\x91\xa3\x5a\x7c\xc9\x07\x02\x8c\x32\x01\xe9\x28\x75\xdd\x28\xe0\xde\xf9\x2c\x77\x83\x84\x30\xcc\x87\x15\x5a\xd3\x73\xee\xb8\xbb\x7d\x15\x62\x13\xbd\xec\xc0\x36\x68\x1f\x47\x28\xb5\xf2\x57\xad\x61\xc1\x31\xd7\x4a\x30\x4f\xe4\xc1\x9d\x0a\x16\x0d\x32\xe6\xfc\x2e\xe3\x79\x83\x31\xc1\xbb\xc1\xde\xf3\x6d\x4d\xef\x00\xa3\xa8\xda\x29\x6a\x0e\xe6\x09\x47\x98\x73\xec\x14\xe2\xd3\x59\xcf\xf6\x0f\xc0\xe2\x60\xa3\x04\xc1\xac\x30\x30\x68\x83\x77\xda\xfb\x38\xb5\x9a\xcc\x6b\xdc\xc2\x93\x09\x3d\xea\x5b\xb1\x41\xb0\xa6\x93\x9e\x10\xd6\x94\xfa\x0e\x7c\x74\xb8\x05\x6e\x52\x1f\x1c\xb4\x46\x86\x44\x2d\xc3\xc3\xd3\x21\x03\x43\x34\x2d\x42\x1f\x1d\xd2\xc0\x34\xcb\x7f\x1e\x9e\x1f\xa6\xf9\xdc\x97\x95\x0a\x5d\x56\x1f\x96\x9b\x4f\x1f\x8b\x1f\xba\x70\xae\xb1\x07\x0d\xe5\xa1\x02\x50\xc2\x00\xe7\xf0\x1c\x98\xee\x71\xb9\x02\xe8\xc8\x2e\xaf\x18\xcf\xbe\x65\x95\x3a\x2d\x24\x23\x3a\x4a\xf0\x7f\x2b\x29\x30\x53\x2a\x6c\x30\xcc\x23\x22\x72\xec\x4d\x0d\x2f\x91\x93\xed\xc8\x4b\xa6\x94\xd0\x84\x1d\x34\xea\xc6\x4b\x64\xb4\x24\xe4\xfc\xb3\x86\xc8\xa3\x2b\x8a\x08\xa5\xa7\x08\x13\xde\x94\xd7\xd0\x87\xa5\xfb\xf4\x71\x79\xf8\x61\x51\x44\x95\xf8\xc3\x10\x79\x53\x59\x99\x32\x6d\x52\x63\xa2\xd3\xf2\xb1\xda\xbd\xfe\x4e\x18\x9e\x5e\x6f\x4a\xfb\x3b\x00\x00\xff\xff\x5f\xf8\x02\x7b\x65\x0d\x00\x00") +var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x57\xc1\x6e\xe3\x36\x10\xbd\xfb\x2b\x06\x9b\xc3\x26\xd8\x44\xb9\x14\x39\xf8\x16\x6c\xb6\xc5\x02\x6d\xb2\x48\x5c\xb4\x07\x03\x01\x45\x8e\x2c\x22\x14\xa9\x9d\x19\xc5\xf6\x7e\x7d\x41\x52\x4e\xe2\x36\x94\x5d\xb4\xa7\x38\x1c\xf2\xbd\xc7\x47\xce\x0c\xd5\xa1\x90\xd5\x3c\x9f\x9d\xc0\xed\xc3\x0d\xfc\x96\xff\x9d\x9d\xc0\x42\x3d\xa1\x87\x86\x42\x07\xad\x48\xcf\xf3\xcb\x4b\xcf\xa6\x32\x41\x73\xe5\x9d\x47\x71\xaa\x8e\xbf\x2e\xd1\x5f\x3a\x25\xc8\x72\xd9\x29\xdf\xab\x15\x72\x9c\x78\xa1\x83\x17\x0a\xae\x6a\xa5\x73\x27\x2c\x4a\x2c\x8b\xd5\x7c\xa1\xc3\xe0\x05\x89\x67\x00\x7e\xe8\xaa\xef\x03\x92\x45\x9e\xcf\x00\x00\x5a\x74\xfd\x1c\x3e\xfa\xa1\xab\x91\x20\x34\x30\x46\x81\x50\xa3\x7d\x46\x03\xa7\xd2\x22\x88\xee\x41\x79\x03\x83\xe9\x5f\x66\x28\x63\xd0\xc0\xd0\x9f\x55\x1f\x13\x94\x6c\x7b\x9c\xc3\x48\x36\x03\x10\xdb\x61\x55\x87\x20\x7b\x4c\x43\x1f\xc7\xc1\x7a\x60\xd4\xc1\x1b\x06\xb6\x5e\x23\x44\x16\x46\x7a\x46\x82\xb5\x62\x60\x51\x24\x68\x2a\xf8\xc3\x4a\x0b\x0d\x29\x2d\x36\x78\xe5\x76\xab\xf6\x38\x57\x6a\x58\xe1\x8e\x11\x9d\xea\x19\xcd\x1e\x69\xa2\x7c\xe5\x71\x8a\x25\x32\x48\xdc\x66\x1f\x48\xce\xdf\xe8\x19\x29\x8f\xe5\x64\xfb\x03\x2b\x53\x57\xc6\xf2\xd3\x1e\x67\x0c\x44\x43\xd3\x11\xd6\x10\x3c\xc4\x29\x89\xa9\xde\x0a\x4e\xa3\x75\xd8\xbd\x0b\x16\xd5\xdf\xdc\x3e\x80\x51\xa2\x6a\xc5\xc9\xc7\x0e\xbb\x40\xdb\x63\x80\x37\x0d\x99\x22\x74\x86\x81\x26\x10\xfc\x08\x1e\x41\x48\x79\x6e\x90\x38\x1d\xbc\x0f\x62\x9b\x78\xea\xd6\x43\x84\x81\x9e\x82\x46\xe6\x73\xc0\x8d\x76\x83\x41\x86\xc5\xc3\xd7\x5f\x92\xb0\x63\xa4\xe8\xe0\x1b\xbb\x2a\xbb\x16\x25\x38\xcb\x02\x8d\x75\xf8\x6a\xde\x0b\x59\x34\x22\x3a\x1b\x71\x12\xe2\xbf\x20\x2d\x39\x90\xc3\x69\x0b\x6f\x7d\x7d\xc2\x5e\x40\xd6\x56\x8f\xb7\x36\xdd\xd1\xe8\xc9\xbe\x0f\x93\xf4\x31\xef\xd0\xf8\x43\x49\xb7\x8e\x37\xef\x4b\x3c\xe0\xbb\x6f\x8b\x42\x5a\xed\xa0\x90\xe8\x10\x5a\x6b\x75\x0b\x8d\xb2\x0e\x4d\x46\xed\x15\x31\x4e\xe0\x0e\xa6\x3f\x80\x19\xe2\xe6\x7f\xbf\xf9\x06\xb6\xff\x69\x1a\xe8\xea\x78\xa4\xab\x09\x24\xd1\x25\x49\x3a\x78\x8f\x29\x45\x47\xb0\xc5\xe7\x43\xb2\x44\x17\x65\x15\xd0\x26\xa5\xb9\xd2\x79\xfe\x13\xec\xd7\x87\x24\x2d\xfd\x78\x29\xa0\x84\x31\xaf\xe2\xa9\x48\xaa\x14\x59\xe1\x34\xe3\xf1\xfa\x13\xe5\xd5\x51\x94\x53\xbb\x54\x9e\xd7\x48\x8f\xeb\xf0\xa8\x54\x81\x3b\x4f\x19\xaf\xef\xed\xdd\x97\xfb\xfb\xbb\x7b\x20\x1d\x0c\xa6\x3c\x89\xc3\x61\x10\xb8\xbe\x86\xc6\xa9\xd5\x39\x48\x6b\x63\x21\x79\x93\xca\x84\x0d\x12\x29\xc7\x13\x42\x68\x73\xf8\xca\xc7\xea\x95\xaf\x7d\x46\x4d\x3d\x6c\x4c\x81\x29\x5f\x27\xa0\x77\x9b\xdb\x87\x4e\xd5\xb1\xb3\x72\x18\x9b\xd4\xa6\x29\x61\x5f\xff\xf9\xf3\x3d\x10\x7e\x1f\x90\x85\x73\xe7\xd7\xce\xa2\x17\x8e\x6d\x57\x09\xac\x82\xe4\x8a\x93\x5d\x8c\xed\xca\x6d\x4b\x0d\x37\xb1\xd9\x32\xdb\xd7\xff\x9d\x4d\x68\xf0\x5a\xc9\xdf\xba\x6d\xe1\x62\x2c\x3e\xa7\xe3\x07\x46\x99\x80\x34\x14\xfa\xbe\x08\xb8\x3b\xe7\x24\x77\x8d\x84\x30\xce\x87\x1a\xb5\x1a\x38\xf5\xf7\xed\xae\xe6\xb1\xf2\x56\xb6\xa0\x5b\xd4\x4f\x05\xca\xd8\x67\xaa\x4e\xb1\x60\xc9\xb5\x1c\x4c\x13\x79\x74\xa7\x82\x45\x8b\x8c\x29\x9b\xf2\x78\xda\xa0\x0f\xf0\x61\xb4\xf7\x62\xd3\xd0\x07\x40\x2f\x51\xed\x14\x35\x3b\xf5\x8c\x05\xe6\x14\x3b\x86\xf8\x78\xd6\x93\xdd\x73\x33\x3b\xd8\x46\x02\xa7\x6a\x74\x0c\xf1\x39\x61\x62\xa7\xe5\xd0\xc5\xd4\x59\xe1\x06\x9e\x95\x1b\x30\xbe\x4c\x5b\x04\xad\x7a\x19\x08\x61\x45\x61\xe8\xc1\x7a\x83\x1b\xe0\x36\x0c\xce\x40\xa7\x64\x4c\x8b\x3c\x3c\x3e\x54\x12\x30\x78\xd5\x21\x0c\xde\x20\x8d\x4c\xb3\xf4\xe7\xf1\xe5\x19\x9c\xce\x7d\x59\x45\xa1\xcb\xea\x74\xb9\xfe\x74\x96\xfd\x88\x0b\xe7\x31\xf6\x18\x43\x69\x28\x03\xe4\x30\xc0\x05\xbc\x04\xa6\x3b\x6a\xaa\x37\x71\x64\x9b\x56\x94\x6f\xdf\xb2\x0a\x7d\x2c\x5b\x05\x1d\x39\xf8\x9f\x95\x64\x98\x29\x15\xda\x29\xe6\x82\x88\x14\x7b\x57\xc3\x6b\xe4\x68\x3b\xd2\x92\x29\x25\x34\x61\x07\x15\xdd\x78\x8d\x14\x4b\x42\xba\x7f\x5a\x11\x59\x34\x59\x11\xa1\x0c\xe4\x61\xc2\x9b\xfc\xf6\x3a\x5d\x9a\x4f\x67\xcb\xfd\xcf\x98\x2c\x2a\xc7\x1f\xc7\xc8\xbb\xca\xf2\x94\x69\x93\x5a\xe5\x4d\x2c\x1f\xf5\xf6\xed\x57\xc9\xf8\xd0\x7b\x57\xda\x5f\x01\x00\x00\xff\xff\xf9\xee\xd4\x6d\xd3\x0d\x00\x00") func configYamlBytes() ([]byte, error) { return bindataRead( @@ -92,7 +92,7 @@ func configYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config.yaml", size: 3429, mode: os.FileMode(420), modTime: time.Unix(1652704485, 0)} + info := bindataFileInfo{name: "config.yaml", size: 3539, mode: os.FileMode(420), modTime: time.Unix(1681491650, 0)} a := &asset{bytes: bytes, info: info} return a, nil } From 95c7170631dc735d76e933c81b058e0fd7ddb2c7 Mon Sep 17 00:00:00 2001 From: User Kibab Date: Fri, 16 Aug 2024 14:02:34 +0200 Subject: [PATCH 5/6] Added new metrics from NSD 4.9.0 --- config/config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/config.yaml b/config/config.yaml index 0dd4d4e..b531335 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -76,6 +76,12 @@ metrics: zone.slave: help: 'number of slave zones served. These are zones with "request-xfr" entries.' type: counter + zone.primary: + help: 'number of primary zones served. These are zones with no "request-xfr" entries. Same as zone.master.' + type: counter + zone.secondary: + help: 'number of secondary zones served. These are zones with "request-xfr" entries. Same as zone.slave.' + type: counter # Metrics that have labels based on some regex value # The capture group index should match the index of the label name under labels label_metrics: From 07602cdb5aee497681691bbccff35de34fa71d31 Mon Sep 17 00:00:00 2001 From: User Kibab Date: Fri, 16 Aug 2024 14:03:13 +0200 Subject: [PATCH 6/6] Add a missing whitespace --- nsd_exporter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsd_exporter.go b/nsd_exporter.go index bf2162d..8f407e4 100644 --- a/nsd_exporter.go +++ b/nsd_exporter.go @@ -85,7 +85,7 @@ func (c *NSDCollector) Collect(ch chan<- prometheus.Metric) { // Refetch metric m, ok = c.metrics[metricName] if !ok { - log.Println("Metric " + metricName + "not configured. Skipping") + log.Println("Metric " + metricName + " not configured. Skipping") } continue }