Merge ~hloeung/charm-telegraf:master into charm-telegraf:master

[Haw Loeung]

Pin various packages supporting python3.4 (Trusty)

We still have units/environments running Trusty. Unfortunately, a charm upgrade with the most recently built charm breaks on them.

Instead, we pin the specific python packages which still supports Python 3.4.

https://jaas.ai/u/llama-charmers-next/telegraf/2 was the last version with python3.4 support bundling requests==2.21.0 and urllib3=1.25.7.

https://jaas.ai/u/llama-charmers-next/telegraf/3 adds redis and defusedxml but but versions that dropped python3.4 support.

https://jaas.ai/u/llama-charmers-next/telegraf/4 bundles tenacity (from updated layer-snap).

This has been tested to also work on Focal - https://paste.ubuntu.com/p/NNtScTBySz/
(I built and pushed to cs:~hloeung/telegraf)

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

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

[Junien F (axino)]

+1

review: Approve

[Xav Paice (xavpaice)]

lgtm

review: Approve

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

Change successfully merged at revision 207f7fc5d6465f95eca9f48db7348091cb5c1cda

diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 0c0ecf7..b0fc52d 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,5 +1,14 @@
-requests
-urllib3
+# https://github.com/juju-solutions/layer-basic/pull/197
+MarkupSafe<2.0.0
+
+# Support for python3.4 (Trusty)
+defusedxml<0.6.0
+redis<3.4.0
+requests<2.22.0
+urllib3<1.25.8
+# https://code.launchpad.net/~hloeung/layer-snap/+git/layer-snap/+merge/403105
+tenacity<5.0.4
+
 # insights-core -> lockfile -> pbr
 # lockfile is retired, and it won't install pbr, specify explicitly here
 pbr