Merge lp:~mevers/charms/trusty/logstash/inputTcp into lp:~tanuki/charms/trusty/logstash/trunk

[Martijn Evers]

Added input-tcp plugin/relation.

[lp:~mevers/charms/trusty/logstash/inputTcp]

60. By Martijn Evers on 2015-10-13

Use a newer version of Logstash

Unmerged revisions

60. By Martijn Evers on 2015-10-13

Use a newer version of Logstash

59. By Martijn Evers on 2015-10-05

Added input-tcp (port 9999) relation

=== modified file 'config.yaml'
--- config.yaml	2015-09-29 19:30:00 +0000
+++ config.yaml	2015-10-13 13:11:12 +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-1.5.4.tar.gz"
     description: The logstash binary file to install to this charm.
   logstash-sum:
     type: string
-    default: "d59ef579c7614c5df9bd69cfdce20ed371f728ff"
+    default: "c892b71a3902bfdb54827385ed2c26a14ad816dd"
     description: The checksum value for the logstash file.
   extra-packages:
     type: string

=== added file 'hooks/input-tcp-relation-changed'
--- hooks/input-tcp-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/input-tcp-relation-changed	2015-10-13 13:11:12 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eux
+
+hostname=$(unit-get private-address)
+juju-log "input-tcp-relation-joined/changed, setting port: 9999"
+relation-set port=9999 hostname=$hostname
+
+basePath=/opt/logstash
+configPath=${basePath}/conf.d
+
+echo -e 'input {\n\ttcp {\n\t\tport => 9999\n\t\tcodec => "json"\n\t}\n}' > ${configPath}/input-tcp.conf
+
+if [ "$(service logstash-indexer status | grep running)" ]; then
+    service logstash-indexer restart
+fi

=== added symlink 'hooks/input-tcp-relation-joined'
=== target is u'input-tcp-relation-changed'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-05-05 04:08:45 +0000
+++ metadata.yaml	2015-10-13 13:11:12 +0000
@@ -19,6 +19,8 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  input-tcp:
+    interface: logstash-tcp
 requires:
   client:
     interface: elasticsearch

=== 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-10-13 13:11:12 +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'] sincedb_path => '{{BASEPATH}}/sincedb' } }