CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(outputs.prometheus_client): Add secretstore support for basic_password (#13899)

This commit is contained in:
Yonathan Amir 2023-09-11 17:36:24 +03:00 committed by GitHub
parent 3fae6439ab
commit a057e5b298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/outputs/prometheus_client/README.md
View File

@ -12,6 +12,14 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
[CONFIGURATION.md]: ../../../docs/CONFIGURATION.md#plugins [CONFIGURATION.md]: ../../../docs/CONFIGURATION.md#plugins
## Secret-store support
This plugin supports secrets from secret-stores for the `basic_password` option.
See the [secret-store documentation][SECRETSTORE] for more details on how
to use them.
[SECRETSTORE]: ../../../docs/CONFIGURATION.md#secret-store-secrets
## Configuration ## Configuration
```toml @sample.conf ```toml @sample.conf

15
plugins/outputs/prometheus_client/prometheus_client.go
View File

@ -49,7 +49,7 @@ type PrometheusClient struct {
WriteTimeout config.Duration `toml:"write_timeout"` WriteTimeout config.Duration `toml:"write_timeout"`
MetricVersion int `toml:"metric_version"` MetricVersion int `toml:"metric_version"`
BasicUsername string `toml:"basic_username"` BasicUsername string `toml:"basic_username"`
BasicPassword string `toml:"basic_password"` BasicPassword config.Secret `toml:"basic_password"`
IPRange []string `toml:"ip_range"` IPRange []string `toml:"ip_range"`
ExpirationInterval config.Duration `toml:"expiration_interval"` ExpirationInterval config.Duration `toml:"expiration_interval"`
Path string `toml:"path"` Path string `toml:"path"`
@ -57,9 +57,9 @@ type PrometheusClient struct {
StringAsLabel bool `toml:"string_as_label"` StringAsLabel bool `toml:"string_as_label"`
ExportTimestamp bool `toml:"export_timestamp"` ExportTimestamp bool `toml:"export_timestamp"`
TypeMappings serializer.MetricTypes `toml:"metric_types"` TypeMappings serializer.MetricTypes `toml:"metric_types"`
tlsint.ServerConfig Log telegraf.Logger `toml:"-"`
Log telegraf.Logger `toml:"-"` tlsint.ServerConfig
server *http.Server server *http.Server
url *url.URL url *url.URL
@ -140,7 +140,14 @@ func (p *PrometheusClient) Init() error {
ipRange = append(ipRange, ipNet) ipRange = append(ipRange, ipNet)
} }
authHandler := internal.BasicAuthHandler(p.BasicUsername, p.BasicPassword, "prometheus", onAuthError) password, err := p.BasicPassword.Get()
if err != nil {
return err
}
passwordStr := string(password)
defer config.ReleaseSecret(password)
authHandler := internal.BasicAuthHandler(p.BasicUsername, passwordStr, "prometheus", onAuthError)
rangeHandler := internal.IPRangeHandler(ipRange, onError) rangeHandler := internal.IPRangeHandler(ipRange, onError)
promHandler := promhttp.HandlerFor(registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}) promHandler := promhttp.HandlerFor(registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError})
landingPageHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { landingPageHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {