mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-13 06:47:28 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

DNS SD: add srv record target and port meta labels (#7678)

Browse source 
* DNS SD: add srv record target and port meta labels

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
This commit is contained in:
Julien Pivotto 2020-07-28 22:09:01 +02:00 committed by GitHub
parent 348ff4285f
commit 88bdb13c55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
discovery/dns/dns.go
View file

@ -36,6 +36,9 @@ const (
resolvConf = "/etc/resolv.conf" resolvConf = "/etc/resolv.conf"
dnsNameLabel = model.MetaLabelPrefix + "dns_name" dnsNameLabel = model.MetaLabelPrefix + "dns_name"
dnsSrvRecordPrefix = model.MetaLabelPrefix + "dns_srv_record_"
dnsSrvRecordTargetLabel = dnsSrvRecordPrefix + "target"
dnsSrvRecordPortLabel = dnsSrvRecordPrefix + "port"
// Constants for instrumentation. // Constants for instrumentation.
namespace = "prometheus" namespace = "prometheus"
@ -183,9 +186,13 @@ func (d *Discovery) refreshOne(ctx context.Context, name string, ch chan<- *targ
} }
for _, record := range response.Answer { for _, record := range response.Answer {
var target model.LabelValue var target, dnsSrvRecordTarget, dnsSrvRecordPort model.LabelValue
switch addr := record.(type) { switch addr := record.(type) {
case *dns.SRV: case *dns.SRV:
dnsSrvRecordTarget = model.LabelValue(addr.Target)
dnsSrvRecordPort = model.LabelValue(fmt.Sprintf("%d", addr.Port))
// Remove the final dot from rooted DNS names to make them look more usual. // Remove the final dot from rooted DNS names to make them look more usual.
addr.Target = strings.TrimRight(addr.Target, ".") addr.Target = strings.TrimRight(addr.Target, ".")
@ -201,6 +208,8 @@ func (d *Discovery) refreshOne(ctx context.Context, name string, ch chan<- *targ
tg.Targets = append(tg.Targets, model.LabelSet{ tg.Targets = append(tg.Targets, model.LabelSet{
model.AddressLabel: target, model.AddressLabel: target,
dnsNameLabel: model.LabelValue(name), dnsNameLabel: model.LabelValue(name),
dnsSrvRecordTargetLabel: dnsSrvRecordTarget,
dnsSrvRecordPortLabel: dnsSrvRecordPort,
}) })
} }

35
discovery/dns/dns_test.go
View file

@ -75,7 +75,12 @@ func TestDNS(t *testing.T) {
{ {
Source: "web.example.com.", Source: "web.example.com.",
Targets: []model.LabelSet{ Targets: []model.LabelSet{
{"__address__": "192.0.2.2:80", "__meta_dns_name": "web.example.com."}, {
"__address__": "192.0.2.2:80",
"__meta_dns_name": "web.example.com.",
"__meta_dns_srv_record_target": "",
"__meta_dns_srv_record_port": "",
},
}, },
}, },
}, },
@ -100,7 +105,12 @@ func TestDNS(t *testing.T) {
{ {
Source: "web.example.com.", Source: "web.example.com.",
Targets: []model.LabelSet{ Targets: []model.LabelSet{
{"__address__": "[::1]:80", "__meta_dns_name": "web.example.com."}, {
"__address__": "[::1]:80",
"__meta_dns_name": "web.example.com.",
"__meta_dns_srv_record_target": "",
"__meta_dns_srv_record_port": "",
},
}, },
}, },
}, },
@ -125,8 +135,18 @@ func TestDNS(t *testing.T) {
{ {
Source: "_mysql._tcp.db.example.com.", Source: "_mysql._tcp.db.example.com.",
Targets: []model.LabelSet{ Targets: []model.LabelSet{
{"__address__": "db1.example.com:3306", "__meta_dns_name": "_mysql._tcp.db.example.com."}, {
{"__address__": "db2.example.com:3306", "__meta_dns_name": "_mysql._tcp.db.example.com."}, "__address__": "db1.example.com:3306",
"__meta_dns_name": "_mysql._tcp.db.example.com.",
"__meta_dns_srv_record_target": "db1.example.com.",
"__meta_dns_srv_record_port": "3306",
},
{
"__address__": "db2.example.com:3306",
"__meta_dns_name": "_mysql._tcp.db.example.com.",
"__meta_dns_srv_record_target": "db2.example.com.",
"__meta_dns_srv_record_port": "3306",
},
}, },
}, },
}, },
@ -150,7 +170,12 @@ func TestDNS(t *testing.T) {
{ {
Source: "_mysql._tcp.db.example.com.", Source: "_mysql._tcp.db.example.com.",
Targets: []model.LabelSet{ Targets: []model.LabelSet{
{"__address__": "db1.example.com:3306", "__meta_dns_name": "_mysql._tcp.db.example.com."}, {
"__address__": "db1.example.com:3306",
"__meta_dns_name": "_mysql._tcp.db.example.com.",
"__meta_dns_srv_record_target": "db1.example.com.",
"__meta_dns_srv_record_port": "3306",
},
}, },
}, },
}, },

8
docs/configuration/configuration.md
View file

@ -589,9 +589,11 @@ This service discovery method only supports basic DNS A, AAAA and SRV record
queries, but not the advanced DNS-SD approach specified in queries, but not the advanced DNS-SD approach specified in
[RFC6763](https://tools.ietf.org/html/rfc6763). [RFC6763](https://tools.ietf.org/html/rfc6763).
During the [relabeling phase](#relabel_config), the meta label The following meta labels are available on targets during [relabeling](#relabel_config):
`__meta_dns_name` is available on each target and is set to the
record name that produced the discovered target. * `__meta_dns_name`: the record name that produced the discovered target.
* `__meta_dns_srv_record_target`: the target field of the SRV record
* `__meta_dns_srv_record_port`: the port field of the SRV record
```yaml ```yaml
# A list of DNS domain names to be queried. # A list of DNS domain names to be queried.