Skip to content

Commit

Permalink
Add TLS and http basic_auth to prometheus_client output (#3719)
Browse files Browse the repository at this point in the history
  • Loading branch information
phlipse authored and danielnelson committed Feb 1, 2018
1 parent ec8e923 commit a263557
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 7 deletions.
8 changes: 8 additions & 0 deletions plugins/outputs/prometheus_client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ This plugin starts a [Prometheus](https://prometheus.io/) Client, it exposes all
# Address to listen on
listen = ":9273"
# Use TLS
tls_cert = "/etc/ssl/telegraf.crt"
tls_key = "/etc/ssl/telegraf.key"
# Use http basic authentication
basic_username = "Foo"
basic_password = "Bar"
# Path to publish the metrics on, defaults to /metrics
path = "/metrics"
Expand Down
50 changes: 43 additions & 7 deletions plugins/outputs/prometheus_client/prometheus_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package prometheus_client

import (
"context"
"crypto/subtle"
"fmt"
"log"
"net/http"
Expand Down Expand Up @@ -53,6 +54,10 @@ type MetricFamily struct {

type PrometheusClient struct {
Listen string
TLSCert string `toml:"tls_cert"`
TLSKey string `toml:"tls_key"`
BasicUsername string `toml:"basic_username"`
BasicPassword string `toml:"basic_password"`
ExpirationInterval internal.Duration `toml:"expiration_interval"`
Path string `toml:"path"`
CollectorsExclude []string `toml:"collectors_exclude"`
Expand All @@ -70,6 +75,14 @@ var sampleConfig = `
## Address to listen on
# listen = ":9273"
## Use TLS
#tls_cert = "/etc/ssl/telegraf.crt"
#tls_key = "/etc/ssl/telegraf.key"
## Use http basic authentication
#basic_username = "Foo"
#basic_password = "Bar"
## Interval to expire metrics and not deliver to prometheus, 0 == no expiration
# expiration_interval = "60s"
Expand All @@ -78,6 +91,24 @@ var sampleConfig = `
collectors_exclude = ["gocollector", "process"]
`

func (p *PrometheusClient) basicAuth(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if p.BasicUsername != "" && p.BasicPassword != "" {
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)

username, password, ok := r.BasicAuth()
if !ok ||
subtle.ConstantTimeCompare([]byte(username), []byte(p.BasicUsername)) != 1 ||
subtle.ConstantTimeCompare([]byte(password), []byte(p.BasicPassword)) != 1 {
http.Error(w, "Not authorized", 401)
return
}
}

h.ServeHTTP(w, r)
})
}

func (p *PrometheusClient) Start() error {
defaultCollectors := map[string]bool{
"gocollector": true,
Expand Down Expand Up @@ -110,22 +141,27 @@ func (p *PrometheusClient) Start() error {
}

mux := http.NewServeMux()
mux.Handle(p.Path, promhttp.HandlerFor(
registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
mux.Handle(p.Path, p.basicAuth(promhttp.HandlerFor(
registry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError})))

p.server = &http.Server{
Addr: p.Listen,
Handler: mux,
}

go func() {
if err := p.server.ListenAndServe(); err != nil {
if err != http.ErrServerClosed {
log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
err.Error())
}
var err error
if p.TLSCert != "" && p.TLSKey != "" {
err = p.server.ListenAndServeTLS(p.TLSCert, p.TLSKey)
} else {
err = p.server.ListenAndServe()
}
if err != nil && err != http.ErrServerClosed {
log.Printf("E! Error creating prometheus metric endpoint, err: %s\n",
err.Error())
}
}()

return nil
}

Expand Down

0 comments on commit a263557

Please sign in to comment.