Merge ~afreiberger/charm-telegraf:ignore_rdt_on_virt into charm-telegraf:master

[Drew Freiberger]

Don't add rdt metrics section to base_inputs.conf if virtual

[🤖 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:e2024a8ab150cf42acd2eab2968663fee0e52b47
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/73/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/140/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/531/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/73//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.

[James Troup (elmo)]

LGTM, will approve once CI is done.

review: Approve

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

PASSED: Continuous integration, rev:9f5bada0b8d7ba21f28541ca1f98618188188c65
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/74/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/141/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/532/

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

review: Approve (continuous-integration)

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

Change successfully merged at revision 26e531a9977502432350306c681f186191fd1084

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index a5a634d..9c63383 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -111,6 +111,11 @@ class InvalidIntelRDTConfigurationError(Exception):
     pass
 
 
+def is_intel_rdt_enabled():
+    config = hookenv.config()
+    return config.get("collect_intel_rdt_metrics", False) and is_metal()
+
+
 def write_telegraf_file(path, content):
     return host.write_file(
         path,
@@ -438,7 +443,7 @@ def get_base_inputs():
     disabled_plugins = get_disabled_plugins()
 
     # handle the Intel RDT collection parameters
-    intel_rdt = config["collect_intel_rdt_metrics"]
+    intel_rdt = is_intel_rdt_enabled()
     if intel_rdt:
         intel_rdt_cores = get_cpu_cores()
     else:
@@ -820,7 +825,7 @@ def configure_telegraf():  # noqa: C901
     # handle the configuration of intel_rdt
     sudoers_filename = "telegraf_intel_rdt"
     # Don't load bits for RDT on VM or Containers
-    if config["collect_intel_rdt_metrics"] and is_metal():
+    if is_intel_rdt_enabled():
         hookenv.log("Intel RDT enabled, enabling module and running checks")
         # load and persist the required module
         try:
@@ -872,7 +877,7 @@ def configure_telegraf():  # noqa: C901
             # skip reload when Intel RDT is enabled, as it stops the plugin from
             # publishing data. The service will be restarted via the flag
             # "telegraf.needs_reload" on changes later
-            if not config["collect_intel_rdt_metrics"]:
+            if not is_intel_rdt_enabled():
                 hookenv.log("reloading service: {}".format(service), level="DEBUG")
                 host.service_reload(service)
         else:
@@ -1003,7 +1008,7 @@ def handle_config_changes():
         clear_flag("prometheus-client.relation.configured")
 
     # handle the Intel RDT/MBM metrics collection
-    if config.get("collect_intel_rdt_metrics"):
+    if is_intel_rdt_enabled():
         set_flag("telegraf.intel_rdt.enabled")
     else:
         clear_flag("telegraf.intel_rdt.enabled")
@@ -1719,12 +1724,11 @@ def prometheus_client_departed():
 )
 @when_not("grafana.configured")
 def register_grafana_dashboard():
-    config = hookenv.config()
     grafana = endpoint_from_flag("endpoint.dashboards.joined")
     grafana_dashboard_config = GRAFANA_DASHBOARD_CONFIG.copy()
 
     # if RDT is enabled inject the relevant dashboard config
-    if config["collect_intel_rdt_metrics"]:
+    if is_intel_rdt_enabled():
         grafana_dashboard_config["Intel RDT"] = {"template_file": "IntelRDT.json.j2"}
 
     # process all the configured dashboards