feat: Harvest should include a user agent

cmd/collectors/storagegrid/rest/client.go

@@ -11,6 +11,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/conf"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/logging"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
 	"github.com/tidwall/gjson"
 	"io"
@@ -230,7 +231,7 @@ func (c *Client) getRest(request string) ([]byte, error) {
 		return nil, fmt.Errorf("failed to unescape %s err: %w", request, err)
 	}
 
-	c.request, err = http.NewRequest("GET", u, nil)
+	c.request, err = requests.New("GET", u, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -392,7 +393,7 @@ func (c *Client) fetchTokenWithAuthRetry() error {
 			return err
 		}
 
-		req, err = http.NewRequest("POST", u, bytes.NewBuffer(postBody))
+		req, err = requests.New("POST", u, bytes.NewBuffer(postBody))
 		if err != nil {
 			return err
 		}

cmd/exporters/influxdb/influxdb.go

@@ -11,6 +11,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/color"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"io"
 	"net/http"
 	url2 "net/url"
@@ -204,7 +205,7 @@ func (e *InfluxDB) Emit(data [][]byte) error {
 
 	buffer = bytes.NewBuffer(bytes.Join(data, []byte("\n")))
 
-	if request, err = http.NewRequest("POST", e.url, buffer); err != nil {
+	if request, err = requests.New("POST", e.url, buffer); err != nil {
 		return err
 	}
 

cmd/poller/poller.go

@@ -51,6 +51,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/logging"
 	"github.com/netapp/harvest/v2/pkg/matrix"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
 	"github.com/netapp/harvest/v2/pkg/util"
 	"github.com/rs/zerolog/log"
@@ -1029,7 +1030,7 @@ func (p *Poller) publishDetails() {
 	if heartBeatURL == "" {
 		heartBeatURL = defaultURL
 	}
-	req, err := http.NewRequest("PUT", heartBeatURL, bytes.NewBuffer(payload))
+	req, err := requests.New("PUT", heartBeatURL, bytes.NewBuffer(payload))
 	if err != nil {
 		logger.Err(err).Msg("failed to connect to admin")
 		return

cmd/tools/grafana/grafana.go

@@ -13,6 +13,7 @@ import (
 	goversion "github.com/hashicorp/go-version"
 	"github.com/netapp/harvest/v2/cmd/harvest/version"
 	"github.com/netapp/harvest/v2/pkg/conf"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"github.com/netapp/harvest/v2/pkg/util"
 	"github.com/spf13/cobra"
 	"github.com/tidwall/gjson"
@@ -958,9 +959,9 @@ func doRequest(opts *options, method, url string, query map[string]interface{})
 			return nil, status, code, err
 		}
 		buf = bytes.NewBuffer(data)
-		request, err = http.NewRequest(method, opts.addr+url, buf)
+		request, err = requests.New(method, opts.addr+url, buf)
 	} else {
-		request, err = http.NewRequest(method, opts.addr+url, nil)
+		request, err = requests.New(method, opts.addr+url, nil)
 	}
 
 	if err != nil {

cmd/tools/rest/client.go

@@ -12,6 +12,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/conf"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/logging"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
 	"github.com/netapp/harvest/v2/pkg/util"
 	"github.com/tidwall/gjson"
@@ -185,7 +186,7 @@ func (c *Client) GetRest(request string) ([]byte, error) {
 		return nil, err
 	}
 	u := c.baseURL + request
-	c.request, err = http.NewRequest("GET", u, nil)
+	c.request, err = requests.New("GET", u, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -308,7 +309,7 @@ func downloadSwagger(poller *conf.Poller, path string, url string, verbose bool)
 		return 0, fmt.Errorf("unable to create %s to save swagger.yaml", path)
 	}
 	defer func(out *os.File) { _ = out.Close() }(out)
-	request, err := http.NewRequest("GET", url, nil)
+	request, err := requests.New("GET", url, nil)
 	if err != nil {
 		return 0, err
 	}

integration/test/utils/http_utils.go

@@ -2,9 +2,9 @@ package utils
 
 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"io"
 	"log"
 	"net/http"
@@ -40,7 +40,7 @@ func GetResponseBody(url string) ([]byte, error) {
 func SendReqAndGetRes(url string, method string,
 	buf []byte) map[string]interface{} {
 	client := &http.Client{}
-	req, err := http.NewRequest(method, url, bytes.NewBuffer(buf))
+	req, err := requests.New(method, url, bytes.NewBuffer(buf))
 	if err != nil {
 		fmt.Println(err)
 		panic(err)
@@ -57,26 +57,3 @@ func SendReqAndGetRes(url string, method string,
 	PanicIfNotNil(err)
 	return data
 }
-
-func SendPostReqAndGetRes(url string, method string, buf []byte, user string, pass string) map[string]interface{} {
-	tlsConfig := &tls.Config{InsecureSkipVerify: true} //nolint:gosec
-	client := &http.Client{
-		Transport: &http.Transport{TLSClientConfig: tlsConfig},
-	}
-	req, err := http.NewRequest(method, url, bytes.NewBuffer(buf))
-	if err != nil {
-		fmt.Println(err)
-		panic(err)
-	}
-	req.Header.Add("Content-Type", "application/json")
-	req.SetBasicAuth(user, pass)
-	res, err := client.Do(req)
-	PanicIfNotNil(err)
-	defer res.Body.Close()
-	body, err := io.ReadAll(res.Body)
-	PanicIfNotNil(err)
-	var data map[string]interface{}
-	err = json.Unmarshal(body, &data)
-	PanicIfNotNil(err)
-	return data
-}

pkg/api/ontapi/zapi/client.go

@@ -14,6 +14,7 @@ import (
 	"github.com/netapp/harvest/v2/pkg/conf"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/logging"
+	"github.com/netapp/harvest/v2/pkg/requests"
 	"github.com/netapp/harvest/v2/pkg/tree"
 	"github.com/netapp/harvest/v2/pkg/tree/node"
 	"io"
@@ -90,7 +91,7 @@ func New(poller *conf.Poller, c *auth.Credentials) (*Client, error) {
 	}
 
 	// create a request object that will be used for later requests
-	if request, err = http.NewRequest("POST", url, nil); err != nil {
+	if request, err = requests.New("POST", url, nil); err != nil {
 		return nil, err
 	}
 

pkg/requests/requests.go

@@ -0,0 +1,18 @@
+package requests
+
+import (
+	"github.com/netapp/harvest/v2/cmd/harvest/version"
+	"io"
+	"net/http"
+)
+
+func New(method, url string, body io.Reader) (*http.Request, error) {
+	request, err := http.NewRequest(method, url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	harvestUserAgent := "Harvest/" + version.VERSION
+	request.Header.Set("User-Agent", harvestUserAgent)
+	return request, nil
+}