Merge ~afreiberger/charm-nagios:bug/1819537 into charm-nagios:master

[Drew Freiberger]

Add restart after livestatus installation

Restarts Nagios after installing mklivestatus so that the socket gets created.

Fixes-bug: LP: #1819537

[Joe Guo (guoqiao)]

2 inline comments, only the 2nd one matters.

review: Needs Fixing

[Xav Paice (xavpaice)]

Thanks for that, have updated and am re-running functional testing now.

I'm concerned that a glaring hole like not installing the package didn't get pulled up by functests, might need to add a bug for that.

[Xav Paice (xavpaice)]

Ah... the functest has enable livestatus enabled at install, and hooks/install does the package install for that.

[Joe Guo (guoqiao)]

LGTM, +1.

review: Approve

[James Hebden (ec0)]

LGTM, +1

review: Approve

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision 2b3fdea5aa0aa1c6cccb89d0f18b8b226ea593ea

[Drew Freiberger (afreiberger)]

This was merged to the wrong master branch. resubmit under ~llama-charmers

review: Approve

diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
index 4152e53..91b4b69 100755
--- a/hooks/upgrade_charm.py
+++ b/hooks/upgrade_charm.py
@@ -171,32 +171,33 @@ def fixpath(path):
 
 
 def enable_livestatus_config():
-    if enable_livestatus:
-        hookenv.log("Livestatus is enabled")
-        fetch.apt_update()
-        fetch.apt_install("check-mk-livestatus")
-
-        # Make the directory and fix perms on it
-        hookenv.log("Fixing perms on livestatus_path")
-        livestatus_dir = os.path.dirname(livestatus_path)
-
-        if not os.path.isdir(livestatus_dir):
-            hookenv.log("Making path for livestatus_dir")
-            mkdir_p(livestatus_dir)
-        fixpath(livestatus_dir)
-
-        # Fix the perms on the socket
-        hookenv.log("Fixing perms on the socket")
-        uid = pwd.getpwnam(nagios_user).pw_uid
-        gid = grp.getgrnam("www-data").gr_gid
-        os.chown(livestatus_path, uid, gid)
-        os.chown(livestatus_dir, uid, gid)
-        st = os.stat(livestatus_path)
-        os.chmod(livestatus_path, st.st_mode | stat.S_IRGRP)
-        os.chmod(
-            livestatus_dir,
-            st.st_mode | stat.S_IRGRP | stat.S_ISGID | stat.S_IXUSR | stat.S_IXGRP,
-        )
+    livestatus_dir = os.path.dirname(livestatus_path)
+    hookenv.log("Livestatus is enabled")
+    if not os.path.isdir(livestatus_dir):
+        hookenv.log("Making path for livestatus_dir")
+        mkdir_p(livestatus_dir)
+    # fix perms on livestatus dir
+    hookenv.log("Fixing perms on livestatus_path")
+    fixpath(livestatus_dir)
+    fetch.apt_update()
+    missing_packages = fetch.filter_installed_packages(["check-mk-livestatus"])
+    if missing_packages:
+        fetch.apt_install(missing_packages)
+        # This needs a nagios restart to actually make the socket
+        host.service_reload("nagios3")
+
+    # Fix the perms on the socket
+    hookenv.log("Fixing perms on the socket")
+    uid = pwd.getpwnam(nagios_user).pw_uid
+    gid = grp.getgrnam("www-data").gr_gid
+    os.chown(livestatus_path, uid, gid)
+    os.chown(livestatus_dir, uid, gid)
+    st = os.stat(livestatus_path)
+    os.chmod(livestatus_path, st.st_mode | stat.S_IRGRP)
+    os.chmod(
+        livestatus_dir,
+        st.st_mode | stat.S_IRGRP | stat.S_ISGID | stat.S_IXUSR | stat.S_IXGRP,
+    )
 
 
 def enable_pagerduty_config():
@@ -627,7 +628,6 @@ if ssl_configured():
 enable_pagerduty_config()
 update_contacts()
 update_config()
-enable_livestatus_config()
 update_apache()
 update_localhost()
 update_cgi_config()
@@ -639,6 +639,8 @@ if password:
 
 if nagiosadmin != "nagiosadmin":
     update_password("nagiosadmin", False)
+if enable_livestatus:
+    enable_livestatus_config()
 
 subprocess.call(["scripts/postfix_loopback_only.sh"])
 subprocess.call(["hooks/mymonitors-relation-joined"])