From c04284ff90435dfe99219a4c3810b7a759173d52 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Mon, 4 Jan 2021 01:11:02 +0100 Subject: [PATCH 1/3] Add https and authentication to the navbar Signed-off-by: Julien Pivotto --- docs/configuration/https.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/configuration/https.md b/docs/configuration/https.md index 157df84d83..9df1fe4c9f 100644 --- a/docs/configuration/https.md +++ b/docs/configuration/https.md @@ -1,3 +1,8 @@ +--- +title: HTTPS and authentication +sort_rank: 7 +--- + # HTTPS and authentication Prometheus supports basic authentication and TLS. From 438ab463ad7a4f8be398bad9d882e7b53d3425ac Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Mon, 4 Jan 2021 01:12:21 +0100 Subject: [PATCH 2/3] Fix link in documentation Signed-off-by: Julien Pivotto --- docs/configuration/https.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/configuration/https.md b/docs/configuration/https.md index 9df1fe4c9f..bc95e9be20 100644 --- a/docs/configuration/https.md +++ b/docs/configuration/https.md @@ -32,7 +32,8 @@ tls_server_config: key_file: # Server policy for client authentication. Maps to ClientAuth Policies. - # For more detail on clientAuth options: [ClientAuthType](https://golang.org/pkg/crypto/tls/#ClientAuthType) + # For more detail on clientAuth options: + # https://golang.org/pkg/crypto/tls/#ClientAuthType [ client_auth_type: | default = "NoClientCert" ] # CA certificate for client certificate authentication to the server. From 31e86ed4bcaf26639fbc8c5b83b22e9db6ba7a71 Mon Sep 17 00:00:00 2001 From: Matt Berther Date: Sun, 3 Jan 2021 16:08:27 -0700 Subject: [PATCH 3/3] prevent adding empty target when CNAME is encountered Signed-off-by: Matt Berther --- discovery/dns/dns.go | 1 + 1 file changed, 1 insertion(+) diff --git a/discovery/dns/dns.go b/discovery/dns/dns.go index 9aa07dcaee..7b388ca71d 100644 --- a/discovery/dns/dns.go +++ b/discovery/dns/dns.go @@ -213,6 +213,7 @@ func (d *Discovery) refreshOne(ctx context.Context, name string, ch chan<- *targ target = hostPort(addr.AAAA.String(), d.port) case *dns.CNAME: // CNAME responses can occur with "Type: A" dns_sd_config requests. + continue default: level.Warn(d.logger).Log("msg", "Invalid record", "record", record) continue