Merge lp:~mthaddon/charms/precise/pgbouncer/remove-template-generate into lp:charms/pgbouncer

[Tom Haddon]

Per https://bugs.launchpad.net/charms/+bug/1046318/comments/1 remove template-generate and use cheetah command line instead

[Tom Haddon (mthaddon)]

This change has been tested in a number of live environments, including a production service.

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2013-08-30 16:43:46 +0000
+++ hooks/nrpe-external-master-relation-changed	2014-03-11 10:30:01 +0000
@@ -7,14 +7,19 @@
 . scripts/common
 
 unit_name=${JUJU_UNIT_NAME////-}
-nagios_hostname="$(config-get nagios_context)-${unit_name}" 
+export nagios_hostname="$(config-get nagios_context)-${unit_name}" 
 nagios_logdir='/var/log/nagios'
 nagios_check_script=/usr/local/lib/nagios/plugins/check-pgbouncer.py
-nagios_servicegroup=$(config-get nagios_context)
-address=$(config-get listen_addr)
+export nagios_servicegroup=$(config-get nagios_context)
+export address=$(config-get listen_addr)
 if [ "$address" = "*" ]; then
-    address=$(unit-get private-address)
+    export address=$(unit-get private-address)
 fi
+export listen_port=$(config-get listen_port)
+export wait_warn=$(config-get wait_warn)
+export wait_crit=$(config-get wait_crit)
+export conn_warn=$(config-get conn_warn)
+export conn_crit=$(config-get conn_crit)
 
 nagios_uid=$(getent passwd nagios | awk -F: '{ print $3}')
 nagios_gid=$(getent passwd nagios | awk -F: '{ print $4}')
@@ -38,33 +43,21 @@
     rm -f $FILE
 done
 
-# Export Juju configs and relations.
-juju_configs=$(/bin/mktemp --suffix=.juju)
-config-get --format=json -o $juju_configs
-
-# Insert variables
-sed -i -e "s/}$/,\"nagios_hostname\": \"$nagios_hostname\" }/" $juju_configs
-sed -i -e "s/}$/,\"address\": \"$address\" }/" $juju_configs
-sed -i -e "s/}$/,\"nagios_servicegroup\": \"$nagios_servicegroup\" }/" $juju_configs
-
 # NRPE check files
 nrpe_check_pgbouncer_connection_count="/etc/nagios/nrpe.d/check_pgbouncer_connection_count.cfg"
 nrpe_check_pgbouncer_pool_waittime="/etc/nagios/nrpe.d/check_pgbouncer_pool_waittime.cfg"
 nrpe_check_pgbouncer_connection_count_template="${CHARM_DIR}/templates/nrpe_check_pgbouncer_connection_count.tmpl"
 nrpe_check_pgbouncer_pool_waittime_template="${CHARM_DIR}/templates/nrpe_check_pgbouncer_pool_waittime.tmpl"
-scripts/template-generate.py -j $juju_configs $nrpe_check_pgbouncer_connection_count_template > $nrpe_check_pgbouncer_connection_count
-scripts/template-generate.py -j $juju_configs $nrpe_check_pgbouncer_pool_waittime_template > $nrpe_check_pgbouncer_pool_waittime
+cheetah fill --env --stdout $nrpe_check_pgbouncer_connection_count_template > $nrpe_check_pgbouncer_connection_count
+cheetah fill --env --stdout $nrpe_check_pgbouncer_pool_waittime_template > $nrpe_check_pgbouncer_pool_waittime
 
 # Exported service files
 nrpe_check_pgbouncer_connection_count_service_file="/var/lib/nagios/export/service__${nagios_servicegroup}-${nagios_hostname}_check_pgbouncer_connection_count.cfg"
 nrpe_check_pgbouncer_pool_waittime_service_file="/var/lib/nagios/export/service__${nagios_servicegroup}-${nagios_hostname}_check_pgbouncer_pool_waittime.cfg"
 nrpe_check_pgbouncer_connection_count_service_file_template="${CHARM_DIR}/templates/nrpe_check_pgbouncer_connection_count_service_file.tmpl"
 nrpe_check_pgbouncer_pool_waittime_service_file_template="${CHARM_DIR}/templates/nrpe_check_pgbouncer_pool_waittime_service_file.tmpl"
-scripts/template-generate.py -j $juju_configs $nrpe_check_pgbouncer_connection_count_service_file_template > $nrpe_check_pgbouncer_connection_count_service_file
-scripts/template-generate.py -j $juju_configs $nrpe_check_pgbouncer_pool_waittime_service_file_template > $nrpe_check_pgbouncer_pool_waittime_service_file
-
-# Clean up
-rm -f $juju_configs
+cheetah fill --env --stdout $nrpe_check_pgbouncer_connection_count_service_file_template > $nrpe_check_pgbouncer_connection_count_service_file
+cheetah fill --env --stdout $nrpe_check_pgbouncer_pool_waittime_service_file_template > $nrpe_check_pgbouncer_pool_waittime_service_file
 
 # Create nagios user in pgbouncer
 nagios_home=$(getent passwd nagios | awk -F: '{ print $6 }')
 
=== modified file 'scripts/common'
--- scripts/common	2013-07-26 04:08:19 +0000
+++ scripts/common	2014-03-11 10:30:01 +0000
@@ -24,12 +24,8 @@
 	local pgbouncer_config="/etc/pgbouncer/pgbouncer.ini"
 	local general_template="templates/pgbouncer.ini.general.tmpl"
 
-	# Export Juju configs and relations.
-	local juju_configs=$(/bin/mktemp --suffix=.juju)
-	config-get --format=json -o $juju_configs
-
 	# Copy existing config file to preserve permissions.
-        local pgbouncer_config_new=$(/bin/mktemp --suffix=.juju)
+	local pgbouncer_config_new=$(/bin/mktemp --suffix=.juju)
 	cp -a $pgbouncer_config $pgbouncer_config_new
 
 	# Generate the "databases" section first from list of Juju relations.
@@ -39,15 +35,31 @@
 
 	# Generate the general "pgbouncer" section with configuration options
 	# from Juju's configs.
-	# Need to use cheetah cli. Setup vars and excuete cheetah-compile???
-	scripts/template-generate.py -j $juju_configs $general_template \
-		>> $pgbouncer_config_new
+	export admin_users=$(config-get admin_users)
+	export auth_file=$(config-get auth_file)
+	export auth_type=$(config-get auth_type)
+	export client_login_timeout=$(config-get client_login_timeout)
+	export default_pool_size=$(config-get default_pool_size)
+	export ignore_startup_parameters=$(config-get ignore_startup_parameters)
+	export listen_addr=$(config-get listen_addr)
+	export listen_port=$(config-get listen_port)
+	export logfile=$(config-get logfile)
+	export max_client_conn=$(config-get max_client_conn)
+	export pidfile=$(config-get pidfile)
+	export pool_mode=$(config-get pool_mode)
+	export reserve_pool_size=$(config-get reserve_pool_size)
+	export server_check_delay=$(config-get server_check_delay)
+	export server_connect_timeout=$(config-get server_connect_timeout)
+	export server_idle_timeout=$(config-get server_idle_timeout)
+	export server_lifetime=$(config-get server_lifetime)
+	export server_login_retry=$(config-get server_login_retry)
+	cheetah fill --env --stdout $general_template >> $pgbouncer_config_new
 
 	# Looks good, let's make it live.
 	mv $pgbouncer_config_new $pgbouncer_config
 
 	# Clean up
-	rm -f $pgbouncer_userlist_new $juju_configs $pgbouncer_config_new
+	rm -f $pgbouncer_userlist_new $pgbouncer_config_new
 
 	juju-log "reloading pgbouncer"
 	service pgbouncer reload || exit 1
 
=== removed file 'scripts/template-generate.py'
--- scripts/template-generate.py	2012-10-03 16:59:12 +0000
+++ scripts/template-generate.py	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-#!/usr/bin/python
-
-# Copyright 2012 Canonical Ltd. All rights reserved.
-# Author: Haw Loeung <[e-mail]>
-
-# Script used to generate file using python-cheetah template.
-
-from optparse import OptionParser
-from Cheetah.Template import Template
-import json
-import sys
-
-
-###############################################################################
-# Supporting functions
-###############################################################################
-
-#------------------------------------------------------------------------------
-# config_get:  Returns a dictionary containing all of the config information
-#              Optional parameter: scope
-#              scope: limits the scope of the returned configuration to the
-#                     desired config item.
-#------------------------------------------------------------------------------
-def config_get(scope=None):
-    try:
-        config_cmd_line = ['config-get']
-        if scope is not None:
-            config_cmd_line.append(scope)
-        config_cmd_line.append('--format=json')
-        config_data = json.loads(subprocess.check_output(config_cmd_line))
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        config_data = None
-    finally:
-        return(config_data)
-
-#------------------------------------------------------------------------------
-# relation_json:  Returns json-formatted relation data
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#                relation_id:  specify relation id for out of context usage.
-#------------------------------------------------------------------------------
-def relation_json(scope=None, unit_name=None, relation_id=None):
-    try:
-        relation_cmd_line = ['relation-get', '--format=json']
-        if relation_id is not None:
-            relation_cmd_line.extend(('-r', relation_id))
-        if scope is not None:
-            relation_cmd_line.append(scope)
-        else:
-            relation_cmd_line.append('-')
-        relation_cmd_line.append(unit_name)
-        relation_data = subprocess.check_output(relation_cmd_line)
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        relation_data = None
-    finally:
-        return(relation_data)
-
-#------------------------------------------------------------------------------
-# relation_get:  Returns a dictionary containing the relation information
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#                relation_id:  specify relation id for out of context usage.
-#------------------------------------------------------------------------------
-def relation_get(scope=None, unit_name=None, relation_id=None):
-    try:
-        relation_data = json.loads(relation_json())
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        relation_data = None
-    finally:
-        return(relation_data)
-
-#------------------------------------------------------------------------------
-# relation_ids:  Returns a list of relation ids
-#                optional parameters: relation_type
-#                relation_type: return relations only of this type
-#------------------------------------------------------------------------------
-def relation_ids(relation_types=['db-proxy','backend-db-admin']):
-    # accept strings or iterators
-    if isinstance(relation_types, basestring):
-        reltypes = [relation_types,]
-    else:
-        reltypes = relation_types
-    relids = []
-    for reltype in reltypes:
-        relid_cmd_line = ['relation-ids', '--format=json',reltype]
-        relids.extend(json.loads(subprocess.check_output(relid_cmd_line)))
-    return relids
-
-#------------------------------------------------------------------------------
-# relation_get_all:  Returns a dictionary containing the relation information
-#                optional parameters: relation_type
-#                relation_type: limits the scope of the returned data to the
-#                               desired item.
-#------------------------------------------------------------------------------
-def relation_get_all():
-    reldata = {}
-    try:
-        relids = relation_ids()
-        for relid in relids:
-            units_cmd_line = ['relation-list','--format=json','-r',relid]
-            units = json.loads(subprocess.check_output(units_cmd_line))
-            for unit in units:
-                reldata[unit] = json.loads(relation_json(relation_id=relid,unit_name=unit))
-                reldata[unit]['relation-id'] = relid
-                reldata[unit]['name'] = unit.replace("/","_")
-    except Exception, e:
-        subprocess.call(['juju-log', str(e)])
-        reldata = []
-    finally:
-        return(reldata)
-
-#------------------------------------------------------------------------------
-# template_generate: Generate the cheetah template
-#                    template:     Template file
-#                    searchlist:   searchlist dictionary of configuration
-#------------------------------------------------------------------------------
-def template_generate(template, searchlist):
-    """ Generate file using specified python-cheetah template file """
-
-    if not template:
-        print "ERROR: No template provided."
-        return -1
-
-    tmpl = Template(file=template, searchList=searchlist)
-    print tmpl
-
-
-def main():
-    parser = OptionParser()
-    parser.add_option("-j", "--json", dest="json",
-                      help="JSON file to read in for template searchlist")
-
-    (options, args) = parser.parse_args()
-    searchlist = dict(json.loads(open(options.json).read()).items() +  relation_get_all().items())
-
-    for template in args:
-        template_generate(template, searchlist)
-
-
-if __name__ == '__main__':
-        sys.exit(main())