From aae5ffc65e349be8cfcffb443d8394c45dda87ea Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 2 May 2013 12:02:08 -0700 Subject: [PATCH] Make the Jenkins log pusher a service. * modules/openstack_project/manifests/logstash.pp: Run the Jenkins log pusher script as a service. This is the first step in making Logstash use the TCP inputs instead of pipe inputs. * modules/openstack_project/files/logstash/jenkins-log-pusher.init: Add a simple init script for the Jenkins log pusher. * modules/openstack_project/templates/logstash/indexer.conf.erb: Switch to TCP input instead of pipe input as the new Jenkins log pusher service will push log events over TCP. Change-Id: Id80c710abd5facd71d18afb2b250b2d7d92dec2d Reviewed-on: https://review.openstack.org/28074 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: Clark Boylan Tested-by: Jenkins --- .../files/logstash/jenkins-log-pusher.init | 159 ++++++++++++++++++ .../openstack_project/manifests/logstash.pp | 15 ++ .../templates/logstash/indexer.conf.erb | 5 +- 3 files changed, 177 insertions(+), 2 deletions(-) create mode 100755 modules/openstack_project/files/logstash/jenkins-log-pusher.init diff --git a/modules/openstack_project/files/logstash/jenkins-log-pusher.init b/modules/openstack_project/files/logstash/jenkins-log-pusher.init new file mode 100755 index 0000000000..d413b4126e --- /dev/null +++ b/modules/openstack_project/files/logstash/jenkins-log-pusher.init @@ -0,0 +1,159 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: jenkins-log-pusher +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Jenkins Log Pusher +# Description: Service to push Jenkins logs into logstash. +### END INIT INFO + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Jenkins Log Pusher" +NAME=jenkins-log-pusher +DAEMON=/usr/local/bin/log-pusher.py +DAEMON_ARGS='-r -z tcp://jenkins.openstack.org:8888 -l http://logs.openstack.org -f console.html -d /var/log/logstash/pusher-debug.log -t' +#PIDFILE=/var/run/$NAME/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +USER=logstash + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + + mkdir -p /var/run/$NAME + chown $USER /var/run/$NAME + start-stop-daemon --start --quiet -c $USER --exec $DAEMON --test > /dev/null \ + || return 1 + # Note using --background as log-pusher.py cannot daemonize itself yet. + start-stop-daemon --start --quiet --background -c $USER --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --signal 9 --exec $DAEMON + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + rm -f /var/run/$NAME/* + return "$RETVAL" +} + +# +# Function that stops the daemon/service +# +#do_graceful_stop() +#{ +# PID=`cat $PIDFILE` +# kill -USR1 $PID +# +# # wait until really stopped +# if [ -n "${PID:-}" ]; then +# i=0 +# while kill -0 "${PID:-}" 2> /dev/null; do +# if [ $i -eq '0' ]; then +# echo -n " ... waiting " +# else +# echo -n "." +# fi +# i=$(($i+1)) +# sleep 1 +# done +# fi +# +# rm -f /var/run/$NAME/* +#} + +# +# Function that sends a SIGHUP to the daemon/service +# +#do_reload() { +# # +# # If the daemon can reload its configuration without +# # restarting (for example, when it is sent a SIGHUP), +# # then implement that here. +# # +# start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name zuul-server +# return 0 +#} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; +# reload) +# # +# # If do_reload() is not implemented then leave this commented out +# # and leave 'force-reload' as an alias for 'restart'. +# # +# log_daemon_msg "Reloading $DESC" "$NAME" +# do_reload +# log_end_msg $? +# ;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + do_start + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/modules/openstack_project/manifests/logstash.pp b/modules/openstack_project/manifests/logstash.pp index f080d8d10c..12109fa870 100644 --- a/modules/openstack_project/manifests/logstash.pp +++ b/modules/openstack_project/manifests/logstash.pp @@ -51,6 +51,21 @@ class openstack_project::logstash ( require => Package['python3'], } + file { '/etc/init.d/jenkins-log-pusher': + ensure => present, + owner => 'root', + group => 'root', + mode => '0555', + source => 'puppet:///modules/openstack_project/logstash/jenkins-log-pusher.init', + require => File['/usr/local/bin/log-pusher.py'], + } + + service { 'jenkins-log-pusher': + enable => true, + hasrestart => true, + require => File['/etc/init.d/jenkins-log-pusher'], + } + cron { 'delete_old_es_indices': user => 'root', hour => '5', diff --git a/modules/openstack_project/templates/logstash/indexer.conf.erb b/modules/openstack_project/templates/logstash/indexer.conf.erb index d5aa77bca1..66b195cc33 100644 --- a/modules/openstack_project/templates/logstash/indexer.conf.erb +++ b/modules/openstack_project/templates/logstash/indexer.conf.erb @@ -1,6 +1,7 @@ input { - pipe { - command => "python3 /usr/local/bin/log-pusher.py -r -z tcp://jenkins.openstack.org:8888 -l http://logs.openstack.org -f console.html -d /var/log/logstash/indexer-debug.log" + tcp { + host => "localhost" + port => 9999 format => "json" message_format => "%{event_message}" tags => ["jenkins", "console"]