Merge pull request #351 from Security-Onion-Solutions/dev

last fixes

VERSION

@@ -1 +1 @@
-1.0.6
+1.1.4

salt/common/telegraf/etc/telegraf.conf

@@ -16,7 +16,7 @@
 {%- set MASTER = grains['master'] %}
 {% set NODEIP = salt['pillar.get']('node:mainip', '') %}
 {% set HELIX_API_KEY = salt['pillar.get']('fireeye:helix:api_key', '') %}
-
+{% set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
 
 # Global tags can be specified here in key="value" format.
 [global_tags]
@@ -25,6 +25,9 @@
   ## Environment variables can be used as tags, and throughout the config file
   # user = "$USER"
 
+{% if grains['role'] == 'so-helix' %}
+  meta_cbid = {{ UNIQUEID }}
+{% endif %}
 
 # Configuration for telegraf agent
 [agent]

salt/logstash/conf/pipelines/eval/0800_input_eval.conf

@@ -182,7 +182,7 @@ input {
     type => "ossec"
   }
   file {
-    path => "/wazuh/archives/archive.json"
+    path => "/wazuh/archives/archives.json"
     type => "ossec_archive"
   }
   file {