Merge ~cjohnston/charm-mongodb:lp-1914080 into charm-mongodb:master

[Chris Johnston]

Add NRPE replica sets check only when mongodb is deployed in a replica set configuration.

Fixes: LP#1914080

[🤖 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)]

Seems OK to me.

review: Approve

[Adam Dyess (addyess)]

LGTM too.

review: Approve

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

Change successfully merged at revision 681db78cfbae1bf3aef49680dd9910975d52c990

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 9a994b2..632247a 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -1526,17 +1526,22 @@ def update_nrpe_config():
         check_cmd=check_mongo_script,
     )
 
-    charm_plugin_dir = os.path.join(charm_dir(), "files", "nrpe-external-master/")
+    charm_plugin_dir = os.path.join(
+        charm_dir(), "files", "nrpe-external-master/")
     rsync(
-        charm_plugin_dir, "/usr/local/lib/nagios/plugins/", options=["--executability"]
+        charm_plugin_dir,
+        "/usr/local/lib/nagios/plugins/",
+        options=["--executability"]
     )
 
-    nrpe.add_check(
-        shortname="replica_sets_status",
-        description="replica set check {%s}" % current_unit,
-        check_cmd="check_replica_sets.py",
-    )
     nrpe.remove_check(shortname="check_replica_sets")
+    nrpe.remove_check(shortname="replica_sets_status")
+    if is_relation_made("replica-set"):
+        nrpe.add_check(
+            shortname="replica_sets_status",
+            description="replica set check {%s}" % current_unit,
+            check_cmd="check_replica_sets.py",
+        )
 
     nrpe.write()
 
diff --git a/tests/functional/tests/bundles/bionic-replicated.yaml b/tests/functional/tests/bundles/bionic-replicated.yaml
new file mode 100644
index 0000000..c148970
--- /dev/null
+++ b/tests/functional/tests/bundles/bionic-replicated.yaml
@@ -0,0 +1,18 @@
+series: bionic
+description: "mongodb-charm test bundle"
+applications:
+  mongodb:
+    num_units: 3
+    options:
+      replicaset: testset
+      backup_directory: /var/backups
+  nrpe:
+    charm: cs:nrpe
+  nagios:
+    series: bionic
+    charm: cs:nagios
+    num_units: 1
+
+relations:
+  - [mongodb, nrpe]
+  - [nagios:monitors, nrpe]
diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
index cef11a1..e23561e 100644
--- a/tests/functional/tests/bundles/bionic.yaml
+++ b/tests/functional/tests/bundles/bionic.yaml
@@ -2,7 +2,17 @@ series: bionic
 description: "mongodb-charm test bundle"
 applications:
   mongodb:
-    num_units: 3
+    num_units: 1
     options:
       replicaset: testset
       backup_directory: /var/backups
+  nrpe:
+    charm: cs:nrpe
+  nagios:
+    series: bionic
+    charm: cs:nagios
+    num_units: 1
+
+relations:
+  - [mongodb, nrpe]
+  - [nagios:monitors, nrpe]
diff --git a/tests/functional/tests/bundles/focal-nrpe.yaml b/tests/functional/tests/bundles/focal-replicated.yaml
similarity index 100%
rename from tests/functional/tests/bundles/focal-nrpe.yaml
rename to tests/functional/tests/bundles/focal-replicated.yaml
diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
index e485f5e..28da623 100644
--- a/tests/functional/tests/bundles/focal.yaml
+++ b/tests/functional/tests/bundles/focal.yaml
@@ -2,7 +2,17 @@ series: focal
 description: "mongodb-charm test bundle"
 applications:
   mongodb:
-    num_units: 3
+    num_units: 1
     options:
       replicaset: testset
       backup_directory: /var/backups
+  nrpe:
+    charm: cs:nrpe
+  nagios:
+    series: bionic
+    charm: cs:nagios
+    num_units: 1
+
+relations:
+  - [mongodb, nrpe]
+  - [nagios:monitors, nrpe]
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index d67bc5c..72347b4 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -6,17 +6,27 @@ tests:
       - tests.tests_mongodb.XenialMongodbCharmTest
   - model_alias_bionic:
       - tests.tests_mongodb.BasicMongodbCharmTest
+      - tests.tests_mongodb.CharmOperationTest
+  - model_alias_bionic_replicated:
+      - tests.tests_mongodb.BasicMongodbCharmTest
       - tests.tests_mongodb.ReplicatedMongodbCharmTest
+      - tests.tests_mongodb.CharmOperationTest
   - model_alias_focal:
       - tests.tests_mongodb.BasicMongodbCharmTest
+      - tests.tests_mongodb.CharmOperationTest
+  - model_alias_focal_replicated:
+      - tests.tests_mongodb.BasicMongodbCharmTest
       - tests.tests_mongodb.ReplicatedMongodbCharmTest
+      - tests.tests_mongodb.CharmOperationTest
   - model_alias_shard:
       - tests.tests_mongodb.ShardedMongodbCharmTest
+      - tests.tests_mongodb.CharmOperationTest
 gate_bundles:
   - model_alias_xenial: xenial
   - model_alias_bionic: bionic
+  - model_alias_bionic_replicated: bionic-replicated
   - model_alias_focal: focal
-  - model_alias_focal: focal-nrpe
+  - model_alias_focal_replicated: focal-replicated
   # - model_alias_shard: bionic-shard
 smoke_bundles:
   - model_alias_bionic: bionic
diff --git a/tests/functional/tests/tests_mongodb.py b/tests/functional/tests/tests_mongodb.py
index 019e5d7..3854cb5 100644
--- a/tests/functional/tests/tests_mongodb.py
+++ b/tests/functional/tests/tests_mongodb.py
@@ -77,9 +77,9 @@ class BasicMongodbCharmTest(MongodbCharmTestBase):
 
     def test_service_running(self):
         """Test if we have a mongod running on all units."""
-        for i in (0, 1, 2):
+        for unit in model.get_units("mongodb"):
             running_for = model.get_unit_service_start_time(
-                "mongodb/{}".format(i), "mongod", timeout=20
+                unit.entity_id, "mongod", timeout=20
             )
             self.assertGreater(running_for, 0)
 
@@ -139,3 +139,52 @@ class ShardedMongodbCharmTest(MongodbCharmTestBase):
             "mongodb/0", "mongos", timeout=20
         )
         self.assertGreater(running_for, 0)
+
+
+class CharmOperationTest(MongodbCharmTestBase):
+    """Verify charm operations."""
+
+    def test_01_nrpe_mongodb_check(self):
+        """Verify mongodb is running."""
+        expected_nrpe_check = (
+            "command[check_mongodb]=/usr/local/lib/nagios/plugins/"
+            "check_systemd.py mongodb"
+        )
+        cmd = "cat /etc/nagios/nrpe.d/check_mongodb.cfg"
+        for unit in model.get_units("mongodb"):
+            result = model.run_on_unit(unit.entity_id, cmd)
+            code = result.get("Code")
+            if code != "0":
+                raise model.CommandRunFailed(cmd, result)
+            content = result.get("Stdout")
+            self.assertTrue(expected_nrpe_check in content)
+
+    def test_02_nrpe_check_replica_sets_status(self):
+        """
+        Verify that the NRPE replica sets status check is configured correctly.
+        """
+        expected_nrpe_check = (
+            "command[check_replica_sets_status]=/usr/local/lib/nagios/"
+            "plugins/check_replica_sets.py"
+        )
+        cmd = "cat /etc/nagios/nrpe.d/check_replica_sets_status.cfg"
+        units = model.get_units("mongodb")
+        if len(units) == 1:
+            # Testing a single mongodb node deployment
+            result = model.run_on_unit(units[0].entity_id, cmd)
+            code = result.get("Code")
+            # We expect this command to fail
+            if code != "1":
+                raise model.CommandRunFailed(cmd, result)
+            content = result.get("Stderr")
+            print(content)
+            self.assertTrue("No such file or directory" in content)
+        else:
+            # Testing a replica set mongodb deployment
+            for unit in units:
+                result = model.run_on_unit(unit.entity_id, cmd)
+                code = result.get("Code")
+                if code != "0":
+                    raise model.CommandRunFailed(cmd, result)
+                content = result.get("Stdout")
+                self.assertTrue(expected_nrpe_check in content)