Merge ~freyes/charm-nrpe:add-jammy-support into charm-nrpe:master

[Felipe Reyes]

Add Jammy support.

[🤖 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.

[Eric Chen (eric-chen)]

review: Needs Fixing

[Przemyslaw Lal (przemeklal)]

Apart from Eric's comment about ordering this change LGTM. Rebase might be needed since we've recently bumped the charmhelpers version in the master branch.

review: Needs Fixing

[Felipe Reyes (freyes)]

Hi, I just pushed a new version that addresses the feedback left.

- Rebased on top of master
- Sorted the list of series from newest to oldest

Best,

[Przemyslaw Lal (przemeklal)]

Thanks, LGTM

review: Approve

[Corey Bryant (corey.bryant)]

LGTM. This is blocking a bunch of our tests so would be nice to get this support merged.

review: Approve

[Eric Chen (eric-chen)]

review: Approve

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

Change successfully merged at revision 12724fd22f98cd3d52a65b977d17895526784be8

diff --git a/charmcraft.yaml b/charmcraft.yaml
index d45d038..bda5184 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -23,6 +23,10 @@ bases:
           architectures: ["amd64"]
       run-on:
         - name: ubuntu
+          channel: "22.04"
+          architectures:
+              - amd64
+        - name: ubuntu
           channel: "20.04"
           architectures:
               - amd64
diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
index 9249905..b980912 100644
--- a/hooks/nrpe_helpers.py
+++ b/hooks/nrpe_helpers.py
@@ -818,6 +818,11 @@ def get_partitions_to_check():
                 continue
             if child.get("mountpoint", ""):
                 partitions_to_check.add(child.get("mountpoint"))
+            # Jammy returns a list of "mountpoints" instead of a single value
+            # in the key "mountpoint"
+            for mountpoint in child.get("mountpoints", []):
+                if mountpoint:
+                    partitions_to_check.add(mountpoint)
 
     skipped_partitions = {"[SWAP]", "/boot/efi"}
 
diff --git a/metadata.yaml b/metadata.yaml
index e3b05f5..342168f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -27,6 +27,7 @@ requires:
     interface: local-monitors
     scope: container
 series:
-  - bionic
+  - jammy
   - focal
+  - bionic
   - xenial
diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/jammy.yaml
 new file mode 100644
index 0000000..163b381
--- /dev/null
+++ b/tests/functional/tests/bundles/jammy.yaml
@@ -0,0 +1,23 @@
+local_overlay_enabled: true
+series: jammy
+applications:
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    channel: 3.9/stable
+    num_units: 1
+    constraints: root-disk=8G
+  container:
+    charm: ch:ubuntu
+    num_units: 1
+    to: ["lxd:rabbitmq-server/0"]
+  nagios:
+    charm: ch:nagios
+    num_units: 1
+    series: bionic
+relations:
+  - - rabbitmq-server:nrpe-external-master
+    - nrpe:nrpe-external-master
+  - - container:juju-info
+    - nrpe:general-info
+  - - nrpe:monitors
+    - nagios:monitors
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index 45c660f..c281785 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -1,5 +1,6 @@
 charm_name: nrpe
 gate_bundles:
+  - jammy
   - focal
   - bionic
   - xenial
@@ -10,4 +11,7 @@ tests:
 target_deploy_status:
   container:
     workload-status: active
-    workload-status-message-prefix: ""
 \ No newline at end of file
+    workload-status-message-prefix: ""
+tests_options:
+  force_deploy:
+    - jammy  # https://github.com/juju-solutions/charm-ubuntu/issues/44
diff --git a/tests/unit/test_nrpe_helpers.py b/tests/unit/test_nrpe_helpers.py
index 96d1ae4..fa5a54f 100644
--- a/tests/unit/test_nrpe_helpers.py
+++ b/tests/unit/test_nrpe_helpers.py
@@ -242,7 +242,41 @@ class TestDiskSpaceCheck(unittest.TestCase):
                         "mountpoint": "/srv/instances"
                     }
                 ]
-            }
+            },
+            {
+             "name": "vda",
+             "maj:min": "252:0",
+             "rm": false,
+             "size": "20G",
+             "ro": false,
+             "type": "disk",
+             "mountpoints": [
+                 null
+             ],
+             "children": [
+                {
+                   "name": "vda1",
+                   "maj:min": "252:1",
+                   "rm": false,
+                   "size": "19.9G",
+                   "ro": false,
+                   "type": "part",
+                   "mountpoints": [
+                       "/srv/jammy"
+                   ]
+                },{
+                   "name": "vda14",
+                   "maj:min": "252:14",
+                   "rm": false,
+                   "size": "4M",
+                   "ro": false,
+                   "type": "part",
+                   "mountpoints": [
+                       null
+                   ]
+                }
+             ]
+          }
         ]
     }"""
 
@@ -254,3 +288,4 @@ class TestDiskSpaceCheck(unittest.TestCase):
         self.assertEqual("/boot/efi" in result, False)
         self.assertEqual("/" in result, True)
         self.assertEqual("/srv/instances" in result, True)
+        self.assertEqual("/srv/jammy" in result, True)