Merge ~seyeongkim/charm-prometheus2:functional_tests into charm-prometheus2:master

[Seyeong Kim]

fix functional test in case dns_name has IP

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

PASSED: Continuous integration, rev:97a0a1cac2cffbc3beb6f166ca24938b33c98f3e
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/5/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/315/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/112/

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:b62d7b17d849454573d9b345fe7bdd95ed2ff935
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/316/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/113/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:85b236dd6009588741ddfdefc81dc4c90f8f14df
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/317/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/114/

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

review: Approve (continuous-integration)

[Eric Chen (eric-chen)]

Why the dns_name sometimes is hostname, sometimes is IP?

review: Needs Information

[Seyeong Kim (seyeongkim)]

I'm not sure.. for now I checked below function in reactive/prometheus.py

def update_prometheus_targets(target):

in this function dns_name is inserted with lookup(unit['hostname']) ( unit is from service["hosts"] )

and I printed that services["hosts"] , it is already includes IP instead of host.

lookup just returns IP I guess it can't find proper domain name in some circumstances.

[Erhan Sunar (esunar)]

review: Approve

[JamesLin (jneo8)]

The target is a http interface.

According to the source code of http interface layer: https://github.com/juju-solutions/interface-http/blob/632131b1f122daf6fb601fd4c9f1e4dbb1a92e09/provides.py#L25

The target is possible to be either ip or hostname.
But it's better to explain this inside the code comment or doc-string.

review: Needs Information

[JamesLin (jneo8)]

Need small fix. Please see my inline comments.

review: Needs Fixing

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

FAILED: Continuous integration, rev:c30991d04837336bfa4516fc8c8c2864d7d245fc
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/325/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/122/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:771506be9ff0a0a7ca6fdde408fc851f489d1678
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/326/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/123/

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

review: Approve (continuous-integration)

[JamesLin (jneo8)]

LGTM

review: Approve

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

Change successfully merged at revision 1c23e272189b5bd5386b8eb00093fc90ab1a3d3e

diff --git a/src/tests/functional/tests/tests_prometheus.py b/src/tests/functional/tests/tests_prometheus.py
index f54e314..0915978 100644
--- a/src/tests/functional/tests/tests_prometheus.py
+++ b/src/tests/functional/tests/tests_prometheus.py
@@ -96,8 +96,15 @@ class BasicPrometheusCharmTest(PrometheusCharmTestBase):
             with attempt:
                 new_unit = model.get_units("ubuntu")[-1]
 
-                action = model.run_on_unit(new_unit.data["name"], "hostname -f")
-                new_target = action["Stdout"].strip()
+                # As http interface layer source code,
+                # https://github.com/juju-solutions/interface-http/
+                # blob/632131b1f122daf6fb601fd4c9f1e4dbb1a92e09/provides.py#L25
+                # dns_name has IP or DNS. so checking both of them
+                action_host = model.run_on_unit(new_unit.data["name"], "hostname -f")
+                new_target_host = action_host["Stdout"].strip()
+
+                action_ip = model.run_on_unit(new_unit.data["name"], "hostname -I")
+                new_target_ip = action_ip["Stdout"].strip()
 
                 prom_ip = model.get_lead_unit_ip("prometheus2")
                 prom_port = 9090
@@ -107,7 +114,10 @@ class BasicPrometheusCharmTest(PrometheusCharmTestBase):
 
                 target_found = False
                 for targets in content["data"]["activeTargets"]:
-                    if targets["labels"].get("dns_name", None) == new_target:
+                    if targets["labels"].get("dns_name") == new_target_host:
+                        target_found = True
+
+                    if targets["labels"].get("dns_name") == new_target_ip:
                         target_found = True
 
                 self.assertTrue(target_found)
@@ -204,8 +214,15 @@ class TlsPrometheusCharmTest(PrometheusCharmTestBase):
 
                 new_unit = model.get_units("ubuntu")[-1]
 
-                action = model.run_on_unit(new_unit.data["name"], "hostname -f")
-                new_target = action["Stdout"].strip()
+                # As http interface layer source code,
+                # https://github.com/juju-solutions/interface-http/
+                # blob/632131b1f122daf6fb601fd4c9f1e4dbb1a92e09/provides.py#L25
+                # dns_name has IP or DNS. so checking both of them
+                action_host = model.run_on_unit(new_unit.data["name"], "hostname -f")
+                new_target_host = action_host["Stdout"].strip()
+
+                action_ip = model.run_on_unit(new_unit.data["name"], "hostname -I")
+                new_target_ip = action_ip["Stdout"].strip()
 
                 prom_ip = model.get_lead_unit_ip("prometheus2")
                 prom_port = 9090
@@ -216,7 +233,10 @@ class TlsPrometheusCharmTest(PrometheusCharmTestBase):
                 target_found = False
                 all_targets_healthy = 0
                 for targets in content["data"]["activeTargets"]:
-                    if targets["labels"].get("dns_name", None) == new_target:
+                    if targets["labels"].get("dns_name") == new_target_host:
+                        target_found = True
+
+                    if targets["labels"].get("dns_name") == new_target_ip:
                         target_found = True
 
                     if targets["health"] == "up":