Merge lp:~clint-fewbar/charms/precise/mysql/add-monitors into lp:charms/mysql

[Clint Byrum]

Add support for monitors interface.

This adds support for the 'monitors' interface. Please see

https://code.launchpad.net/~clint-fewbar/charms/precise/nagios/add-monitors-2/+merge/117999

For information regarding that interface.

[Mark Mims (mark-mims)]

review: Approve

[Mark Mims (mark-mims)]

discussion/recommendations:

Please move included scripts into a separate directory like
`$CHARM_DIR/lib` or `$CHARM_DIR\scripts`... only hooks belong
in the `hooks` directory. Charm readability is the goal for
our main series of charms like mysql.

We really should change the `.bash` file extensions to the more standard `.sh`...
/me thinks it's just a tad too pedantic to make a distinction between the two.
Why raise even the slightest possibility for people or editors to be confused?

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-04-25 07:36:45 +0000
+++ hooks/config-changed	2012-08-02 21:30:25 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from subprocess import check_output,check_call
+from subprocess import check_output,check_call, CalledProcessError
 import tempfile
 import json
 import re
@@ -261,6 +261,6 @@
 if need_restart:
     try:
         check_call(['service','mysql','stop'])
-    except subprocess.CalledProcessError:
+    except CalledProcessError:
         pass
     check_call(['service','mysql','start'])
 
=== modified file 'hooks/install'
--- hooks/install	2012-04-25 07:20:11 +0000
+++ hooks/install	2012-08-02 21:30:25 +0000
@@ -1,7 +1,8 @@
 #!/bin/bash
 
+add-apt-repository -y ppa:charmers/charm-helpers
 apt-get update
-sudo apt-get install -qqy debconf-utils python-mysqldb uuid augeas-tools augeas-lenses pwgen dnsutils || exit 1
+apt-get install -y debconf-utils python-mysqldb uuid augeas-tools augeas-lenses pwgen dnsutils charm-helper-sh || exit 1
 
 PASSFILE=/var/lib/juju/mysql.passwd
 if ! [ -f $PASSFILE ] ; then
@@ -12,4 +13,4 @@
 echo mysql-server-5.1 mysql-server/root_password password $PASSWORD | debconf-set-selections
 echo mysql-server-5.1 mysql-server/root_password_again password $PASSWORD | debconf-set-selections
 
-DEBIAN_FRONTEND=noninteractive apt-get -y install -qq mysql-server
+apt-get -y install -qq mysql-server
 
=== added symlink 'hooks/local-monitors-relation-joined'
=== target is u'monitors-relation-joined'
=== added file 'hooks/monitors-relation-broken'
--- hooks/monitors-relation-broken	1970-01-01 00:00:00 +0000
+++ hooks/monitors-relation-broken	2012-08-02 21:30:25 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ue
+. hooks/monitors.common.bash
+if [ -r "$revoke_todo" ] ; then
+    sed -e 's/^/REVOKE USAGE ON *.* FROM /;s/$/\;/;' < $revoke_todo
+    sed -e 's/^/REVOKE USAGE ON *.* FROM /;s/$/\;/;' < $revoke_todo | $MYSQL
+    rm -f $revoke_todo
+fi
 
=== added file 'hooks/monitors-relation-departed'
--- hooks/monitors-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/monitors-relation-departed	2012-08-02 21:30:25 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+. /usr/share/charm-helpers/sh/net.sh
+$MYSQL -e "REVOKE USAGE ON *.* FROM '${monitor_user}'@'${remote_addr}'"
 
=== added file 'hooks/monitors-relation-joined'
--- hooks/monitors-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/monitors-relation-joined	2012-08-02 21:30:25 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ue
+. hooks/monitors.common.bash
+echo "'${monitor_user}'@'${remote_addr}'" >> $revoke_todo
+$MYSQL -e "GRANT USAGE ON *.* TO '${monitor_user}'@'${remote_addr}'"
+
+relation-set monitors="$(cat monitors.yaml)" target-id=${JUJU_UNIT_NAME//\//-} target-address=$(unit-get private-address)
 
=== added file 'hooks/monitors.common.bash'
--- hooks/monitors.common.bash	1970-01-01 00:00:00 +0000
+++ hooks/monitors.common.bash	2012-08-02 21:30:25 +0000
@@ -0,0 +1,8 @@
+MYSQL="mysql -uroot -p`cat /var/lib/juju/mysql.passwd`"
+monitor_user=monitors
+. /usr/share/charm-helper/sh/net.sh
+if [ -n "$JUJU_REMOTE_UNIT" ] ; then
+    remote_addr=$(ch_get_ip $(relation-get private-address))
+fi
+mkdir -p data
+revoke_todo=data/${JUJU_RELATION_ID}
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2012-05-22 22:15:41 +0000
+++ metadata.yaml	2012-08-02 21:30:25 +0000
@@ -1,4 +1,5 @@
 name: mysql
+format: 2
 summary: MySQL is a fast, stable and true multi-user, multi-threaded SQL database
 maintainer: Clint Byrum <[e-mail]>
 description: |
@@ -17,6 +18,11 @@
     interface: mysql-oneway-replication
   munin:
     interface: munin-node
+  monitors:
+    interface: monitors
+  local-monitors:
+    interface: local-monitors
+    scope: container
 requires:
   slave:
     interface: mysql-oneway-replication
 
=== added file 'monitors.yaml'
--- monitors.yaml	1970-01-01 00:00:00 +0000
+++ monitors.yaml	2012-08-02 21:30:25 +0000
@@ -0,0 +1,13 @@
+version: '0.3'
+monitors:
+    local:
+        procrunning:
+            mysqld:
+                name: MySQL Running
+                min: 1
+                max: 1
+                executable: mysqld
+    remote:
+        mysql:
+            basic:
+                user: monitors
 
=== modified file 'revision'
--- revision	2012-04-25 08:23:44 +0000
+++ revision	2012-08-02 21:30:25 +0000
@@ -1,1 +1,1 @@
-121
+145