Merge lp:~thedac/charms/precise/pgbouncer/nagios-check-fixes into lp:charms/pgbouncer

[David Ames]

Setup nagios .pgpass and userlist.txt entry for nagios checks

[Dave Cheney (dave-cheney)]

review: Approve (lgtm)

[David Ames (thedac)]

Dave,

Any chance you can merge this. Matthew will not have to time to do a review.

=== modified file 'config.yaml'
--- config.yaml	2013-02-25 05:22:47 +0000
+++ config.yaml	2013-08-30 18:41:25 +0000
@@ -149,6 +149,12 @@
         type: string
         description: |
             What service this component forms part of. Used by nrpe.
+    package_status:
+        default: "install"
+        type: string
+        description: |
+            The status of service-affecting packages will be set to this value in the dpkg database.
+            Useful valid values are "install" and "hold".
     wait_warn:
          default: 5
          type: int

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-10-02 08:57:36 +0000
+++ hooks/config-changed	2013-08-30 18:41:25 +0000
@@ -11,5 +11,7 @@
 juju-log "Generating new pgbouncer configuration and init script"
 update_config
 
+ensure_package_status "${SERVICE_AFFECTING_PACKAGES}" $(config-get package_status)
+
 juju-log "Reloading pgbouncer"
 /usr/sbin/service pgbouncer reload

=== modified file 'hooks/db-proxy-relation-changed'
--- hooks/db-proxy-relation-changed	2013-03-22 14:30:59 +0000
+++ hooks/db-proxy-relation-changed	2013-08-30 18:41:25 +0000
@@ -113,8 +113,8 @@
 if [ "$JUJU_RELATION" != "db-proxy" ]; then
     # If called out of context
     juju-log "Out of db-proxy relation context, manually setting JUJU vars for db-proxy relation"
-    JUJU_RELATION="db-proxy"
-    export JUJU_RELATION_IDS=$(relation-ids db-proxy)
+    export JUJU_RELATION="db-proxy"
+    JUJU_RELATION_IDS=$(relation-ids db-proxy)
     UPDATED="False" 
     for JUJU_RELATION_ID in $(echo ${JUJU_RELATION_ID}); do
         export JUJU_REMOTE_UNIT=$(relation-list -r $JUJU_RELATION_ID)

=== modified file 'hooks/install'
--- hooks/install	2013-01-03 18:15:45 +0000
+++ hooks/install	2013-08-30 18:41:25 +0000
@@ -22,6 +22,8 @@
 juju-log "Installing packages via apt-get"
 apt-get -y install -- pgbouncer python-cheetah postgresql-client pwgen python-psycopg2
 
+ensure_package_status "${SERVICE_AFFECTING_PACKAGES}" $(config-get package_status)
+
 # Make sure pgbouncer is enabled and set max open files
 max_open_files=$(config-get max_open_files)
 cat  >/etc/default/pgbouncer << EOF

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2013-02-25 07:15:10 +0000
+++ hooks/nrpe-external-master-relation-changed	2013-08-30 18:41:25 +0000
@@ -3,6 +3,9 @@
 # Copyright 2012 Canonical Ltd. All rights reserved.
 # Author: Haw Loeung <[e-mail]>
 
+set -eux # -x for verbose logging to juju debug-log
+. scripts/common
+
 unit_name=${JUJU_UNIT_NAME////-}
 nagios_hostname="$(config-get nagios_context)-${unit_name}" 
 nagios_logdir='/var/log/nagios'
@@ -10,29 +13,29 @@
 nagios_servicegroup=$(config-get nagios_context)
 address=$(config-get listen_addr)
 if [ "$address" = "*" ]; then
-	address=$(unit-get private-address)
+    address=$(unit-get private-address)
 fi
 
 nagios_uid=$(getent passwd nagios | awk -F: '{ print $3}')
 nagios_gid=$(getent passwd nagios | awk -F: '{ print $4}')
 if [ $? -ne 0 ]; then
-	juju-log "Nagios user not setup, exiting"
-	exit 1
+    juju-log "Nagios user not setup, exiting"
+    exit 1
 fi
 
 if [ -d /usr/local/lib/nagios/plugins/ ]; then
-	cp $CHARM_DIR/scripts/check-pgbouncer.py $nagios_check_script
-	chmod 755 $nagios_check_script
+    cp $CHARM_DIR/scripts/check-pgbouncer.py $nagios_check_script
+    chmod 755 $nagios_check_script
 fi
 
 if [ ! -d $nagios_logdir ]; then
-	mkdir $nagios_logdir
-	chown nagios:nagios $nagios_logdir 
+    mkdir $nagios_logdir
+    chown nagios:nagios $nagios_logdir 
 fi
 
 # Remove existing checks to start clean
 for FILE in /var/lib/nagios/export/*check_pgbouncer*.cfg; do
-   rm -f $FILE
+    rm -f $FILE
 done
 
 # Export Juju configs and relations.
@@ -63,10 +66,32 @@
 # Clean up
 rm -f $juju_configs
 
+# Create nagios user in pgbouncer
+nagios_home=$(getent passwd nagios | awk -F: '{ print $6 }')
+if [ ! -f ${nagios_home}/.pgpass ] || [ ! -f /var/lib/juju/nagios.password ]; then
+    password=$(pwgen -s 16)
+    nagios_home=$(getent passwd nagios | awk -F: '{ print $6 }')
+    if [ -d $nagios_home ]; then
+        echo "*:*:*:nagios:${password}" > ${nagios_home}/.pgpass
+        chown nagios:nagios ${nagios_home}/.pgpass
+        chmod 600 ${nagios_home}/.pgpass
+    else
+        juju-log "No home directory for nagios"
+        exit 1
+    fi
+    if [ -d /var/lib/juju/ ]; then
+        echo "${password}" > /var/lib/juju/nagios.password
+        update_config
+    else
+        juju-log "No /var/lib/juju directory"
+        exit 1
+    fi
+fi
+
 # Reload NRPE
 if [ -x /etc/init.d/nagios-nrpe-server ]; then
-	service nagios-nrpe-server reload
+    service nagios-nrpe-server reload
 else
-	juju-log "Is NRPE installed?"
-	exit 1
+    juju-log "Is NRPE installed?"
+    exit 1
 fi

=== modified file 'revision'
--- revision	2013-02-25 05:23:43 +0000
+++ revision	2013-08-30 18:41:25 +0000
@@ -1,1 +1,1 @@
-1
+2

=== modified file 'scripts/common'
--- scripts/common	2013-02-27 03:43:44 +0000
+++ scripts/common	2013-08-30 18:41:25 +0000
@@ -7,6 +7,8 @@
 
 set -eux # -x for verbose logging to juju debug-log
 
+SERVICE_AFFECTING_PACKAGES="pgbouncer"
+
 update_config()
 {
 	pgbouncer_userlist=/etc/pgbouncer/userlist.txt
@@ -50,3 +52,19 @@
 	juju-log "reloading pgbouncer"
 	service pgbouncer reload || exit 1
 }
+
+ensure_package_status()
+{
+	packages="$1" ; shift
+	status="$1" ; shift
+
+	case $status in
+	install|hold)
+		for package in ${packages}; do
+			echo ${package} ${status}
+		done | dpkg --set-selections
+		;;
+	*)
+		;;
+	esac
+}