Merge ~gabrielcocenza/charm-nrpe:bug/1998120 into charm-nrpe:master

[Gabriel Cocenza]

make service manager resilient in case the IP is not ready.

Closes-Bug: #1998120

See Bug 1924780 for more details. Units might run the install hook without having public IP ready. Charms should be resilient of such scenario.

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

FAILED: Continuous integration, rev:ce5472d25b4ecbcab4dace9f9203aef747d4e909
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/151/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1602/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1776/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:702e7b7cd00781c176fb1ed62206488d1c5dd0ca
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/152/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1603/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1777/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:3418316e54be49141073e3e58405cf0df5672377
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/153/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1604/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1778/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4aaa90cebc94bda6fc090ec46d483028c1a0f82f
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/154/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1605/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1779/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4aaa90cebc94bda6fc090ec46d483028c1a0f82f
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/155/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1607/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1780/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:940fa803a4da7268679e4b446069fc4cf28d45cf
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/156/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1610/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1782/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:d56b12bffbe3161dad60de3707562974e3bbab93
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/157/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1617/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1786/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/158/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1625/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1791/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/159/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1628/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1792/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/160/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1634/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1797/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/161/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1636/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1799/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/162/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1640/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1800/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ebb874dd124e354f77d7adeb868af95a449dd26a
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/163/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1641/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1801/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:d0a251f73b34e107ab433fe02cab9ab721f178f4
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/164/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1717/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1807/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:f9bf892c3d756875330d6fedfda607f596bae22f
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/165/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1719/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1808/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:f9bf892c3d756875330d6fedfda607f596bae22f
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/166/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1722/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1811/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:f9bf892c3d756875330d6fedfda607f596bae22f
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/167/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1723/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1812/

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

review: Approve (continuous-integration)

[Martin Kalcok (martin-kalcok)]

Thanks Gabriel, LGTM.

review: Approve

[Eric Chen (eric-chen)]

review: Approve

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

Change successfully merged at revision 239fb7941b37f12ad2550205700a684500d19983

diff --git a/hooks/services.py b/hooks/services.py
index 34b9887..2c6dbce 100644
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -1,9 +1,10 @@
 """Nrpe service definifition."""
 
 import os
+from subprocess import CalledProcessError
 
 from charmhelpers.core import hookenv
-from charmhelpers.core.hookenv import status_set
+from charmhelpers.core.hookenv import WARNING, log, status_set
 from charmhelpers.core.services import helpers
 from charmhelpers.core.services.base import ServiceManager
 
@@ -13,61 +14,64 @@ import nrpe_utils
 
 config = hookenv.config()
 
-manager = ServiceManager(
-    [
-        {
-            "service": "nrpe-install",
-            "data_ready": [
-                nrpe_utils.install_packages,
-                nrpe_utils.install_charm_files,
-            ],
-            "start": [],
-            "stop": [],
-        },
-        {
-            "service": "nrpe-config",
-            "required_data": [
-                config,
-                nrpe_helpers.MonitorsRelation(),
-                nrpe_helpers.PrincipalRelation(),
-                nrpe_helpers.NagiosInfo(),
-            ],
-            "data_ready": [
-                nrpe_utils.update_nrpe_external_master_relation,
-                nrpe_utils.update_monitor_relation,
-                nrpe_utils.create_host_export_fragment,
-                nrpe_utils.render_nrped_files,
-                nrpe_utils.update_cis_audit_cronjob,
-                helpers.render_template(
-                    source="nrpe.tmpl", target="/etc/nagios/nrpe.cfg"
-                ),
-            ],
-            "provided_data": [nrpe_helpers.PrincipalRelation()],
-            "ports": [hookenv.config("server_port"), "ICMP"],
-            "start": [nrpe_utils.maybe_open_ports, nrpe_utils.restart_nrpe],
-            "stop": [],
-        },
-        {
-            "service": "nrpe-rsync",
-            "required_data": [
-                config,
-                nrpe_helpers.PrincipalRelation(),
-                nrpe_helpers.RsyncEnabled(),
-                nrpe_helpers.NagiosInfo(),
-            ],
-            "data_ready": [
-                nrpe_utils.remove_host_export_fragments,
-                helpers.render_template(
-                    source="rsync-juju.d.tmpl",
-                    target="/etc/rsync-juju.d/010-nrpe-external-master.conf",
-                ),
-                nrpe_utils.create_host_export_fragment,
-            ],
-            "start": [nrpe_utils.restart_rsync],
-            "stop": [],
-        },
-    ]
-)
+
+def get_manager():
+    """Instantiate a ServiceManager object."""
+    return ServiceManager(
+        [
+            {
+                "service": "nrpe-install",
+                "data_ready": [
+                    nrpe_utils.install_packages,
+                    nrpe_utils.install_charm_files,
+                ],
+                "start": [],
+                "stop": [],
+            },
+            {
+                "service": "nrpe-config",
+                "required_data": [
+                    config,
+                    nrpe_helpers.MonitorsRelation(),
+                    nrpe_helpers.PrincipalRelation(),
+                    nrpe_helpers.NagiosInfo(),
+                ],
+                "data_ready": [
+                    nrpe_utils.update_nrpe_external_master_relation,
+                    nrpe_utils.update_monitor_relation,
+                    nrpe_utils.create_host_export_fragment,
+                    nrpe_utils.render_nrped_files,
+                    nrpe_utils.update_cis_audit_cronjob,
+                    helpers.render_template(
+                        source="nrpe.tmpl", target="/etc/nagios/nrpe.cfg"
+                    ),
+                ],
+                "provided_data": [nrpe_helpers.PrincipalRelation()],
+                "ports": [hookenv.config("server_port"), "ICMP"],
+                "start": [nrpe_utils.maybe_open_ports, nrpe_utils.restart_nrpe],
+                "stop": [],
+            },
+            {
+                "service": "nrpe-rsync",
+                "required_data": [
+                    config,
+                    nrpe_helpers.PrincipalRelation(),
+                    nrpe_helpers.RsyncEnabled(),
+                    nrpe_helpers.NagiosInfo(),
+                ],
+                "data_ready": [
+                    nrpe_utils.remove_host_export_fragments,
+                    helpers.render_template(
+                        source="rsync-juju.d.tmpl",
+                        target="/etc/rsync-juju.d/010-nrpe-external-master.conf",
+                    ),
+                    nrpe_utils.create_host_export_fragment,
+                ],
+                "start": [nrpe_utils.restart_rsync],
+                "stop": [],
+            },
+        ]
+    )
 
 
 def get_revision():
@@ -88,10 +92,18 @@ def get_revision():
 def manage():
     """Manage nrpe service."""
     status_set("maintenance", "starting")
-    manager.manage()
-    if not nrpe_utils.has_consumer():
-        status_set("blocked", "Nagios server not configured or related")
-    elif nrpe_helpers.has_netlinks_error():
-        status_set("blocked", "Netlinks parsing encountered failure; see logs")
+    try:
+        manager = get_manager()
+    except (CalledProcessError, KeyError, IndexError) as err:
+        msg = "Public address not available yet"
+        log(msg, level=WARNING)
+        log(err, level=WARNING)
+        status_set("waiting", msg)
     else:
-        status_set("active", "Ready{}".format(get_revision()))
+        manager.manage()
+        if not nrpe_utils.has_consumer():
+            status_set("blocked", "Nagios server not configured or related")
+        elif nrpe_helpers.has_netlinks_error():
+            status_set("blocked", "Netlinks parsing encountered failure; see logs")
+        else:
+            status_set("active", "Ready{}".format(get_revision()))
diff --git a/mod/charmhelpers b/mod/charmhelpers
index 9b40e00..460e9e6 160000
--- a/mod/charmhelpers
+++ b/mod/charmhelpers
@@ -1 +1 @@
-Subproject commit 9b40e0070deab2fc4aef4725e8bdf95cd96cb471
+Subproject commit 460e9e6dd33abdd58f1b82890243e2ee06014429
diff --git a/tox.ini b/tox.ini
index 6b76204..df9003f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,6 @@
 skipsdist=True
 skip_missing_interpreters = True
 envlist = lint, unit, func
-requires =
-    pip < 20.3
-    virtualenv < 20.0
-    setuptools < 50.0.0
 
 [testenv]
 basepython = python3