Merge ~xavpaice/charm-nrpe:update_tests into charm-nrpe:master

[Xav Paice]

Improvements to functional testing

* Remove Trusty support
* Add functional tests for Focal
* charmhelpers update
* Lint fixes

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

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

[🤖 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:ecb7192cc3400acee3a941990a50b71b48824fea
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/10/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/371/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-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:aa9e5a7b9d45feb6f31b5644ad567596ff82bdd3
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/11/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/373/

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

review: Approve (continuous-integration)

[Celia Wang (ziyiwang)]

lgtm

review: Approve

[Paul Goins (vultaire)]

Interesting. Took a bit to understand why things got changed from MySQL to RMQ, but I think I got it.

LGTM, +1

review: Approve

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

Change successfully merged at revision 7fad0fa1d121742315e426446ac2411f9ec529f1

diff --git a/Makefile b/Makefile
index a9ecf3e..c576977 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ submodules-update:
 	@echo "Pulling latest updates for submodules"
 	@git submodule update --init --recursive --remote --merge
 
-build:
+build: submodules-update
 	@echo "Building charm to base directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
 	@-git rev-parse --abbrev-ref HEAD > ./repo-info
 	@-git describe --always > ./version
diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
index e4b51fd..80f1541 100644
--- a/hooks/nrpe_helpers.py
+++ b/hooks/nrpe_helpers.py
@@ -381,30 +381,10 @@ class SubordinateCheckDefinitions(dict):
 
     def __init__(self):
         """Set dict values."""
-        procs = self.proc_count()
-
-        if hookenv.config("procs") == "auto":
-            proc_thresholds = "-k -w {} -c {}".format(
-                25 * procs + 100, 50 * procs + 100
-            )
-        else:
-            proc_thresholds = hookenv.config("procs")
-
-        if hookenv.config("load") == "auto":
-            # Give 1min load alerts higher thresholds than 15 min load alerts
-            warn_multipliers = (4, 2, 1)
-            crit_multipliers = (8, 4, 2)
-            load_thresholds = ("-w %s -c %s") % (
-                ",".join([str(m * procs) for m in warn_multipliers]),
-                ",".join([str(m * procs) for m in crit_multipliers]),
-            )
-        else:
-            load_thresholds = hookenv.config("load")
-
-        if hookenv.config("disk_root"):
-            disk_root_thresholds = hookenv.config("disk_root") + " -p / "
-        else:
-            disk_root_thresholds = ""
+        self.procs = self.proc_count()
+        load_thresholds = self._get_load_thresholds()
+        proc_thresholds = self._get_proc_thresholds()
+        disk_root_thresholds = self._get_disk_root_thresholds()
 
         pkg_plugin_dir = "/usr/lib/nagios/plugins/"
         local_plugin_dir = "/usr/local/lib/nagios/plugins/"
@@ -562,6 +542,38 @@ class SubordinateCheckDefinitions(dict):
             check["cmd_name"] += sub_postfix
             self["checks"].append(check)
 
+    def _get_proc_thresholds(self):
+        """Return suitable processor thresholds."""
+        if hookenv.config("procs") == "auto":
+            proc_thresholds = "-k -w {} -c {}".format(
+                25 * self.procs + 100, 50 * self.procs + 100
+            )
+        else:
+            proc_thresholds = hookenv.config("procs")
+        return proc_thresholds
+
+    def _get_load_thresholds(self):
+        """Return suitable load thresholds."""
+        if hookenv.config("load") == "auto":
+            # Give 1min load alerts higher thresholds than 15 min load alerts
+            warn_multipliers = (4, 2, 1)
+            crit_multipliers = (8, 4, 2)
+            load_thresholds = ("-w %s -c %s") % (
+                ",".join([str(m * self.procs) for m in warn_multipliers]),
+                ",".join([str(m * self.procs) for m in crit_multipliers]),
+            )
+        else:
+            load_thresholds = hookenv.config("load")
+        return load_thresholds
+
+    def _get_disk_root_thresholds(self):
+        """Return suitable disk thresholds."""
+        if hookenv.config("disk_root"):
+            disk_root_thresholds = hookenv.config("disk_root") + " -p / "
+        else:
+            disk_root_thresholds = ""
+        return disk_root_thresholds
+
     def proc_count(self):
         """Return number number of processing units."""
         return int(subprocess.check_output(["nproc", "--all"]))
diff --git a/hooks/services.py b/hooks/services.py
index 6a14c50..792877b 100644
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -72,16 +72,16 @@ def manage():
     )
     manager.manage()
     if nrpe_utils.has_consumer():
-        revision = ''
-        if os.path.exists('version'):
-            with open('version') as f:
+        revision = ""
+        if os.path.exists("version"):
+            with open("version") as f:
                 line = f.readline().strip()
             # We only want the first 8 characters, that's enough to tell
             # which version of the charm we're using.
             if len(line) > 8:
-                revision = ' (source version/commit {}...)'.format(line[:8])
+                revision = " (source version/commit {}...)".format(line[:8])
             else:
-                revision = ' (source version/commit {})'.format(line)
+                revision = " (source version/commit {})".format(line)
         status_set("active", "Ready{}".format(revision))
     else:
         status_set("blocked", "Nagios server not configured or related")
diff --git a/metadata.yaml b/metadata.yaml
index 4ed43fb..e3b05f5 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -30,4 +30,3 @@ series:
   - bionic
   - focal
   - xenial
-  - trusty
diff --git a/mod/charmhelpers b/mod/charmhelpers
index 6565024..d1f9515 160000
--- a/mod/charmhelpers
+++ b/mod/charmhelpers
@@ -1 +1 @@
-Subproject commit 6565024e5ef761d020a1cba20b8b09d62603325d
+Subproject commit d1f9515001237601e4a39aeb443b180137069f25
diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
index 5bb178e..1f68afe 100644
--- a/tests/functional/tests/bundles/bionic.yaml
+++ b/tests/functional/tests/bundles/bionic.yaml
@@ -1,13 +1,13 @@
 series: bionic
 applications:
-  mysql:
-    charm: cs:percona-cluster
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
     num_units: 1
   nagios:
     charm: cs:nagios
     num_units: 1
 relations:
-  - - mysql:nrpe-external-master
+  - - rabbitmq-server:nrpe-external-master
     - nrpe:nrpe-external-master
   - - nrpe:monitors
-    - nagios:monitors
\ No newline at end of file
+    - nagios:monitors
diff --git a/tests/functional/tests/bundles/trusty.yaml b/tests/functional/tests/bundles/focal.yaml
similarity index 59%
rename from tests/functional/tests/bundles/trusty.yaml
rename to tests/functional/tests/bundles/focal.yaml
index 8fe247d..606e891 100644
--- a/tests/functional/tests/bundles/trusty.yaml
+++ b/tests/functional/tests/bundles/focal.yaml
@@ -1,13 +1,14 @@
-series: trusty
+series: focal
 applications:
-  mysql:
-    charm: cs:mysql
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
     num_units: 1
   nagios:
-    charm: cs:~llama-charmers-next/nagios
+    charm: cs:nagios
     num_units: 1
+    series: bionic
 relations:
-  - - mysql:nrpe-external-master
+  - - rabbitmq-server:nrpe-external-master
     - nrpe:nrpe-external-master
   - - nrpe:monitors
-    - nagios:monitors
\ No newline at end of file
+    - nagios:monitors
diff --git a/tests/functional/tests/bundles/xenial.yaml b/tests/functional/tests/bundles/xenial.yaml
index 168be0e..e6176e1 100644
--- a/tests/functional/tests/bundles/xenial.yaml
+++ b/tests/functional/tests/bundles/xenial.yaml
@@ -1,13 +1,13 @@
 series: xenial
 applications:
-  mysql:
-    charm: cs:percona-cluster
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
     num_units: 1
   nagios:
     charm: cs:nagios
     num_units: 1
 relations:
-  - - mysql:nrpe-external-master
+  - - rabbitmq-server:nrpe-external-master
     - nrpe:nrpe-external-master
   - - nrpe:monitors
-    - nagios:monitors
\ No newline at end of file
+    - nagios:monitors
diff --git a/tests/functional/tests/nrpe_tests.py b/tests/functional/tests/nrpe_tests.py
index f887fdb..de138ea 100644
--- a/tests/functional/tests/nrpe_tests.py
+++ b/tests/functional/tests/nrpe_tests.py
@@ -5,7 +5,6 @@ import unittest
 import yaml
 
 import zaza.model as model
-from zaza.utilities import juju as juju_utils
 
 
 class TestBase(unittest.TestCase):
@@ -32,17 +31,6 @@ class TestNrpe(TestBase):
             "Verify the nrpe checks are created and have the required content..."
         )
 
-        check_mysql_content = (
-            "command[check_mysql]=/usr/local/lib/nagios/plugins/check_systemd.py mysql"
-        )
-        machine = list(juju_utils.get_machines_for_application("mysql"))[0]
-        machine_series = juju_utils.get_machine_series(machine)
-
-        if machine_series == "trusty":
-            check_mysql_content = (
-                "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -u nagios"
-            )
-
         nrpe_checks = {
             "check_conntrack.cfg":
                 "command[check_conntrack]=/usr/local/lib/nagios/plugins/"
@@ -52,9 +40,9 @@ class TestNrpe(TestBase):
             "check_load.cfg": "command[check_load]=/usr/lib/nagios/plugins/check_load",
             "check_mem.cfg":
                 "command[check_mem]=/usr/local/lib/nagios/plugins/check_mem.pl",
-            "check_mysql.cfg": check_mysql_content,
-            "check_mysql_proc.cfg": "command[check_mysql_proc]=/usr/lib/nagios/plugins/"
-            "check_procs -c 1:1 -C mysqld",
+            "check_rabbitmq.cfg":
+                "command[check_rabbitmq]="
+                "/usr/local/lib/nagios/plugins/check_rabbitmq.py",
             "check_swap_activity.cfg":
                 "command[check_swap_activity]="
                 "/usr/local/lib/nagios/plugins/check_swap_activity",
@@ -206,20 +194,20 @@ class TestNrpe(TestBase):
 
     def test_05_netlinks(self):
         """Check netlinks checks are applied."""
-        netlinks = "- eth0 mtu:9000 speed:10000"
+        netlinks = "- ens3 mtu:9000 speed:10000"
         model.set_application_config(self.application_name, {"netlinks": netlinks})
         model.block_until_all_units_idle()
-        cmd = "cat /etc/nagios/nrpe.d/check_netlinks_eth0.cfg"
+        cmd = "cat /etc/nagios/nrpe.d/check_netlinks_ens3.cfg"
         line = (
-            "command[check_netlinks_eth0]=/usr/local/lib/nagios/plugins/"
-            "check_netlinks.py -i eth0 -m 9000 -s 1000"
+            "command[check_netlinks_ens3]=/usr/local/lib/nagios/plugins/"
+            "check_netlinks.py -i ens3 -m 9000 -s 1000"
         )
         result = model.run_on_unit(self.lead_unit_name, cmd)
         code = result.get("Code")
         if code != "0":
             logging.warning(
                 "Unable to find nrpe check at "
-                "/etc/nagios/nrpe.d/check_netlinks_eth0.cfg"
+                "/etc/nagios/nrpe.d/check_netlinks_ens3.cfg"
             )
             raise model.CommandRunFailed(cmd, result)
         content = result.get("Stdout")
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index 1c39d87..640c3d2 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -1,7 +1,7 @@
 charm_name: nrpe
 gate_bundles:
-  - trusty
   - xenial
   - bionic
+  - focal
 tests:
   - tests.nrpe_tests.TestNrpe