app_id.srcType.yml to user_settings

tank0226 · Aug 10, 2020 · d0555c7 · d0555c7
1 parent 7f9c8cb
commit d0555c7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/logstash/elastiflow/conf.d/20_filter_20_netflow.logstash.conf b/logstash/elastiflow/conf.d/20_filter_20_netflow.logstash.conf
@@ -640,7 +640,7 @@ filter {
 
           if [netflow][app_id] != "0..0" {
             translate {
-              dictionary_path => "${ELASTIFLOW_DICT_PATH:/etc/logstash/elastiflow/dictionaries}/app_id.srctype.yml"
+              dictionary_path => "${ELASTIFLOW_USER_SETTINGS_PATH:/etc/logstash/elastiflow/user_settings}/app_id.srctype.yml"
               field => "[host][ip]"
               destination => "[@metadata][appid_srctype]"
               fallback => "${ELASTIFLOW_DEFAULT_APPID_SRCTYPE:__UNKNOWN}"

diff --git a/logstash/elastiflow/conf.d/20_filter_30_ipfix.logstash.conf b/logstash/elastiflow/conf.d/20_filter_30_ipfix.logstash.conf
@@ -615,7 +615,7 @@ filter {
 
         if [ipfix][applicationId] != "0..0" {
           translate {
-            dictionary_path => "${ELASTIFLOW_DICT_PATH:/etc/logstash/elastiflow/dictionaries}/app_id.srctype.yml"
+            dictionary_path => "${ELASTIFLOW_USER_SETTINGS_PATH:/etc/logstash/elastiflow/user_settings}/app_id.srctype.yml"
             field => "[host][ip]"
             destination => "[@metadata][appid_srctype]"
             fallback => "${ELASTIFLOW_DEFAULT_APPID_SRCTYPE:__UNKNOWN}"

diff --git a/...lastiflow/dictionaries/app_id.srctype.yml → ...astiflow/user_settings/app_id.srctype.yml b/...lastiflow/dictionaries/app_id.srctype.yml → ...astiflow/user_settings/app_id.srctype.yml
diff --git a/profile.d/elastiflow.sh b/profile.d/elastiflow.sh
@@ -16,6 +16,7 @@
 #------------------------------------------------------------------------------
 
 # ElastiFlow global configuration
+export ELASTIFLOW_AGENT_ID=elastiflow
 export ELASTIFLOW_DICT_PATH=/etc/logstash/elastiflow/dictionaries
 export ELASTIFLOW_USER_SETTINGS_PATH=/etc/logstash/elastiflow/user_settings
 export ELASTIFLOW_DEFINITION_PATH=/etc/logstash/elastiflow/definitions
@@ -29,7 +30,6 @@ export ELASTIFLOW_POPULATE_LOGS=true
 export ELASTIFLOW_KEEP_ORIG_DATA=true
 export ELASTIFLOW_DEFAULT_APPID_SRCTYPE=__UNKNOWN
 
-
 # Name resolution option
 export ELASTIFLOW_RESOLVE_IP2HOST=false
 export ELASTIFLOW_NAMESERVER=127.0.0.1
@@ -68,7 +68,6 @@ export ELASTIFLOW_NETFLOW_UDP_WORKERS=4
 export ELASTIFLOW_NETFLOW_UDP_QUEUE_SIZE=4096
 export ELASTIFLOW_NETFLOW_UDP_RCV_BUFF=33554432
 # Netflow timestamp options
-export ELASTIFLOW_NETFLOW_LASTSW_TIMESTAMP=false
 export ELASTIFLOW_NETFLOW_TZ=UTC