Merge lp:~gnuoy/charms/precise/daisy/add-upgrade-charm into lp:~daisy-pluckers/charms/precise/daisy/trunk

[Liam Young]

[lp:~gnuoy/charms/precise/daisy/add-upgrade-charm]

31. By Liam Young on 2013-05-03

Actually include the upgrade-charm hook

32. By Liam Young on 2013-05-03

Add nrpe hooks and config

33. By Liam Young on 2013-05-03

New hooks need to be executable

34. By Liam Young on 2013-05-03

nrpe hook also needed +x

[Evan (ev)]

Looks good!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-03-21 16:17:19 +0000
+++ config.yaml	2013-05-03 14:19:28 +0000
@@ -96,7 +96,21 @@
       default: ''
       description: |
         The Cassandra RPC password. Leave blank if one is not needed.
+  daisy_code_dirs:
+      type: int
+      default: 3
+      description: |
+        How many old copies of daisy code to retain (candidates for backouts)
   repository:
       type: string
       default: 'ppa:daisy-pluckers/daisy-seeds'
       description: The location for the daisy-dependencies package.
+  nrpe_url_check_params:
+      default: "-e '400' -u /"
+      type: string
+      description: The parameters to use for the check against gunicorn
+  region:
+      default: "prodstack"
+      type: string
+      description: Region deploying to. Used by nrpe to define servicegroup
+

=== modified file 'hooks/common'
--- hooks/common	2013-03-22 02:14:17 +0000
+++ hooks/common	2013-05-03 14:19:28 +0000
@@ -13,6 +13,9 @@
 OOPS_LOCAL="$DEPLOY_ROOT/oops-local"
 LISTEN_PORT="$(config-get listen_port)"
 LOG_DIR="/srv/$BASEDIR/$INSTANCE_TYPE-logs"
+DAISY_CODE_DIRS="$(config-get daisy_code_dirs)"
+REGION="$(config-get region)"
+NRPE_URL_CHECK_PARAMS="$(config-get nrpe_url_check_params)"
 
 save_setting () {
     key="$1"
@@ -50,3 +53,36 @@
         relation-set -r $relid wsgi_timestamp=$(date +%s)
     done
 }
+
+deploy_code () {
+    local tarball="$1"
+    local codedir="$2"
+    local codedir_count="$3"
+    local codename=$(basename "$codedir") 
+    local coderoot=$(dirname "$codedir") 
+    local tmpdir=$(mktemp -d --tmpdir="${coderoot}")
+    tar -C ${tmpdir} -xf ${tarball}
+    local coderevno=$(bzr revno ${tmpdir})
+    if [[ -d "${coderoot}/${codename}-${coderevno}" ]]; then
+        juju-log "${coderevno} of ${codename} already deployed"
+        rm -rf ${tmpdir}
+    else
+        juju-log "Deploying ${coderevno} of ${codename}"
+        chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "${tmpdir}"
+        mv "${tmpdir}" "${coderoot}/${codename}-${coderevno}"
+        [ -d "${coderoot}/${codename}" ] && rm -rf "${coderoot}/${codename}"
+        ln -s "${coderoot}/${codename}-${coderevno}" "${coderoot}/${codename}"
+        remove_old_codedirs $codedir_count "${coderoot}/${codename}-*"
+    fi
+}
+
+remove_old_codedirs () {
+    local codedir_count="$1"
+    local codedir_regex="$2"
+    local current_code_dirs=$(ls -d ${codedir_regex} | wc -l)
+    if [[ $current_code_dirs -gt $codedir_count ]]; then
+        juju-log "More than $codedir_count found, deleting:"
+        juju-log "$(ls -td ${codedir_regex} | tail -n +$(($codedir_count+1)))"
+        ls -1rd ${codedir_regex} | tail -n +$(($codedir_count+1)) | xargs rm -rf
+    fi
+}

=== modified file 'hooks/install'
--- hooks/install	2013-03-22 02:14:17 +0000
+++ hooks/install	2013-05-03 14:19:28 +0000
@@ -33,11 +33,7 @@
 
 # Unpack tarred Daisy code
 charm_dir="$(pwd)"
-tarball="$charm_dir/files/daisy.tgz"
-
-if [ -f "$tarball" ]; then
-    tar -C "$CODE_LOCATION" -xvf "$tarball"
-fi
+deploy_code "$charm_dir/files/daisy.tgz" $CODE_LOCATION $DAISY_CODE_DIRS
 
 if [ ! -e "$LOCAL_CONFIG_PATH" ]; then
     cp "$CODE_LOCATION/daisy/configuration.py" "$LOCAL_CONFIG_PATH"

=== added file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/nrpe-external-master-relation-changed	2013-05-03 14:19:28 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eux
+. hooks/common
+export NAGIOS_HOSTNAME="ue-${REGION}-et-${JUJU_UNIT_NAME//\//-}"
+
+export INSTANCE_TYPE
+export NAGIOS_SERVICEGROUP="ue-${REGION}-et"
+export PROJECT="UE"
+
+export SERVICE_DESCRIPTION="Daisy app server"
+export NRPE_CMD_NAME="check_ue_daisry_app_${INSTANCE_TYPE}"
+export NRPE_CMD="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p ${LISTEN_PORT} ${NRPE_URL_CHECK_PARAMS}"
+cheetah fill --env -p templates/nrpe_cmd_file.tmpl > /etc/nagios/nrpe.d/${NRPE_CMD_NAME}.cfg
+cheetah fill --env -p templates/nrpe_service_file.tmpl > /var/lib/nagios/export/service__${NAGIOS_HOSTNAME}_${NRPE_CMD_NAME}.cfg
+
+/etc/init.d/nagios-nrpe-server reload

=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2013-05-03 14:19:28 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eux
+
+. hooks/common
+charm_dir="$(pwd)"
+deploy_code "$charm_dir/files/daisy.tgz" $CODE_LOCATION $DAISY_CODE_DIRS
+service gunicorn restart

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-12-19 14:34:13 +0000
+++ metadata.yaml	2013-05-03 14:19:28 +0000
@@ -10,6 +10,10 @@
         scope: container
     daisy:
         interface: http
+    nrpe-external-master:
+        interface: nrpe-external-master
+        scope: container
+
 requires:
     db:
         interface: cassandra

=== added directory 'templates'
=== added file 'templates/nrpe_cmd_file.tmpl'
--- templates/nrpe_cmd_file.tmpl	1970-01-01 00:00:00 +0000
+++ templates/nrpe_cmd_file.tmpl	2013-05-03 14:19:28 +0000
@@ -0,0 +1,6 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+# ${PROJECT} ${INSTANCE_TYPE} ${SERVICE_DESCRIPTION}
+command[${NRPE_CMD_NAME}]=${NRPE_CMD}
+

=== added file 'templates/nrpe_service_file.tmpl'
--- templates/nrpe_service_file.tmpl	1970-01-01 00:00:00 +0000
+++ templates/nrpe_service_file.tmpl	2013-05-03 14:19:28 +0000
@@ -0,0 +1,10 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {
+    use                             active-service
+    host_name                       ${NAGIOS_HOSTNAME}
+    service_description             ${NAGIOS_HOSTNAME} ${PROJECT} ${INSTANCE_TYPE} ${SERVICE_DESCRIPTION}
+    check_command                   check_nrpe!${NRPE_CMD_NAME}
+    servicegroups                   ${NAGIOS_SERVICEGROUP},
+}