git.iko.soy/typeable/oauth2-proxy
on master help sign in
Fix metrics server (#1141)

* fix MetricsSecureAddress cfg tag * add metrics* flags to docs * update CHANGELOG

commit7ebeecb12879a312e7498c97fbdd13b8d8edf663 authorOliver <oliver006@users.noreply.github.com> dateThu 1 Apr 2021, 08:58 (6 years ago) parent3fc194e
3 files changed+6−2
compare with master
unifiedsplit
CHANGELOG.md+1 docs/versioned_docs/version-7.1.x/configuration/overview.md+4−1 pkg/apis/options/legacy_options.go+1−1
CHANGELOG.md+1
@@ -10,6 +10,7 @@
1010
1111- [#1129](https://github.com/oauth2-proxy/oauth2-proxy/pull/1129) Rewrite OpenRedirect tests in ginkgo (@JoelSpeed)
1212- [#1127](https://github.com/oauth2-proxy/oauth2-proxy/pull/1127) Remove unused fields from OAuthProxy (@JoelSpeed)
13+- [#1141](https://github.com/oauth2-proxy/oauth2-proxy/pull/1141) Fix metrics server bind address initialization
1314
1415# V7.1.1
1516
docs/versioned_docs/version-7.1.x/configuration/overview.md+4−1
@@ -92,7 +92,10 @@ An example [oauth2-proxy.cfg](https://github.com/oauth2-proxy/oauth2-proxy/blob/
9292| `--provider-display-name` | string | Override the provider's name with the given string; used for the sign-in page | (depends on provider) |
9393| `--ping-path` | string | the ping endpoint that can be used for basic health checks | `"/ping"` |
9494| `--ping-user-agent` | string | a User-Agent that can be used for basic health checks | `""` (don't check user agent) |
95−| `--metrics-address` | string | the address prometheus metrics will be scraped from | `""` |
95+| `--metrics-address` | string | the address /metrics will be served on | `""` |
96+| `--metrics-secure-address` | string | the address /metrics will be served on via HTTPS | `""` |
97+| `--metrics-tls-cert-file` | string | path to certificate file for secure metrics server | `""` |
98+| `--metrics-tls-key-file` | string | path to private key file for secure metrics server | `""` |
9699| `--proxy-prefix` | string | the url root path that this proxy should be nested under (e.g. /`<oauth2>/sign_in`) | `"/oauth2"` |
97100| `--proxy-websockets` | bool | enables WebSocket proxying | true |
98101| `--pubjwk-url` | string | JWK pubkey access endpoint: required by login.gov | |
pkg/apis/options/legacy_options.go+1−1
@@ -419,7 +419,7 @@ func getXAuthRequestAccessTokenHeader() Header {
419419
420420type LegacyServer struct {
421421 MetricsAddress string `flag:"metrics-address" cfg:"metrics_address"`
422− MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_address"`
422+ MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_secure_address"`
423423 MetricsTLSCertFile string `flag:"metrics-tls-cert-file" cfg:"tls_cert_file"`
424424 MetricsTLSKeyFile string `flag:"metrics-tls-key-file" cfg:"tls_key_file"`
425425 HTTPAddress string `flag:"http-address" cfg:"http_address"`