Merge branch 'develop'

Conflicts: dist/logzio-rsyslog.tar.gz
logzio · Dec 13, 2015 · 5c96414 · 5c96414
2 parents 876e2bc + 425d235
commit 5c96414
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/dist/logzio-rsyslog.tar.gz b/dist/logzio-rsyslog.tar.gz
diff --git a/rsyslog/Vagrantfile b/rsyslog/Vagrantfile
@@ -7,9 +7,10 @@
 # you're doing.
 Vagrant.configure(2) do |config|
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = ENV['VAGRANT_BOX']
+  #config.vm.box = ENV['VAGRANT_BOX']
   #config.vm.box = "ubuntu/trusty64"
-
+  config.vm.box = "chef/centos-6.6"
+
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.

diff --git a/rsyslog/confs/5.8.0/21-logzio-apache.conf b/rsyslog/confs/5.8.0/21-logzio-apache.conf
@@ -25,12 +25,12 @@ $InputFilePersistStateInterval 25000
 $ActionResumeRetryCount -1
 $InputRunFileMonitor
 
-$template logzioFormatAccess,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=apache_access] %msg%\n"
+$template logzioFormatApacheAccess,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=apache_access] %msg%\n"
 
-$template logzioFormatError,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=apache_error] %msg%\n"
+$template logzioFormatApacheError,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=apache_error] %msg%\n"
 
-if $programname == 'apache_access' then @@listener.logz.io:5000;logzioFormatAccess
+if $programname == 'apache_access' then @@listener.logz.io:5000;logzioFormatApacheAccess
 if $programname == 'apache_access' then ~
 
-if $programname == 'apache_error' then @@listener.logz.io:5000;logzioFormatError
+if $programname == 'apache_error' then @@listener.logz.io:5000;logzioFormatApacheError
 if $programname == 'apache_error' then ~
diff --git a/rsyslog/confs/5.8.0/21-logzio-json-file.conf b/rsyslog/confs/5.8.0/21-logzio-json-file.conf
@@ -17,7 +17,7 @@ $ActionResumeRetryCount -1
 $InputRunFileMonitor
 
 #Add a tag for file events
-$template logzFormatFileTagName,"{ \"token\": \"USER_TOKEN\", %msg:2:$%\n"
+$template logzFormatFile_TAG_NAME,"{ \"token\": \"USER_TOKEN\", %msg:2:$%\n"
 
-if $programname == 'FILE_TAG_NAME' then @@listener.logz.io:5050;logzFormatFileTagName
+if $programname == 'FILE_TAG_NAME' then @@listener.logz.io:5050;logzFormatFile_TAG_NAME
 if $programname == 'FILE_TAG_NAME' then ~
diff --git a/rsyslog/confs/5.8.0/21-logzio-nginx.conf b/rsyslog/confs/5.8.0/21-logzio-nginx.conf
@@ -25,12 +25,12 @@ $InputFilePersistStateInterval 25000
 $ActionResumeRetryCount -1
 $InputRunFileMonitor
 
-$template logzioFormatAccess,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=nginx_access] %msg%\n"
+$template logzioFormatNgnixAccess,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=nginx_access] %msg%\n"
 
-$template logzioFormatError,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=nginx_error] %msg%\n"
+$template logzioFormatNginxError,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [type=nginx_error] %msg%\n"
 
-if $programname == 'nginx_access' then @@listener.logz.io:5000 ;logzioFormatAccess
+if $programname == 'nginx_access' then @@listener.logz.io:5000 ;logzioFormatNgnixAccess
 if $programname == 'nginx_access' then ~
 
-if $programname == 'nginx_error' then @@listener.logz.io:5000 ;logzioFormatError
+if $programname == 'nginx_error' then @@listener.logz.io:5000 ;logzioFormatNginxError
 if $programname == 'nginx_error' then ~
diff --git a/rsyslog/confs/5.8.0/21-logzio-text-file.conf b/rsyslog/confs/5.8.0/21-logzio-text-file.conf
@@ -17,6 +17,6 @@ $ActionResumeRetryCount -1
 $InputRunFileMonitor
 
 #Add a tag for file events
-$template logzFormatFileTagName,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% - - [type=TAG_NAME] %msg%\n"
-if $programname == 'FILE_TAG_NAME' then @@listener.logz.io:5000;logzFormatFileTagName
+$template logzFormatFile_TAG_NAME,"[USER_TOKEN] <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% - - [type=TAG_NAME] %msg%\n"
+if $programname == 'FILE_TAG_NAME' then @@listener.logz.io:5000;logzFormatFile_TAG_NAME
 if $programname == 'FILE_TAG_NAME' then ~