Addresses review comments

helm/examples/metrics/README.md

@@ -229,7 +229,11 @@ To create an index with dynamic mapping, use the following object when creating
 }  
 ```
 
-Note that there may be other means for adding the required dynamic mapping to the index.
+Note that there may be other means for adding the required dynamic mapping to the index. 
+
+The _match_ values above are representative of typical values. The actual values may
+vary depending on the cluster configuration and shared use of the index across multiple clusters.
+In all cases, the configuration of the sink must match that of the dynamic mappings in the index.
 
 #### Enabling ElasticSearch Metrics Sink for Kubernetes
 To enable reporting of metrics to ElasticSearch, add the metric configuration settings to 

helm/examples/metrics/elasticsearch_metrics.yaml

@@ -24,8 +24,8 @@ global:
     - type: elastic
       name: myelasticsink
       settings:
-        countMetricSuffix: count,
-        gaugeMetricSuffix: gauge,
+        countMetricSuffix: count
+        gaugeMetricSuffix: gauge
         histogramMetricSuffix: histogram
         host:
           protocol: https

system/metrics/sinks/elastic/elasticSink.cpp

@@ -88,14 +88,20 @@ ElasticMetricSink::ElasticMetricSink(const char *name, const IPropertyTree *pSet
     configurationValid = !elasticHostUrl.isEmpty() && !indexName.isEmpty();
 
     // Initialize standard suffixes
-    countMetricSuffix.append("count");
-    gaugeMetricSuffix.append("gauge");
-    histogramMetricSuffix.append("histogram");
-
-    // See if any are overridden
-    pSettingsTree->getProp("@countMetricSuffix", countMetricSuffix);
-    pSettingsTree->getProp("@gaugeMetricSuffix", gaugeMetricSuffix);
-    pSettingsTree->getProp("@histogramMetricSuffix", histogramMetricSuffix);
+    if (!pSettingsTree->getProp("@countMetricSuffix", countMetricSuffix))
+    {
+        countMetricSuffix.append("count");
+    }
+
+    if (!pSettingsTree->getProp("@gaugeMetricSuffix", gaugeMetricSuffix))
+    {
+        gaugeMetricSuffix.append("gauge");
+    }
+
+    if (!pSettingsTree->getProp("@histogramMetricSuffix", histogramMetricSuffix))
+    {
+        histogramMetricSuffix.append("histogram");
+    }
 }