github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8338 from prometheus/release-2.24 

Merge release back (or forward?) into master.
pull/8339/head
Björn Rabenstein 2021-01-04 18:13:09 +01:00 committed by GitHub
parent 19b0ec3baf de4fbed840
commit 997bb7134f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
discovery/dns/dns.go
View File

@ -213,6 +213,7 @@ func (d *Discovery) refreshOne(ctx context.Context, name string, ch chan<- *targ
target = hostPort(addr.AAAA.String(), d.port) target = hostPort(addr.AAAA.String(), d.port)
case *dns.CNAME: case *dns.CNAME:
// CNAME responses can occur with "Type: A" dns_sd_config requests. // CNAME responses can occur with "Type: A" dns_sd_config requests.
continue
default: default:
level.Warn(d.logger).Log("msg", "Invalid record", "record", record) level.Warn(d.logger).Log("msg", "Invalid record", "record", record)
continue continue

8
docs/configuration/https.md
View File

@ -1,3 +1,8 @@
---
title: HTTPS and authentication
sort_rank: 7
---
# HTTPS and authentication # HTTPS and authentication
Prometheus supports basic authentication and TLS. Prometheus supports basic authentication and TLS.
@ -27,7 +32,8 @@ tls_server_config:
key_file: <filename> key_file: <filename>
# Server policy for client authentication. Maps to ClientAuth Policies. # 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: <string> | default = "NoClientCert" ] [ client_auth_type: <string> | default = "NoClientCert" ]
# CA certificate for client certificate authentication to the server. # CA certificate for client certificate authentication to the server.