Merge ~raychan96/charm-openstack-service-checks:fix-http-https-checks into charm-openstack-service-checks:master

[Chi Wai CHAN]

Fix rendering of `check_http` when scheme is https

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

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

[Eric Chen (eric-chen)]

review: Approve

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

PASSED: Continuous integration, rev:7de35c78b889b157af2a7831cac792d4b94e63c1
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/84/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1195/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1603/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/84//rebuild

review: Approve (continuous-integration)

[Erhan Sunar (esunar)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:ba40b7d31d5a018d09b2ca2d19e8d3206bea7ee4
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/87/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1198/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1606/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/87//rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:ba40b7d31d5a018d09b2ca2d19e8d3206bea7ee4
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/89/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1200/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1608/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/89//rebuild

review: Approve (continuous-integration)

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

Change successfully merged at revision e1476c7653afe6d8a46674845080c9e9925f085e

diff --git a/src/lib/lib_openstack_service_checks.py b/src/lib/lib_openstack_service_checks.py
index 1caf8b5..8295ea8 100644
--- a/src/lib/lib_openstack_service_checks.py
+++ b/src/lib/lib_openstack_service_checks.py
@@ -669,8 +669,12 @@ class OSCHelper:
     def _render_http_endpoint_checks(self, url, host, port, nrpe, interface, **kwargs):
         """Render NRPE checks for http endpoint."""
         if self.charm_config.get("check_{}_urls".format(interface)):
-            command = "{} -H {} -p {} -u {}".format(
-                "/usr/lib/nagios/plugins/check_http", host, port, url
+            command = "{} -H {} -p {} -u {} {}".format(
+                "/usr/lib/nagios/plugins/check_http",
+                host,
+                port,
+                url,
+                kwargs.get("check_http_options", ""),
             )
             nrpe.add_check(
                 shortname=kwargs.get("shortname", "check_http"),
@@ -779,25 +783,7 @@ class OSCHelper:
             check_url = urlparse(endpoint.url)
             host, port = self._split_url(check_url.netloc, check_url.scheme)
 
-            nrpe_shortname = "{}_{}".format(service_name, endpoint.interface)
-            self._render_http_endpoint_checks(
-                url=endpoint.healthcheck_url,
-                host=host,
-                port=port,
-                nrpe=nrpe,
-                interface=endpoint.interface,
-                shortname=nrpe_shortname,
-                description="Endpoint url check for {} {}".format(
-                    service_name, endpoint.interface
-                ),
-                create_log="Added nrpe http endpoint check for {}, {}".format(
-                    service_name, endpoint.interface
-                ),
-                remove_log="Removed nrpe http endpoint check for {}, {}".format(
-                    service_name, endpoint.interface
-                ),
-            )
-
+            check_http_options = []
             if check_url.scheme == "https":
                 url = endpoint.healthcheck_url.strip().split(" ")[0]
                 nrpe_shortname = "{}_{}_cert".format(service_name, endpoint.interface)
@@ -818,6 +804,27 @@ class OSCHelper:
                         service_name, endpoint.interface
                     ),
                 )
+                check_http_options.append("-S")
+
+            nrpe_shortname = "{}_{}".format(service_name, endpoint.interface)
+            self._render_http_endpoint_checks(
+                url=endpoint.healthcheck_url,
+                host=host,
+                port=port,
+                nrpe=nrpe,
+                interface=endpoint.interface,
+                shortname=nrpe_shortname,
+                description="Endpoint url check for {} {}".format(
+                    service_name, endpoint.interface
+                ),
+                create_log="Added nrpe http endpoint check for {}, {}".format(
+                    service_name, endpoint.interface
+                ),
+                remove_log="Removed nrpe http endpoint check for {}, {}".format(
+                    service_name, endpoint.interface
+                ),
+                check_http_options="".join(check_http_options),
+            )
 
         nrpe.write()
 
diff --git a/src/tests/unit/test_lib.py b/src/tests/unit/test_lib.py
index 9d767c3..82ff578 100644
--- a/src/tests/unit/test_lib.py
+++ b/src/tests/unit/test_lib.py
@@ -256,19 +256,21 @@ def test__render_http_endpoint_checks(mock_config, interface):
     test_url = "/"
     test_host = "http://localhost"
     test_port = "80"
-    test_kwargs = {"interface": interface}
+    test_interface = interface
+    test_kwargs = {"check_http_options": ""}
 
-    test_cmd = "{} -H {} -p {} -u {}".format(
+    test_cmd = "{} -H {} -p {} -u {} {}".format(
         "/usr/lib/nagios/plugins/check_http",
         test_host,
         test_port,
         test_url,
+        test_kwargs["check_http_options"],
     )
 
     # enable check_{}_urls
     mock_config.return_value = {"check_{}_urls".format(interface): True}
     OSCHelper()._render_http_endpoint_checks(
-        test_url, test_host, test_port, nrpe, **test_kwargs
+        test_url, test_host, test_port, nrpe, test_interface, **test_kwargs
     )
     nrpe.add_check.assert_called_with(
         check_cmd=test_cmd,
@@ -280,7 +282,7 @@ def test__render_http_endpoint_checks(mock_config, interface):
     # disable check_{}_urls
     mock_config.return_value = {}
     OSCHelper()._render_http_endpoint_checks(
-        test_url, test_host, test_port, nrpe, **test_kwargs
+        test_url, test_host, test_port, nrpe, test_interface, **test_kwargs
     )
     nrpe.remove_check.assert_called_with(
         shortname="check_http",