Merge pull request #427 from Security-Onion-Solutions/quickfix/hostnames

ensure name uniformity for elascticsearch and telegraf/grafana

salt/common/telegraf/etc/telegraf.conf

@@ -80,7 +80,7 @@
   logfile = "/var/log/telegraf/telegraf.log"
 
   ## Override default hostname, if empty use os.Hostname()
-  hostname = "{{ grains.id }}"
+  hostname = "{{ grains.host }}"
   ## If set to true, do no set the "host" tag in the telegraf agent.
   omit_hostname = false
 

salt/utility/bin/eval

@@ -28,4 +28,4 @@ fi
 echo "Applying cross cluster search config..."
     curl -s -XPUT http://{{ ES }}:9200/_cluster/settings \
          -H 'Content-Type: application/json' \
-         -d "{\"persistent\": {\"search\": {\"remote\": {\"{{ grains.id }}\": {\"seeds\": [\"127.0.0.1:9300\"]}}}}}"
+         -d "{\"persistent\": {\"search\": {\"remote\": {\"{{ grains.host }}\": {\"seeds\": [\"127.0.0.1:9300\"]}}}}}"