Merge lp:~verterok/charms/trusty/tanuki-spec-manager/conn-check-support into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Guillermo Gonzalez]

add initial conn-check support

add initial conn-check support

[Thomi Richards (thomir-deactivatedaccount)]

This LGTM - the urlparse stuff is a bit... icky, but I can't think of an easier way to do this.

review: Approve

[Tanuki Bot (tanuki-bot)]

Attempt to merge into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk failed due to conflicts:

text conflict in config.yaml

[lp:~verterok/charms/trusty/tanuki-spec-manager/conn-check-support]

25. By Guillermo Gonzalez on 2015-08-13

merge trunk

=== modified file 'config.yaml'
--- config.yaml	2015-08-12 13:14:14 +0000
+++ config.yaml	2015-08-13 14:17:24 +0000
@@ -34,3 +34,7 @@
       description: |
         A comma-separated list of nagios servicegroups.
         If left empty, the nagios_context will be used as the servicegroup
+  conn_check_config:
+    type: string 
+    default: ""
+    description: base64 encoded YAML config for conn-check

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-08-11 09:50:16 +0000
+++ hooks/actions.py	2015-08-13 14:17:24 +0000
@@ -1,6 +1,7 @@
 import ConfigParser
 import base64
 import os
+import urlparse
 import subprocess
 import yaml
 
@@ -204,6 +205,71 @@
         return hookenv.local_unit() in units
 
 
+class ConnCheckRelation(helpers.RelationContext):
+
+    name = 'conn-check'
+    interface = 'conn-check'
+    required_keys = []
+
+    def provide_data(self):
+        config = hookenv.config()
+        conn_check_config = []
+        base64_config = config.get('conn_check_config')
+        if base64_config:
+            conn_check_config.extend(yaml.safe_load(base64.b64decode(base64_config)))
+        conn_check_config.extend(self._get_postgresql_checks())
+        conn_check_config.extend(self._get_amqp_checks())
+        # save the yaml conn-check config file
+        content = yaml.dump(conn_check_config, default_flow_style=False)
+        conn_check_config_path = os.path.join(ETC_DIR, 'conn-check-config.yaml')
+        host.write_file(conn_check_config_path, content,
+                        owner='ubuntu', group='nagios', perms=0o440)
+        # notify the relation
+        return dict(config_path=conn_check_config_path,
+                    nagios_servicegroups=config['nagios_context'])
+
+    def _get_postgresql_checks(self):
+        config = hookenv.config()
+        checks = []
+        db_rels = hookenv.relations_of_type('db')
+        required_data = ('port', 'host', 'user', 'password', 'database')
+        for server in db_rels:
+            if len(required_data) != len([k for k in required_data if k in server]) \
+                    and server['database'] == config['db_name']:
+                continue
+            db_check = {'type': 'postgres',
+                        'host': server['host'],
+                        'port': int(server['port']),
+                        'username': server['user'],
+                        'password': server['password'],
+                        'database': server['database']}
+            checks.append(db_check)
+        return checks
+
+    def _get_amqp_checks(self):
+        checks = []
+        # read amqp uris from config file to build amqp check
+        parser = ConfigParser.ConfigParser()
+        config_file = os.path.join(SERVICE_DIR, 'service.conf')
+        parser.read([config_file])
+        if 'amqp' not in parser.sections():
+            return checks
+        # only if amqp section is defined
+        for amqp_uri in parser.get('amqp', 'uris').split():
+            parsed = urlparse.urlparse(amqp_uri)
+            vhost = urlparse.unquote(parsed.path[1:]) or '/'
+            use_tls = parsed.scheme == "amqps"
+            amqp_check = dict(type="amqp",
+                              host=parsed.hostname,
+                              port=parsed.port,
+                              username=parsed.username,
+                              password=parsed.password,
+                              use_tls=use_tls,
+                            vhost=vhost)
+            checks.append(amqp_check)
+        return checks
+
+
 def nrpe_external_master_relation(service_name):
     ''' Configure the nrpe-external-master relation '''
     nrpe_compat = nrpe.NRPE()

=== added symlink 'hooks/conn-check-relation-changed'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-08-10 15:22:14 +0000
+++ hooks/services.py	2015-08-13 14:17:24 +0000
@@ -13,7 +13,8 @@
         {
             'service': 'spec-manager',
             'provided_data': [actions.WebsiteRelation(),
-                              actions.PostgresqlRelation()],
+                              actions.PostgresqlRelation(),
+                              actions.ConnCheckRelation()],
             'required_data': [config,
                               actions.PostgresqlRelation(required=True)],
             'data_ready': [

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-08-04 12:30:43 +0000
+++ metadata.yaml	2015-08-13 14:17:24 +0000
@@ -10,6 +10,9 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  conn-check:
+    interface: conn-check
+    scope: container
 
 requires:
   db: