Merge ~jsimpso/charm-prometheus-alertmanager:master into charm-prometheus-alertmanager:master

[James Simpson]

Pin MarkupSafe<2.1.0 for bug LP:1999356

[James Simpson (jsimpso)]

Deploying the current latest/edge charm results in the following error per the linked bug report:

2022-12-12 03:30:10 WARNING unit.alertmanager/0.upgrade-charm logger.go:60 ImportError: cannot import name 'soft_unicode' from 'markupsafe' (/var/lib/juju/agents/unit-alertmanager-0/.venv/lib/python3.8/site-packages/markupsafe/__init__.py)

Deploying a locally built version of the charm with the included fix works without issue:

Model Controller Cloud/Region Version SLA Timestamp Notes
controller kif localhost/localhost 2.9.35 unsupported 11:43:43+08:00 upgrade available: 2.9.37

App Version Status Scale Charm Channel Rev Exposed Message
alertmanager active 1 prometheus-alertmanager 1 no Ready
prometheus-alertmanager error 1 prometheus-alertmanager edge 23 no hook failed: "alertmanager-cluster-relation-created"
prometheus-mongodb-exporter stable active 1 prometheus-mongodb-exporter 25 no
ubuntu 20.04 active 1 ubuntu stable 21 no

Unit Workload Agent Machine Public address Ports Message
alertmanager/1* active idle 3 192.168.20.64 9093/tcp Ready
prometheus-alertmanager/0* error idle 1 192.168.20.207 hook failed: "alertmanager-cluster-relation-created"
ubuntu/1* active idle 0 192.168.20.62
  prometheus-mongodb-exporter/22* active idle 192.168.20.62 19091/tcp

[🤖 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:3b04dbc8b892349ca2c90a972f06207cb8693912
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-alertmanager-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/326/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1802/

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

review: Approve (continuous-integration)

[Erhan Sunar (esunar)]

review: Approve

[Ramesh Sattaru (rameshcan)]

review: Approve

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

Change successfully merged at revision 3a934be68001fdc96fea97a1aed6ae83cd1a9fe6

diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 86d690c..62fc47c 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,2 +1,4 @@
 # https://github.com/juju-solutions/layer-basic/issues/210
 Jinja2<3.0;python_version == '3.8'
+MarkupSafe<2.1.0;python_version >= '3.6' and python_version <= '3.8' # py36 bionic, py38 focal
+MarkupSafe;python_version > '3.8'