Merge pull request #34 from newrelic/config-parse-fix

Fixed bug when reading a config yml file that had nested objects

Author: camdencheek

CHANGELOG.md

@@ -5,6 +5,12 @@ 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/).
 
+## 1.1.0 - 2018-11-28
+### Added
+- ClusterEnvironment argument to help further identify clusters
+### Fixed
+- Issue when loading a config yaml file that had nested objects. Theses objects are ignored for inventory data.
+
 ## 1.0.1 - 2018-11-20
 ### Changed
 - Added host and IP to Nodes as additional attributes

elasticsearch-config.yml.sample

@@ -4,6 +4,7 @@ instances:
   - name: elasticsearch
     command: <"all" or "inventory">
     arguments:
+      cluster_environment: <A way to further specify which cluster we are gathering data for, example: 'staging'>
       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: <(Optional) Hostname or IP of the Elasticsearch node from which to collect inventory data. (default "localhost"). Should only be set if you do not wish to collect inventory data against localhost>

src/elasticsearch.go

@@ -28,7 +28,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.elasticsearch"
-	integrationVersion = "1.0.1"
+	integrationVersion = "1.1.0"
 )
 
 var (

src/inventory.go

@@ -66,6 +66,16 @@ func populateConfigInventory(entity *integration.Entity) error {
 	}
 
 	for key, value := range configYaml {
+		// special case to look for nested types
+		switch value.(type) {
+		case map[interface{}]interface{}:
+			log.Debug("Unsupported data type '%T' for yaml key %s", value, key)
+			continue
+		case []interface{}:
+			log.Debug("Unsupported data type '%T' for yaml key %s", value, key)
+			continue
+		}
+
 		err = entity.SetInventoryItem("config/"+key, "value", value)
 		if err != nil {
 			log.Error("Could not set inventory item: %v", err)

src/inventory_test.go

@@ -38,6 +38,15 @@ func TestReadConfigFile(t *testing.T) {
 				"path.data":    "/var/lib/elasticsearch",
 				"path.logs":    "/var/log/elasticsearch",
 				"network.host": "0.0.0.0",
+				"xpack": map[interface{}]interface{}{
+					"security": map[interface{}]interface{}{
+						"authc": "ssl",
+					},
+				},
+				"items": []interface{}{
+					"one",
+					2,
+				},
 			},
 		},
 	}
@@ -49,7 +58,7 @@ func TestReadConfigFile(t *testing.T) {
 			t.Errorf("couldn't read config file: %v", err)
 		} else {
 			if expected := reflect.DeepEqual(tc.expectedMap, resultMap); !expected {
-				t.Errorf("maps didn't match")
+				t.Errorf("Expected %+v got %+v", tc.expectedMap, resultMap)
 			}
 		}
 	}
@@ -86,7 +95,10 @@ func TestPopulateConfigInventory(t *testing.T) {
 
 	populateConfigInventory(e)
 
-	actual, _ := i.MarshalJSON()
+	actual, err := i.MarshalJSON()
+	if err != nil {
+		t.Fatalf("Failed to create json: %s", err.Error())
+	}
 
 	writeGoldenFile(t, goldenPath, actual)
 

src/testdata/elasticsearch_sample.yml

@@ -86,3 +86,11 @@ network.host: 0.0.0.0
 # Require explicit names when deleting indices:
 #
 #action.destructive_requires_name: true
+
+xpack:
+  security:
+    authc: "ssl"
+
+items:
+  - "one"
+  - 2