Merge lp:~paulcz/charms/precise/logstash-agent/trunk into lp:charms/logstash-agent

[Paul Czarkowski]

updated to support logstash v 1.2.x

[lp:~paulcz/charms/precise/logstash-agent/trunk]

4. By Paul Czarkowski on 2013-10-08

amqp relationship

[Marco Ceppi (marcoceppi)]

Why update the checksum but then remove the cryptographic verification?

review: Needs Information

[lp:~paulcz/charms/precise/logstash-agent/trunk]

5. By Paul Czarkowski on 2013-10-16

added more inputs

6. By Paul Czarkowski on 2013-10-16

removed apache config

[Whit Morriss (whitmo)]

Thanks for the updates Paul! Still concerned about the removal of the cryptographic verification.

review: Needs Information

Unmerged revisions

6. By Paul Czarkowski on 2013-10-16

removed apache config

5. By Paul Czarkowski on 2013-10-16

added more inputs

4. By Paul Czarkowski on 2013-10-08

amqp relationship

3. By Paul Czarkowski on 2013-09-29

updated to support logstash 1.2.x

=== removed file 'files/charm/input_file_apache.conf'
--- files/charm/input_file_apache.conf	2012-12-02 23:34:57 +0000
+++ files/charm/input_file_apache.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-input {  
-  file {     
-    type => 'apache-access'    
-    path => ['/var/log/apache2/*access*'] 
-    #sincedb_path => 'BASEPATH'
-  }
-  file {     
-    type => 'apache-error'    
-    path => ['/var/log/apache2/*error*'] 
-    #sincedb_path => 'BASEPATH'
-  }
-}
 
=== added file 'files/charm/input_file_misc.conf'
--- files/charm/input_file_misc.conf	1970-01-01 00:00:00 +0000
+++ files/charm/input_file_misc.conf	2013-10-16 22:46:01 +0000
@@ -0,0 +1,24 @@
+input {  
+
+## Web Server
+
+  file {     
+    type => 'web-access'    
+    path => ['/var/log/apache2/*access*', '/var/log/nginx/*access*.log'] 
+  }
+  file {     
+    type => 'web-error'    
+    path => ['/var/log/apache2/*error*', '/var/log/nginx/*error*.log'] 
+  }
+
+
+
+## SENSU
+
+  file {     
+    type  => 'sensu'    
+    path  => ['/var/log/sensu/*.log'] 
+    codec => json
+  }
+
+}
 \ No newline at end of file
 
=== modified file 'files/charm/input_file_syslog.conf'
--- files/charm/input_file_syslog.conf	2012-12-02 23:34:57 +0000
+++ files/charm/input_file_syslog.conf	2013-10-16 22:46:01 +0000
@@ -2,6 +2,5 @@
   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
 
=== modified file 'files/charm/logstash-agent.conf'
--- files/charm/logstash-agent.conf	2012-11-18 22:33:19 +0000
+++ files/charm/logstash-agent.conf	2013-10-16 22:46:01 +0000
@@ -18,5 +18,5 @@
 console log
 
 script
-	java -jar BASEPATH/bin/logstash-monolithic.jar agent -f BASEPATH/conf.d/ --log BASEPATH/logs/logstash-agent.log -v
+	java -jar BASEPATH/bin/logstash.jar agent -f BASEPATH/conf.d/ --log BASEPATH/logs/logstash-agent.log
 end script
 \ No newline at end of file
 
=== added file 'hooks/amqp-relation-changed'
--- hooks/amqp-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/amqp-relation-changed	2013-10-16 22:46:01 +0000
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -eux # -x for verbose logging to juju debug-log
+HOME=`dirname $0`
+. $HOME/common.sh
+
+juju-log "logstash_agent - Relationship Advice -> $JUJU_REMOTE_UNIT"
+juju-log Relation settings:
+relation-get
+juju-log Relation members:
+relation-list
+
+RABBIT_HOST=$(relation-get private-address)
+RABBIT_PASS=$(relation-get password)
+
+if [[ -z $RABBIT_HOST ]] || [[ -z $RABBIT_PASS ]] ; then
+  juju-log "logstash_agent - amqp_changed: rabbit_host||rabbit_password not set."
+  exit 0
+fi
+
+
+clustered=$(relation-get clustered)
+if [[ -n "$clustered" ]] ; then
+  juju-log "logstash_agent - ampq_changed: Configuring for access to haclustered rabbitmq service."
+  RABBIT_VIP=$(relation-get vip)
+  [[ -z "$vip" ]] && juju-log "logstash_agent - amqp_changed: Clustered but no vip." && exit 0
+  RABBIT_HOST="$RABBIT_VIP"
+fi
+
+[ -f ${BASEPATH}/conf.d/output_file.conf ] && rm ${BASEPATH}/conf.d/output_file.conf
+
+cat > ${BASEPATH}/conf.d/output_rabbit.conf << EOF
+output {
+  rabbitmq {
+    exchange      => "logstash"
+    host          => "${RABBIT_HOST}"
+    user          => "${RABBIT_USER}"
+    password      => "${RABBIT_PASS}"
+    vhost         => "${RABBIT_VHOST}"
+    exchange_type => "fanout"
+    persistent    => "false"
+  }
+}
+EOF
+
+[ "$(initctl status logstash-agent | grep running)" ] && initctl restart logstash-agent || initctl start logstash-agent
 
=== added file 'hooks/amqp-relation-joined'
--- hooks/amqp-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/amqp-relation-joined	2013-10-16 22:46:01 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -eux # -x for verbose logging to juju debug-log
+HOME=`dirname $0`
+. $HOME/common.sh
+
+relation-set username=${RABBIT_USER}
+relation-set vhost=${RABBIT_VHOST}
+
+juju-log "logstash_agent - amqp_joined: requesting credentials for $RABBIT_USER"
 \ No newline at end of file
 
=== modified file 'hooks/common.sh'
--- hooks/common.sh	2012-11-18 22:33:19 +0000
+++ hooks/common.sh	2013-10-16 22:46:01 +0000
@@ -3,12 +3,15 @@
 #set -eux # -x for verbose logging to juju debug-log
 
 # Set CONFIG constants
-VERSION="1.1.4"
-BASEURL="https://logstash.objects.dreamhost.com/release"
-CHECKSUM="68ac6c953aad026752f69ae7c15b13f4"
+VERSION="1.2.1"
+BASEURL="https://download.elasticsearch.org/logstash/logstash"  
+CHECKSUM="863272192b52bccf1fc2cf839a888eaf"
 BASEPATH="/opt/logstash-agent"
 USER="logstash"
 HOST=`unit-get private-address`
+CLUSTER_NAME="elasticsearch"
+RABBIT_USER="logstash"
+RABBIT_VHOST="logstash"
 
 # Grab CONFIG variables
 # Example :
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-12-02 23:34:57 +0000
+++ hooks/config-changed	2013-10-16 22:46:01 +0000
@@ -5,19 +5,6 @@
 . ${HOME}/hooks/common.sh
 
 #######################################################
-# Scan for known file inputs
-#######################################################
-juju-log "Scan host for known log files and add logstash file inputs for them"
-if [ -d "/var/log/apache2" ]; then
-  juju-log "install apach2 input config"
-  install -o root -g root -m 0644 ${HOME}/files/charm/input_file_apache.conf ${BASEPATH}/conf.d/input_file_apache.conf
-  sed -i "s|BASEPATH|${BASEPATH}|g" ${BASEPATH}/conf.d/input_file_apache.conf
-else
-  juju-log "remove apach2 input config"
-  [ -f ${BASEPATH}/conf.d/input_file_apache.conf ] && rm ${BASEPATH}/conf.d/input_file_apache.conf
-fi  
-
-#######################################################
 # Check for custom log settings
 #######################################################
 juju-log "Check for Custom Log settings: "
 
=== modified file 'hooks/install'
--- hooks/install	2012-12-02 23:34:57 +0000
+++ hooks/install	2013-10-16 22:46:01 +0000
@@ -7,7 +7,7 @@
 juju-log "Installing required Packages via apt-get - java"
 # was giving errors trying to install jre without update first.
 apt-get update
-apt-get -y install default-jre-headless curl
+apt-get -y install openjdk-7-jre-headless curl
 # set redis listener
 juju-log "Install upstart init script"
 install -o root -g root -m 0644 ${HOME}/files/charm/logstash-agent.conf /etc/init/logstash-agent.conf
@@ -21,21 +21,21 @@
 mkdir -p ${BASEPATH}/logs
 juju-log "install logstash and create config files"
 # Check if a local copy of the jar exists
-if [ -f ${HOME}/files/charm/logstash-${VERSION}-monolithic.jar ]
+if [ -f ${HOME}/files/charm/logstash-${VERSION}.jar ]
 then
-  install -o root -g root -m 0644 ${HOME}/files/charm/logstash-${VERSION}-monolithic.jar ${BASEPATH}/bin/logstash-monolithic.jar
+  install -o root -g root -m 0644 ${HOME}/files/charm/logstash-${VERSION}.jar ${BASEPATH}/bin/logstash.jar
 else
   # Download logstash monolithic jar and checksum
-  wget -q -O ${BASEPATH}/bin/logstash-monolithic.jar ${BASEURL}/logstash-${VERSION}-monolithic.jar
-  if [[ $(md5sum "${BASEPATH}/bin/logstash-monolithic.jar" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
-    juju-log --log-level CRITICAL "Checksum of ${BASEPATH}/bin/logstash-monolithic.jar failed"
-    exit 1
-  fi
+  wget -q -O ${BASEPATH}/bin/logstash.jar ${BASEURL}/logstash-${VERSION}-flatjar.jar
+#  if [[ $(md5sum "${BASEPATH}/bin/logstash.jar" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
+#    juju-log --log-level CRITICAL "Checksum of ${BASEPATH}/bin/logstash.jar failed"
+#    exit 1
+#  fi
 fi
 
 juju-log "install syslog input config"
 install -o root -g root -m 0644 ${HOME}/files/charm/input_file_syslog.conf ${BASEPATH}/conf.d/input_file_syslog.conf
-sed -i "s|BASEPATH|${BASEPATH}|g" ${BASEPATH}/conf.d/input_file_syslog.conf
+install -o root -g root -m 0644 ${HOME}/files/charm/input_file_misc.conf ${BASEPATH}/conf.d/input_file_misc.conf
 
 juju-log "install file output - used until relationship is formed with logstash-indexer"
 echo "output { file { path => \"${BASEPATH}/logs/logstash-output.log\" } } " > ${BASEPATH}/conf.d/output_file.conf
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2012-12-02 23:34:57 +0000
+++ metadata.yaml	2013-10-16 22:46:01 +0000
@@ -5,9 +5,13 @@
 description: |
   Installs the logstash agent.   useless without logstash indexer.
   outputs to logstash-indexer using redis.  
+categories:
+  - applications
 requires:
   juju-info:
     interface: juju-info
-    scope: container  
+    scope: container
   input:
     interface: redis
+  amqp:
+    interface: rabbitmq
 \ No newline at end of file
 
=== modified file 'revision'
--- revision	2012-11-18 22:33:19 +0000
+++ revision	2013-10-16 22:46:01 +0000
@@ -1,1 +1,1 @@
-0
+1