Merge ~xavpaice/charm-telegraf:bug/lp1913489 into charm-telegraf:master

[Xav Paice]

Correct alert rule template names

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

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

[Joe Guo (guoqiao)]

LGTM, +1

review: Approve

[Alvaro Uria (aluria)]

I've rebased your change against the current master and functional tests fail when testing "tests/bundles/focal-compute.yaml".

I think that is unrelated to this change, but I think we should fix it before merging any other MPs.

The "focal-compute.yaml" bundle deploys many applications such as neutron-gateway, which is in blocked state but not defined as such in "tests.yaml" (the "target_deploy_status" section).

Other than that, lint, unit tests and previous func tests passed fine.

[Alvaro Uria (aluria)]

FWIW, the error was:
"""
    raise ModelTimeout("Zaza has timed out waiting on the model to "
zaza.model.ModelTimeout: Zaza has timed out waiting on the model to reach idle state.
"""

That error happened while "waiting_for_application_states".

> I've rebased your change against the current master and functional tests fail
> when testing "tests/bundles/focal-compute.yaml".
>
> I think that is unrelated to this change, but I think we should fix it before
> merging any other MPs.
>
> The "focal-compute.yaml" bundle deploys many applications such as neutron-
> gateway, which is in blocked state but not defined as such in "tests.yaml"
> (the "target_deploy_status" section).
>
> Other than that, lint, unit tests and previous func tests passed fine.

[Xav Paice (xavpaice)]

I don't see how this relates to the change at all, and this is a bug which prevents deployment of the rules relation. Can we please re-review?

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

Change successfully merged at revision dec0633eb0134f4222b70c4a3e4f8375baac1f61

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index c139276..ceca7bb 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -1282,9 +1282,12 @@ def render_prometheus_rules(prometheus_rules):
     }
     formatted_rules = []
     template_files = [
-        "rule_cpu_usage.tmpl",
-        "rule_disk_predictive.tmpl",
-        "rule_mem_starvation.tmpl",
+        "rule_cpu_usage.j2",
+        "rule_diskfull.j2",
+        "rule_mem.j2",
+        "rule_disk_ro.j2",
+        "rule_packetdrops.j2",
+        "rule_predict_disk_space.j2",
     ]
     for template_file in template_files:
         with open(os.path.join(get_templates_dir(), template_file), "r") as fd:
diff --git a/src/tests/functional/tests/bundles/bionic-monitoring.yaml b/src/tests/functional/tests/bundles/bionic-monitoring.yaml
index 120eab8..863d322 100644
--- a/src/tests/functional/tests/bundles/bionic-monitoring.yaml
+++ b/src/tests/functional/tests/bundles/bionic-monitoring.yaml
@@ -16,8 +16,8 @@ applications:
   prometheus2:
     charm: cs:prometheus2
     num_units: 1
-
-
+  prometheus-alertmanager:
+    charm: cs:prometheus-alertmanager
 
 relations:
   - - percona-cluster:juju-info
@@ -30,3 +30,7 @@ relations:
     - prometheus2:grafana-source
   - - grafana:dashboards
     - telegraf:dashboards
+  - - prometheus2:prometheus-rules
+    - telegraf:prometheus-rules
+  - - prometheus2:alertmanager-service
+    - prometheus-alertmanager:alertmanager-service