diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dc9305a..07ff5afb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#1129](https://github.com/oauth2-proxy/oauth2-proxy/pull/1129) Rewrite OpenRedirect tests in ginkgo (@JoelSpeed) - [#1127](https://github.com/oauth2-proxy/oauth2-proxy/pull/1127) Remove unused fields from OAuthProxy (@JoelSpeed) +- [#1141](https://github.com/oauth2-proxy/oauth2-proxy/pull/1141) Fix metrics server bind address initialization # V7.1.1 diff --git a/docs/versioned_docs/version-7.1.x/configuration/overview.md b/docs/versioned_docs/version-7.1.x/configuration/overview.md index 9c3ada21..b906210d 100644 --- a/docs/versioned_docs/version-7.1.x/configuration/overview.md +++ b/docs/versioned_docs/version-7.1.x/configuration/overview.md @@ -92,7 +92,10 @@ An example [oauth2-proxy.cfg](https://github.com/oauth2-proxy/oauth2-proxy/blob/ | `--provider-display-name` | string | Override the provider's name with the given string; used for the sign-in page | (depends on provider) | | `--ping-path` | string | the ping endpoint that can be used for basic health checks | `"/ping"` | | `--ping-user-agent` | string | a User-Agent that can be used for basic health checks | `""` (don't check user agent) | -| `--metrics-address` | string | the address prometheus metrics will be scraped from | `""` | +| `--metrics-address` | string | the address /metrics will be served on | `""` | +| `--metrics-secure-address` | string | the address /metrics will be served on via HTTPS | `""` | +| `--metrics-tls-cert-file` | string | path to certificate file for secure metrics server | `""` | +| `--metrics-tls-key-file` | string | path to private key file for secure metrics server | `""` | | `--proxy-prefix` | string | the url root path that this proxy should be nested under (e.g. /`/sign_in`) | `"/oauth2"` | | `--proxy-websockets` | bool | enables WebSocket proxying | true | | `--pubjwk-url` | string | JWK pubkey access endpoint: required by login.gov | | diff --git a/pkg/apis/options/legacy_options.go b/pkg/apis/options/legacy_options.go index 612db9e1..619069f3 100644 --- a/pkg/apis/options/legacy_options.go +++ b/pkg/apis/options/legacy_options.go @@ -419,7 +419,7 @@ func getXAuthRequestAccessTokenHeader() Header { type LegacyServer struct { MetricsAddress string `flag:"metrics-address" cfg:"metrics_address"` - MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_address"` + MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_secure_address"` MetricsTLSCertFile string `flag:"metrics-tls-cert-file" cfg:"tls_cert_file"` MetricsTLSKeyFile string `flag:"metrics-tls-key-file" cfg:"tls_key_file"` HTTPAddress string `flag:"http-address" cfg:"http_address"`