Merge lp:~michael.nelson/charms/trusty/logstash/logstash2 into lp:~canonical-is-sa/charms/trusty/logstash/logstash2

[Michael Nelson]

Support logstash2.0

Required changes to get logstash2 operational in my ELK deployment:

* Remove sincedb_path so that default is used (errors as is as it is checked for a valid path to a file, currently it's a path to a dir)

* Remove message_format from redis input - no longer available.

* elasticsearch_http no longer a plugin, instead, elasticsearch plugin is http. Also, no longer has "host" option, only "hosts"

* Updated default values to use logstash2

Verified this results in a successful spec run using https://code.launchpad.net/~michael.nelson/canonical-mojo-specs/mojo-is-logging-kibana-4/+merge/276487

[Michael Foley (foli)]

+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-09-29 19:30:00 +0000
+++ config.yaml	2015-11-04 00:28:08 +0000
@@ -1,11 +1,11 @@
 options:
   logstash-source:
     type: string
-    default: "https://download.elasticsearch.org/logstash/logstash/logstash-1.4.2.tar.gz"
+    default: "https://download.elastic.co/logstash/logstash/logstash-2.0.0.tar.gz"
     description: The logstash binary file to install to this charm.
   logstash-sum:
     type: string
-    default: "d59ef579c7614c5df9bd69cfdce20ed371f728ff"
+    default: "f0961520dd9590d3b600c877be66f79f94a05f80"
     description: The checksum value for the logstash file.
   extra-packages:
     type: string
@@ -40,7 +40,7 @@
       A comma-separated list of nagios servicegroups.
       If left empty, the nagios_context will be used as the servicegroup
   nagios_check_procs_params:
-    default: "-a /opt/logstash/lib/logstash/runner.rb -c 1:1"
+    default: "-a logstash/runner.rb -c 1:1"
     type: string
     description: The parameters to pass to the nrpe plugin check_procs.
   nagios_check_tcp_params:

=== modified file 'templates/input-file-syslog.conf'
--- templates/input-file-syslog.conf	2014-09-23 12:12:45 +0000
+++ templates/input-file-syslog.conf	2015-11-04 00:28:08 +0000
@@ -1,1 +1,1 @@
-input {  file { type => 'syslog' path => ['/var/log/syslog','/var/log/kern.log','/var/log/auth.log','/var/log/dpkg.log'] sincedb_path => '{{BASEPATH}}' } } 
\ No newline at end of file
+input {  file { type => 'syslog' path => ['/var/log/syslog','/var/log/kern.log','/var/log/auth.log','/var/log/dpkg.log'] } }

=== modified file 'templates/input-redis.conf'
--- templates/input-redis.conf	2014-09-23 12:12:45 +0000
+++ templates/input-redis.conf	2015-11-04 00:28:08 +0000
@@ -1,1 +1,1 @@
-input { redis { host => "127.0.0.1" data_type => "list" type => "redis" tags => ["redis"] key => "logstash" message_format => "json_event" } }
\ No newline at end of file
+input { redis { host => "127.0.0.1" data_type => "list" type => "redis" tags => ["redis"] key => "logstash" } }

=== modified file 'templates/output-elasticsearch.conf'
--- templates/output-elasticsearch.conf	2014-09-23 16:59:13 +0000
+++ templates/output-elasticsearch.conf	2015-11-04 00:28:08 +0000
@@ -1,5 +1,5 @@
 output {
-    elasticsearch_http { 
-        host => "{{hosts}}"
+    elasticsearch {
+        hosts => "{{hosts}}"
     }
 }