Merge ~shaner/charm-thruk-agent:master into ~nagios-charmers/charm-thruk-agent:master

[Shane Peters]

enable status updates

[Shane Peters (shaner)]

While this works fine, I haven't worked with ServiceManager before so there might be a better approach. Give it a test and let me know!

[Shane Peters (shaner)]

Test: https://pastebin.ubuntu.com/p/B7yc8c6dsY/

[Shane Peters (shaner)]

Test bundle: https://pastebin.ubuntu.com/p/cHHH3jTtBr/

[Alvaro Uria (aluria)]

Added Canonical IS Reviewers per internal discussion.

[Stuart Bishop (stub)]

This charm needs to be reworked into charms.reactive, but that is beyond the scope of this MP. From my recollection of ServiceManager, this is the cleanest way to wait for the socket.

This all looks good. Per inline comment, I suspect you should be using 'waiting' instead of 'blocked' when the socket is not available. 'waiting' is when the charm is expected to resolve itself. 'blocked' means an action needs to be performed by somebody before things will resolve.

Confirm and/or change the pending status, and good for landing.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

@Shane - let us know here when you are happy, and someone in Canonical IS can land this for you and republish the charm.

[Shane Peters (shaner)]

Hi Stuart, Thanks for the review. I was a bit torn between which one to use (waiting|blocked) but decided to go with blocked as would likely require the operator to enable the livestatus socket option in the nagios charm.

I'm comfortable with the existing code as it is. Certainly would agree it needs to be reworked into an reactive charm, time permitting.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 9447b49a0ba39bfd59fd9125ab5421eab71b9f90

diff --git a/hooks/actions.py b/hooks/actions.py
index d75affd..a72e9a6 100644
--- a/hooks/actions.py
+++ b/hooks/actions.py
@@ -98,3 +98,7 @@ def update_ppa(service_name):
     apt_update(fatal=True)
     package_list = ["thruk", "pwgen", "apache2-utils"]
     apt_install(packages=package_list, fatal=True)
+
+
+def update_status(service_name):
+   hookenv.status_set('active', 'ready')
diff --git a/hooks/services.py b/hooks/services.py
index 36b9a17..b21febe 100644
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -16,7 +16,10 @@ def manage():
             'provided_data': [
                 thruk_helpers.ThrukAgentRelation()
             ],
-            'required_data': [thruk_helpers.ThrukInfo()],
+            'required_data': [
+                thruk_helpers.ThrukInfo(),
+                thruk_helpers.CheckLivestatusSocket(),
+            ],
             'data_ready': [
                 helpers.render_template(
                     source='thruk_local.conf',
@@ -26,6 +29,7 @@ def manage():
                 actions.fix_livestatus_perms,
                 actions.thruk_set_password,
                 actions.notify_thrukmaster_relation,
+                actions.update_status,
             ],
         },
         {
diff --git a/hooks/thruk_helpers.py b/hooks/thruk_helpers.py
index df208e5..70619ce 100644
--- a/hooks/thruk_helpers.py
+++ b/hooks/thruk_helpers.py
@@ -3,6 +3,8 @@
 from charmhelpers.core import hookenv
 from charmhelpers.core.services import helpers
 
+import os
+import sys
 import hashlib
 
 
@@ -45,6 +47,18 @@ class ThrukInfo(dict):
         self['thruk_id'] = m.hexdigest()
 
 
+class CheckLivestatusSocket(dict):
+    def __bool__(self):
+        if not os.path.exists(hookenv.config('livestatus_path')):
+            hookenv.status_set('blocked',
+                               'nagios livestatus socket missing')
+            return False
+        return True
+
+    def __nonzero__(self):
+        return self.__bool__()
+
+
 class NEMRelation(helpers.RelationContext):
     name = 'nrpe-external-master'
     interface = 'nrpe-external-master'
@@ -58,4 +72,3 @@ class NEMRelation(helpers.RelationContext):
         if not hookenv.relation_ids(self.name):
             return
         self['nrpe_external_master'] = self[self.name]
-
diff --git a/hooks/update-status b/hooks/update-status
new file mode 120000
index 0000000..9416ca6
--- /dev/null
+++ b/hooks/update-status
@@ -0,0 +1 @@
+hooks.py
\ No newline at end of file