~aluria/charm-prometheus2:bug/1918277

Branch merges

Propose for merging

Merged into charm-prometheus2:master at revision b44d0f4b73e9c4969733234bb8ff8abdeb789081

🤖 prod-jenkaas-bootstack (community): Approve (continuous-integration) on 2021-10-05

James Troup (community): Needs Information on 2021-10-05

Alvaro Uria (community): Approve on 2021-10-05

Haw Loeung: Needs Fixing on 2021-06-30

Diff: 583 lines (+403/-12)

9 files modified

src/layer.yaml (+7/-0)
src/reactive/prometheus.py (+58/-4)
src/templates/prometheus.yml.j2 (+5/-5)
src/tests/functional/requirements.txt (+1/-0)
src/tests/functional/tests/bundles/bionic-vault.yaml (+55/-0)
src/tests/functional/tests/tests.yaml (+14/-0)
src/tests/functional/tests/tests_prometheus.py (+93/-0)
src/tests/unit/requirements.txt (+0/-1)
src/tests/unit/test_reactive_prometheus.py (+170/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

459d0d7... by Alvaro Uria on 2021-10-05

Clarify comments inline

2f5e016... by Alvaro Uria on 2021-03-16

Add func tests: certificates + manual-jobs rels

55787ea... by Alvaro Uria on 2021-03-16

Add unit tests for update_prometheus_manual_jobs

3ff1ac4... by Alvaro Uria on 2021-03-11

Add tls-client support

d538b63... by James Troup on 2021-08-10

Replace references to 'juju set' with 'juju config'.

Reviewed-on: https://code.launchpad.net/~elmo/charm-prometheus2/+git/charm-prometheus2/+merge/406770
Reviewed-by: Xiyue Wang <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

4175101... by James Troup on 2021-08-06

Replace references to 'juju set' with 'juju config'.

72270a0... by Xav Paice on 2021-07-20

Pin python requests to support Python 3.5

In order to maintain Xenial support, we must use a version of requests
that still works with Python 3.5.

Resolves LP:#1936895

Reviewed-on: https://code.launchpad.net/~xavpaice/charm-prometheus2/+git/prometheus2-charm/+merge/405993
Reviewed-by: James Troup <email address hidden>
Reviewed-by: Paul Goins <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

2e8a2fd... by Xav Paice on 2021-07-20

Pin python requests to support Python 3.5

In order to maintain Xenial support, we must use a version of requests
that still works with Python 3.5.

Resolves LP:#1936895

6867099... by Joe Guo on 2021-03-29

install sensible-mda deb package

when prometheus needs to send email, it will call /usr/sbin/sensible-mda
and if this package is not installed, massive error log will be
generated to use out disk space.

LP: #1904019

Signed-off-by: Joe Guo <email address hidden>

1061146... by Alvaro Uria on 2020-10-16

Merge remote-tracking branch 'drew/lint-20.10'

Reviewed-on: https://code.launchpad.net/~afreiberger/charm-prometheus2/+git/charm-prometheus2/+merge/392301
Reviewed-by: Alvaro Uria <email address hidden>