Merge charm-juju-controller:bug/1922292 into charm-juju-controller:master

[Adam Dyess]

Add Monitoring for juju-db installed by snap

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

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

[Paul Goins (vultaire)]

LGTM, +1

review: Approve

[Xav Paice (xavpaice)]

Fails lint, unfortunately. I've put the lint differences inline.

I'll work on getting this into CI shortly.

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:91ae9e6e973f28c1f8d6aa4a6a7602dc542d8814
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/143/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/353/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/1//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:b440406a08f930c8fd55d2a0d92f4b26b75d3a16
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/144/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/354/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/2//rebuild

review: Approve (continuous-integration)

[Xav Paice (xavpaice)]

LGTM

review: Approve

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

Change successfully merged at revision a49a21f0cba41f349c6a52ea1703a7c91cef90c5

diff --git a/src/lib/lib_juju_controller.py b/src/lib/lib_juju_controller.py
index 6432c3c..08eb0b7 100644
--- a/src/lib/lib_juju_controller.py
+++ b/src/lib/lib_juju_controller.py
@@ -11,6 +11,7 @@ import yaml
 AGENTDIRGLOB = "/var/lib/juju/agents/machine-*"
 CACERTPATH = "/run/juju-controller-ca.crt"
 PUBAGENTCONFPATH = "/run/juju-controller-public-agent.conf"
+SNAP_JUJU_DB_SVC = "/etc/systemd/system/snap.juju-db.daemon.service"
 
 
 class JujuControllerHelper:
@@ -55,7 +56,10 @@ class JujuControllerHelper:
     @property
     def services(self):
         """Return the list of juju services on this machine."""
-        return ["juju-db", "jujud-machine-{}".format(self._machine_id())]
+        return [
+            "snap.juju-db.daemon" if os.path.exists(SNAP_JUJU_DB_SVC) else "juju-db",
+            "jujud-machine-{}".format(self._machine_id()),
+        ]
 
     @property
     def agent_conf_path(self):
diff --git a/src/tests/unit/test_lib_juju_controller.py b/src/tests/unit/test_lib_juju_controller.py
index 03bae5b..a40ddd0 100644
--- a/src/tests/unit/test_lib_juju_controller.py
+++ b/src/tests/unit/test_lib_juju_controller.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 """Pytest test cases for lib_juju_controller.py."""
 
+import mock
+
 EXPECTED = {
     "machine-id": "99",
     "services": ["juju-db", "jujud-machine-99"],
@@ -44,9 +46,20 @@ class TestJujuControllerLib:
         """Test parsing the machine id."""
         assert jujucontroller._machine_id() == EXPECTED["machine-id"]
 
-    def test_services(self, jujucontroller):
+    def test_services_snap(self, jujucontroller):
+        """Test collecting all juju services."""
+        with mock.patch("os.path.exists", autospec=True) as path_exists:
+            path_exists.return_value = True
+            expected = list(EXPECTED["services"])
+            expected.remove("juju-db")
+            expected.insert(0, "snap.juju-db.daemon")
+            assert jujucontroller.services == expected
+
+    def test_services_apt(self, jujucontroller):
         """Test collecting all juju services."""
-        assert jujucontroller.services == EXPECTED["services"]
+        with mock.patch("os.path.exists", autospec=True) as path_exists:
+            path_exists.return_value = False
+            assert jujucontroller.services == EXPECTED["services"]
 
     def test_version(self, jujucontroller):
         """Test reporting the controller version."""