Add TLS support for nsqd stats connections.

This commit is contained in:
Marcus Barczak
2017-11-29 08:18:52 -08:00
parent 34a11d6135
commit db85b3fcb4
3 changed files with 40 additions and 8 deletions

View File

@ -1,6 +1,10 @@
package collector
import (
"crypto/tls"
"crypto/x509"
"io/ioutil"
"net/http"
"sync"
"time"
@ -19,11 +23,12 @@ type NsqExecutor struct {
collectors []StatsCollector
summary *prometheus.SummaryVec
client *http.Client
mutex sync.RWMutex
}
// NewNsqExecutor creates a new executor for collecting NSQ metrics.
func NewNsqExecutor(namespace, nsqdURL string) *NsqExecutor {
func NewNsqExecutor(namespace, nsqdURL, tlsCACert, tlsCert, tlsKey string) (*NsqExecutor, error) {
sum := prometheus.NewSummaryVec(prometheus.SummaryOpts{
Namespace: namespace,
Subsystem: "exporter",
@ -31,10 +36,33 @@ func NewNsqExecutor(namespace, nsqdURL string) *NsqExecutor {
Help: "Duration of a scrape job of the NSQ exporter",
}, []string{"result"})
prometheus.MustRegister(sum)
transport := &http.Transport{}
if tlsCert != "" && tlsKey != "" {
cert, err := tls.LoadX509KeyPair(tlsCert, tlsKey)
if err != nil {
return nil, err
}
caCertPool := x509.NewCertPool()
if tlsCACert != "" {
caCert, err := ioutil.ReadFile(tlsCACert)
if err != nil {
return nil, err
}
caCertPool.AppendCertsFromPEM(caCert)
}
tlsConfig := &tls.Config{
Certificates: []tls.Certificate{cert},
RootCAs: caCertPool,
}
tlsConfig.BuildNameToCertificate()
transport.TLSClientConfig = tlsConfig
}
return &NsqExecutor{
nsqdURL: nsqdURL,
summary: sum,
}
client: &http.Client{Transport: transport},
}, nil
}
// Use configures a specific stats collector, so the stats could be
@ -63,7 +91,7 @@ func (e *NsqExecutor) Collect(out chan<- prometheus.Metric) {
c.reset()
}
stats, err := getNsqdStats(e.nsqdURL)
stats, err := getNsqdStats(e.client, e.nsqdURL)
tScrape := time.Since(start).Seconds()
result := "success"

View File

@ -84,9 +84,8 @@ func getPercentile(t *topic, percentile int) float64 {
return 0
}
func getNsqdStats(nsqdURL string) (*stats, error) {
resp, err := http.Get(nsqdURL)
func getNsqdStats(client *http.Client, nsqdURL string) (*stats, error) {
resp, err := client.Get(nsqdURL)
if err != nil {
return nil, err
}

View File

@ -22,6 +22,9 @@ var (
nsqdURL = flag.String("nsqd.addr", "http://localhost:4151/stats", "Address of the nsqd node.")
enabledCollectors = flag.String("collect", "stats.topics,stats.channels", "Comma-separated list of collectors to use.")
namespace = flag.String("namespace", "nsq", "Namespace for the NSQ metrics.")
tlsCACert = flag.String("tls.ca_cert", "", "CA certificate file to be used for nsqd connections.")
tlsCert = flag.String("tls.cert", "", "TLS certificate file to be used for client connections to nsqd.")
tlsKey = flag.String("tls.key", "", "TLS key file to be used for TLS client connections to nsqd.")
statsRegistry = map[string]func(namespace string) collector.StatsCollector{
"topics": collector.TopicStats,
@ -60,13 +63,15 @@ func main() {
}
func createNsqExecutor() (*collector.NsqExecutor, error) {
nsqdURL, err := normalizeURL(*nsqdURL)
if err != nil {
return nil, err
}
ex := collector.NewNsqExecutor(*namespace, nsqdURL)
ex, err := collector.NewNsqExecutor(*namespace, nsqdURL, *tlsCACert, *tlsCert, *tlsKey)
if err != nil {
log.Fatal(err)
}
for _, param := range strings.Split(*enabledCollectors, ",") {
param = strings.TrimSpace(param)
parts := strings.SplitN(param, ".", 2)