Merge pull request #24 from newrelic/inventory-host

Add LocalHostname argument so that inventory host can be overridden

Author: Corbin Phelps

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.1.3 - 2018-09-25
+### Added
+- Added local hostname argument to allow for overriding "localhost" as the host from which to collect inventory data.
+
 ## 0.1.2 - 2018-09-14
 ### Changed
 - Removed IP field from Node struct. It was not required as part of collection and could cause an error as the value could be a single string or an array of strings.

elasticsearch-config.yml.sample

@@ -6,6 +6,7 @@ instances:
     arguments:
       config_path: <absolute path to the ElasticSearch configuration .yml file. (default "/etc/elasticsearch/elasticsearch.yml")>
       hostname: <hostname or IP where Elasticsearch Node is running. (default "localhost")>
+      local_hostname: <hostname or IP of the Elasticsearch node from which to collect inventory data. (default "localhost")>
       username: <username for accessing Elasticsearch Node>
       password: <password for the given user.>
       port: <port on which Elasticsearch Node is listening. (default 9200)>

src/client.go

@@ -42,9 +42,9 @@ type errorBody struct {
 }
 
 // NewClient creates a new Elasticsearch http client.
-// The hostnameOverride parameter specifies a hostname that the client should connect to.
+// The hostname parameter specifies the hostname that the client should connect to.
 // Passing in an empty string causes the client to use the hostname specified in the command-line args. (default behavior)
-func NewClient(hostnameOverride string) (*HTTPClient, error) {
+func NewClient(hostname string) (*HTTPClient, error) {
 	httpClient, err := nrHttp.New(args.CABundleFile, args.CABundleDir, time.Duration(args.Timeout)*time.Second)
 	if err != nil {
 		return nil, err
@@ -60,12 +60,6 @@ func NewClient(hostnameOverride string) (*HTTPClient, error) {
 			if args.UseSSL {
 				protocol = "https"
 			}
-
-			hostname := args.Hostname
-			if hostnameOverride != "" {
-				hostname = hostnameOverride
-			}
-
 			return fmt.Sprintf("%s://%s:%d", protocol, hostname, args.Port)
 		}(),
 	}, nil

src/client_test.go

@@ -31,7 +31,7 @@ func TestNewClient(t *testing.T) {
 	for _, tc := range testCases {
 		setupTestArgs()
 		args.Hostname, args.Port, args.UseSSL = hostname, port, tc.useSSL
-		client, err := NewClient("")
+		client, err := NewClient(args.Hostname)
 		if err != nil {
 			t.Errorf("Unexpected error: %s", err.Error())
 		} else {
@@ -42,23 +42,6 @@ func TestNewClient(t *testing.T) {
 	}
 }
 
-func TestHostnameOverride(t *testing.T) {
-	hostname, port, ssl := "host", 9, false
-	hostOverride := "overridden"
-	expectedURL := fmt.Sprintf("http://%s:%d", hostOverride, port)
-
-	setupTestArgs()
-	args.Hostname, args.Port, args.UseSSL = hostname, port, ssl
-	client, err := NewClient(hostOverride)
-	if err != nil {
-		t.Errorf("Unexpected error: %s", err.Error())
-	} else {
-		if client.baseURL != expectedURL {
-			t.Errorf("Expected BaseURL '%s' got '%s'", expectedURL, client.baseURL)
-		}
-	}
-}
-
 func TestBadCertFile(t *testing.T) {
 	setupTestArgs()
 	args.UseSSL = true

src/elasticsearch.go

@@ -11,6 +11,7 @@ import (
 type argumentList struct {
 	sdkArgs.DefaultArgumentList
 	Hostname         string `default:"localhost" help:"Hostname or IP where Elasticsearch Node is running."`
+	LocalHostname    string `default:"localhost" help:"Hostname or IP of the Elasticsearch node from which to collect inventory."`
 	Port             int    `default:"9200" help:"Port on which Elasticsearch Node is listening."`
 	Username         string `default:"" help:"Username for accessing Elasticsearch Node"`
 	Password         string `default:"" help:"Password for the given user."`
@@ -25,7 +26,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.elasticsearch"
-	integrationVersion = "0.1.2"
+	integrationVersion = "0.1.3"
 )
 
 var (
@@ -38,7 +39,7 @@ func main() {
 	logErrorAndExit(err)
 
 	// Create a client for metrics
-	metricsClient, err := NewClient("")
+	metricsClient, err := NewClient(args.Hostname)
 	logErrorAndExit(err)
 
 	if args.All() || args.Metrics {
@@ -47,7 +48,7 @@ func main() {
 
 	// Create a client for inventory. Inventory needs to make REST calls against
 	// localhost to get information relative to this node only.
-	inventoryClient, err := NewClient("localhost")
+	inventoryClient, err := NewClient(args.LocalHostname)
 	logErrorAndExit(err)
 
 	if args.All() || args.Inventory {