Merge lp:~jacekn/charms/precise/mysql/n-e-m-relation-v2 into lp:charms/mysql

[Jacek Nykis]

Added another nrpe check for better monitoring

[Benjamin Saller (bcsaller)]

+1 Thanks.

I included a minor suggestion about a way to slightly cleanup the add_nagios_user call.

[Benjamin Saller (bcsaller)]

This is a +1 from me. A ~charmer will be by shortly to complete the review and promulgate this charm if there’s no other issues. Thanks for your submission thus far!

I included a minor suggestion about a way to slightly cleanup the add_nagios_user call.

[Charles Butler (lazypower)]

I just had a minor knitpick on the use of os.path.join without using os.path.sep to set the root - as this will break on non posix systems.

Otherwise LGTM.

review: Approve

[Charles Butler (lazypower)]

I've gone ahead and committed this as is, considering there were only minor knitpicks.

Thanks for the submission Jacek!

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-05-09 11:20:25 +0000
+++ hooks/config-changed	2014-05-09 11:20:25 +0000
@@ -380,4 +380,4 @@
         check_call(['service', 'mysql', 'restart'])
 if relations_of_type('nrpe-external-master'):
     import nrpe_relations
-    nrpe_relations.update_nrpe_checks()
+    nrpe_relations.nrpe_relation()

=== modified file 'hooks/nrpe_relations.py'
--- hooks/nrpe_relations.py	2014-05-09 11:20:25 +0000
+++ hooks/nrpe_relations.py	2014-05-09 11:20:25 +0000
@@ -1,17 +1,60 @@
 #!/usr/bin/env python
 
+import os
 import sys
+import uuid
+import MySQLdb
 from charmhelpers.core.hookenv import (
     log,
     relations_of_type,
     Hooks, UnregisteredHookError
 )
 from charmhelpers.contrib.charmsupport.nrpe import NRPE
+from common import get_db_cursor
 
 
 hooks = Hooks()
 
 
+def nagios_password():
+    PASSFILE = os.path.join('/var', 'lib', 'mysql', 'nagios.passwd')
+    if not os.path.isfile(PASSFILE):
+        password = str(uuid.uuid4())
+        with open(PASSFILE, 'w') as f:
+            f.write(password)
+        os.chmod(PASSFILE, 0600)
+    else:
+        with open(PASSFILE, 'r') as rpw:
+            password = rpw.read()
+    return password
+
+
+def add_nagios_user():
+    c = get_db_cursor()
+    if c.execute("SELECT User from mysql.user where User='nagios'"):
+        log('User nagios already exists, skipping')
+    else:
+        log('Creating "nagios" database user')
+        password = nagios_password()
+        c.execute("CREATE USER 'nagios'@'localhost' IDENTIFIED BY '{}'"
+                  "".format(password))
+
+    try:
+        c.execute("SHOW GRANTS FOR 'nagios'@'localhost'")
+        grants = [i[0] for i in c.fetchall()]
+    except MySQLdb.OperationalError:
+        grants = []
+
+    for grant in grants:
+        if "GRANT PROCESS ON *.*" in grant:
+            log('User already has permissions, skipping')
+            c.close()
+            return
+    log('Granting "PROCESS" privilege to nagios user')
+    c.execute("GRANT PROCESS ON *.* TO 'nagios'@'localhost'")
+    c.close()
+
+
 def update_nrpe_checks():
     log('Refreshing nrpe checks')
     # Find out if nrpe set nagios_hostname
@@ -26,12 +69,18 @@
         description='Check MySQL process',
         check_cmd='check_procs -c 1:1 -C mysqld'
     )
+    nrpe.add_check(
+        shortname='mysql',
+        description='Check MySQL connectivity',
+        check_cmd='check_mysql -u nagios -p {}'.format(nagios_password())
+    )
     nrpe.write()
 
 
 @hooks.hook('nrpe-external-master-relation-changed')
 @hooks.hook('nrpe-external-master-relation-joined')
-def add_nrpe_relation():
+def nrpe_relation():
+    add_nagios_user()
     update_nrpe_checks()
 
 

=== modified file 'revision'
--- revision	2014-05-09 11:20:25 +0000
+++ revision	2014-05-09 11:20:25 +0000
@@ -1,1 +1,1 @@
-321
+325