From 9b3523a91b7f868770623b820cb62f43120fc876 Mon Sep 17 00:00:00 2001
From: frizner <frizner@gmail.com>
Date: Fri, 10 May 2019 19:20:37 -0400
Subject: [PATCH] Add support for HTTP basic auth to solr input (#5832)

---
 plugins/inputs/solr/README.md |  4 ++++
 plugins/inputs/solr/solr.go   | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/solr/README.md b/plugins/inputs/solr/README.md
index 67f4e06ae..458572825 100644
--- a/plugins/inputs/solr/README.md
+++ b/plugins/inputs/solr/README.md
@@ -16,6 +16,10 @@ Tested from 3.5 to 7.*
   ##
   ## specify a list of one or more Solr cores (default - all)
   # cores = ["main"]
+  ##
+  ## Optional HTTP Basic Auth Credentials
+  # username = "username"
+  # password = "pa$$word"
 ```
 
 ### Example output of gathered metrics:
diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go
index 9b5ce9299..a9257c987 100644
--- a/plugins/inputs/solr/solr.go
+++ b/plugins/inputs/solr/solr.go
@@ -28,12 +28,18 @@ const sampleConfig = `
 
   ## specify a list of one or more Solr cores (default - all)
   # cores = ["main"]
+
+  ## Optional HTTP Basic Auth Credentials
+  # username = "username"
+  # password = "pa$$word"
 `
 
 // Solr is a plugin to read stats from one or many Solr servers
 type Solr struct {
 	Local       bool
 	Servers     []string
+	Username    string
+	Password    string
 	HTTPTimeout internal.Duration
 	Cores       []string
 	client      *http.Client
@@ -471,7 +477,18 @@ func (s *Solr) createHTTPClient() *http.Client {
 }
 
 func (s *Solr) gatherData(url string, v interface{}) error {
-	r, err := s.client.Get(url)
+	req, reqErr := http.NewRequest(http.MethodGet, url, nil)
+	if reqErr != nil {
+		return reqErr
+	}
+
+	if s.Username != "" {
+		req.SetBasicAuth(s.Username, s.Password)
+	}
+
+	req.Header.Set("User-Agent", "Telegraf/"+internal.Version())
+
+	r, err := s.client.Do(req)
 	if err != nil {
 		return err
 	}