Merge lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk-add-conn-check-support into lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk

[Thomi Richards]

Hook up conn-check support.

Hook up conn-check support.

[lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk-add-conn-check-support]

22. By Thomi Richards on 2015-08-13

Merge trunk.

23. By Thomi Richards on 2015-08-13

Remove commented out code.

24. By Thomi Richards on 2015-08-13

Remove commented out code.

25. By Thomi Richards on 2015-08-13

Undo accidental removal of config option when merging trunk.

26. By Thomi Richards on 2015-08-13

Clean up indentation.

[Thomi Richards (thomir-deactivatedaccount)]

Note: the whitespace change inconfig.yaml is to clean up the indentation in that file :D

[lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk-add-conn-check-support]

27. By Thomi Richards on 2015-08-13

Encode content as utf8.

[Guillermo Gonzalez (verterok)]

looks good.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-08-12 13:18:35 +0000
+++ config.yaml	2015-08-13 05:36:34 +0000
@@ -13,9 +13,14 @@
     default: ""
     description: |
       Used by the nrpe subordinate charms.
+  conn_check_config:
+    type: string
+    default: ""
+    description: |
+      A base64 encoded YAML config file for conn-check.
   nagios_servicegroups:
-      default: ""
-      type: string
-      description: |
-        A comma-separated list of nagios servicegroups.
-        If left empty, the nagios_context will be used as the servicegroup
+    default: ""
+    type: string
+    description: |
+      A comma-separated list of nagios servicegroups.
+      If left empty, the nagios_context will be used as the servicegroup

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-08-11 00:00:58 +0000
+++ hooks/actions.py	2015-08-13 05:36:34 +0000
@@ -1,6 +1,7 @@
 import base64
 import configparser
 import os
+import os.path
 import subprocess
 
 from charmhelpers import fetch
@@ -15,7 +16,10 @@
 
 
 REQUIRED_PACKAGES = [
-    'python-virtualenv', 'python3-dev', 'python3-jinja2'
+    'python-virtualenv',
+    'python3-dev',
+    'python3-jinja2',
+    'python3-yaml',
 ]
 
 WSGI_USER = 'www-data'
@@ -26,6 +30,7 @@
 BASE_DIR = '/srv/result-enum-api/{}'.format(config['environment'])
 SERVICE_DIR = os.path.join(BASE_DIR, 'result-enum-api')
 LOG_DIR = os.path.join(BASE_DIR, 'logs')
+ETC_DIR = os.path.join(BASE_DIR, 'etc')
 
 
 def log_start(service_name):
@@ -128,6 +133,64 @@
         return data
 
 
+class ConnCheckRelation(helpers.RelationContext):
+
+    name = 'conn-check'
+    interface = 'conn-check'
+    required_keys = []
+
+    def provide_data(self):
+        import yaml
+        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_mongodb_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'
+        )
+        conn_check_config_dir = os.path.dirname(conn_check_config_path)
+        if not os.path.exists(conn_check_config_dir):
+            host.mkdir(conn_check_config_dir)
+        host.write_file(
+            conn_check_config_path,
+            content.encode('utf8'),
+            owner='ubuntu',
+            group='nagios',
+            perms=0o440
+        )
+        # notify the relation
+        return dict(config_path=conn_check_config_path,
+                    nagios_servicegroups=config['nagios_context'])
+
+    def _get_mongodb_checks(self):
+        config = hookenv.config()
+        checks = []
+        db_rels = hookenv.relations_of_type('mongodb')
+
+        config_content = base64.b64decode(config['config-file']).decode()
+        parser = configparser.ConfigParser()
+        parser.read_string(config_content)
+        database = parser['mongodb'].get('dbname', 'testresults')
+        for server in db_rels:
+            if 'private-address' not in server:
+                continue
+            db_check = {
+                'type': 'mongodb',
+                'host': server['private-address'],
+                'port': int(server.get('port', '27017')),
+                'database': database,
+            }
+            checks.append(db_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:39:51 +0000
+++ hooks/services.py	2015-08-13 05:36:34 +0000
@@ -18,7 +18,10 @@
     manager = ServiceManager([
         {
             'service': 'result-enum-api',
-            'provided_data': [actions.WebsiteRelation()],
+            'provided_data': [
+                actions.WebsiteRelation(),
+                actions.ConnCheckRelation(),
+            ],
             'required_data': [config, MongoRelation()],
             'data_ready': [
                 actions.ensure_directories,

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-08-05 01:21:23 +0000
+++ metadata.yaml	2015-08-13 05:36:34 +0000
@@ -10,6 +10,9 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  conn-check:
+    interface: conn-check
+    scope: container
 requires:
   mongodb:
-    interface: mongodb
\ No newline at end of file
+    interface: mongodb