Fix lint warnings

influxdata · Jul 4, 2019 · 740f256 · 740f256
1 parent 67b9356
commit 740f256
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -139,7 +139,7 @@ const sampleConfig = `
 type Elasticsearch struct {
 	Local                      bool
 	Servers                    []string
-	HttpTimeout                internal.Duration
+	HTTPTimeout                internal.Duration
 	ClusterHealth              bool
 	ClusterHealthLevel         string
 	ClusterStats               bool
@@ -165,7 +165,7 @@ func (i serverInfo) isMaster() bool {
 // NewElasticsearch return a new instance of Elasticsearch
 func NewElasticsearch() *Elasticsearch {
 	return &Elasticsearch{
-		HttpTimeout:                internal.Duration{Duration: time.Second * 5},
+		HTTPTimeout:                internal.Duration{Duration: time.Second * 5},
 		ClusterStatsOnlyFromMaster: true,
 		ClusterHealthLevel:         "indices",
 	}
@@ -198,7 +198,7 @@ func (e *Elasticsearch) Description() string {
 // Accumulator.
 func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	if e.client == nil {
-		client, err := e.createHttpClient()
+		client, err := e.createHTTPClient()
 
 		if err != nil {
 			return err
@@ -246,7 +246,7 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	for _, serv := range e.Servers {
 		go func(s string, acc telegraf.Accumulator) {
 			defer wg.Done()
-			url := e.nodeStatsUrl(s)
+			url := e.nodeStatsURL(s)
 
 			// Always gather node stats
 			if err := e.gatherNodeStats(url, acc); err != nil {
@@ -292,30 +292,30 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
+func (e *Elasticsearch) createHTTPClient() (*http.Client, error) {
 	tlsCfg, err := e.ClientConfig.TLSConfig()
 	if err != nil {
 		return nil, err
 	}
 	tr := &http.Transport{
-		ResponseHeaderTimeout: e.HttpTimeout.Duration,
+		ResponseHeaderTimeout: e.HTTPTimeout.Duration,
 		TLSClientConfig:       tlsCfg,
 	}
 	client := &http.Client{
 		Transport: tr,
-		Timeout:   e.HttpTimeout.Duration,
+		Timeout:   e.HTTPTimeout.Duration,
 	}
 
 	return client, nil
 }
 
-func (e *Elasticsearch) nodeStatsUrl(baseUrl string) string {
+func (e *Elasticsearch) nodeStatsURL(baseURL string) string {
 	var url string
 
 	if e.Local {
-		url = baseUrl + statsPathLocal
+		url = baseURL + statsPathLocal
 	} else {
-		url = baseUrl + statsPath
+		url = baseURL + statsPath
 	}
 
 	if len(e.NodeStats) == 0 {
@@ -330,7 +330,7 @@ func (e *Elasticsearch) gatherNodeID(url string) (string, error) {
 		ClusterName string               `json:"cluster_name"`
 		Nodes       map[string]*nodeStat `json:"nodes"`
 	}{}
-	if err := e.gatherJsonData(url, nodeStats); err != nil {
+	if err := e.gatherJSONData(url, nodeStats); err != nil {
 		return "", err
 	}
 
@@ -346,7 +346,7 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 		ClusterName string               `json:"cluster_name"`
 		Nodes       map[string]*nodeStat `json:"nodes"`
 	}{}
-	if err := e.gatherJsonData(url, nodeStats); err != nil {
+	if err := e.gatherJSONData(url, nodeStats); err != nil {
 		return err
 	}
 
@@ -397,7 +397,7 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 
 func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator) error {
 	healthStats := &clusterHealth{}
-	if err := e.gatherJsonData(url, healthStats); err != nil {
+	if err := e.gatherJSONData(url, healthStats); err != nil {
 		return err
 	}
 	measurementTime := time.Now()
@@ -449,7 +449,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
 
 func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
 	clusterStats := &clusterStats{}
-	if err := e.gatherJsonData(url, clusterStats); err != nil {
+	if err := e.gatherJSONData(url, clusterStats); err != nil {
 		return err
 	}
 	now := time.Now()
@@ -484,7 +484,7 @@ func (e *Elasticsearch) gatherIndicesStats(url string, acc telegraf.Accumulator)
 		Indices map[string]indexStat   `json:"indices"`
 	}{}
 
-	if err := e.gatherJsonData(url, indicesStats); err != nil {
+	if err := e.gatherJSONData(url, indicesStats); err != nil {
 		return err
 	}
 	now := time.Now()
@@ -581,7 +581,7 @@ func (e *Elasticsearch) getCatMaster(url string) (string, error) {
 	return masterID, nil
 }
 
-func (e *Elasticsearch) gatherJsonData(url string, v interface{}) error {
+func (e *Elasticsearch) gatherJSONData(url string, v interface{}) error {
 	r, err := e.client.Get(url)
 	if err != nil {
 		return err

diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -70,7 +70,7 @@ func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
 	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
 	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
 	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_http", nodestatsHTTPExpected, tags)
 	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
 }
 
@@ -113,7 +113,7 @@ func TestGatherIndividualStats(t *testing.T) {
 	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
 	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
 	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
-	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
+	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_http", nodestatsHTTPExpected, tags)
 	acc.AssertDoesNotContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
 }
 

diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
@@ -1291,7 +1291,7 @@ var nodestatsTransportExpected = map[string]interface{}{
 	"tx_size_in_bytes": float64(1380),
 }
 
-var nodestatsHttpExpected = map[string]interface{}{
+var nodestatsHTTPExpected = map[string]interface{}{
 	"current_open": float64(3),
 	"total_opened": float64(3),
 }