Merge ~xavpaice/charm-telegraf:add_juju_model_uuid into charm-telegraf:master

[Xav Paice]

Add juju_model_uuid to tags

Adds the juju_model_uuid tag to metrics, to match up with the metadata provided in the charms interfacing with the prometheus-k8s charm.

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

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 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:7c9a9242303a380df75971db8e3b1dfacada0ceb
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/49/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/66/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/437/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7c9a9242303a380df75971db8e3b1dfacada0ceb
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/50/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/67/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/438/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7c9a9242303a380df75971db8e3b1dfacada0ceb
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/71/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/442/

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

review: Needs Fixing (continuous-integration)

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[Celia Wang (ziyiwang)]

lgtm

review: Approve

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

Change successfully merged at revision c4a8e0688eeaef3a0fd432ac1550dc23a6d5a050

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index ecbbf57..137d4d8 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -712,6 +712,7 @@ def configure_telegraf():  # noqa: C901
     tags_dict["juju_unit"] = get_remote_unit_name().replace("/", "-")
     try:
         tags_dict["juju_model"] = hookenv.model_name()
+        tags_dict["juju_model_uuid"] = hookenv.model_uuid()
     except KeyError:
         pass  # support older Juju 1.x deploys
     # Parse juju-configured tags, which can override the 3 juju_* defined above
diff --git a/src/tests/unit/test_telegraf.py b/src/tests/unit/test_telegraf.py
index 55eae97..8379987 100644
--- a/src/tests/unit/test_telegraf.py
+++ b/src/tests/unit/test_telegraf.py
@@ -66,6 +66,9 @@ UNIT_TESTS_DATA_DIR = os.path.join(UNIT_TESTS_DIR, "data")
 def setup(monkeypatch, tmpdir):
     monkeypatch.setitem(os.environ, "JUJU_UNIT_NAME", "telegraf/0")
     monkeypatch.setitem(os.environ, "JUJU_MODEL_NAME", "telegraf-test-model")
+    monkeypatch.setitem(
+        os.environ, "JUJU_MODEL_UUID", "abcdef12-0000-0000-0000-abcdabcdabcd"
+    )
     monkeypatch.setattr(telegraf, "get_remote_unit_name", lambda: "remote-unit/0")
     # mock this to avoid permission errors
     monkeypatch.setattr(telegraf, "update_sysstat_config_with_sdac_xall", lambda: True)