Merge lp:~aglenyoung/charms/precise/mysql/nrpe-support into lp:charms/mysql

[Andrew Glen-Young]

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Hi agy:

Can you document the nrpe support somewhere in the README? charm proof is complaining about:
I: relation nrpe-external-master has no hooks

I think I know where this is going but, it would be beneficial to have some documentation as to how to use this interface since there is no hook associated with it.

-Juan

review: Disapprove

Unmerged revisions

93. By Andrew Glen-Young on 2013-02-28

Add support for nrpe-external-master subordinate charm and charm preinstall hooks.

=== modified file 'config.yaml'
--- config.yaml	2012-09-13 21:44:01 +0000
+++ config.yaml	2013-02-28 23:02:21 +0000
@@ -31,3 +31,13 @@
         default: 'MIXED'
         type: string
         description: If binlogging is enabled, this is the format that will be used. Ignored when tuning-level == fast.
+    nagios_context:
+        default: "juju"
+        type: string
+        description: |
+          Used by the nrpe-external-master subordinate charm.
+          A string that will be prepended to instance name to set the host name
+          in nagios. So for instance the hostname would be something like:
+              juju-myservice-0
+          If you're running multiple environments with the same services in them
+          this allows you to differentiate between them.

=== modified file 'hooks/install'
--- hooks/install	2012-11-01 21:49:21 +0000
+++ hooks/install	2013-02-28 23:02:21 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f";done )
+
 apt-get update
 apt-get install -y debconf-utils python-mysqldb uuid pwgen dnsutils charm-helper-sh || exit 1
 

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2012-11-02 06:41:12 +0000
+++ hooks/upgrade-charm	2013-02-28 23:02:21 +0000
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f";done )
+
 home=`dirname $0`
 # Remove any existing .service_user files, which will cause
 # new users/pw's to be generated, which is a good thing

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-08-21 00:07:19 +0000
+++ metadata.yaml	2013-02-28 23:02:21 +0000
@@ -22,6 +22,9 @@
   local-monitors:
     interface: local-monitors
     scope: container
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 requires:
   slave:
     interface: mysql-oneway-replication