~jneo8/charm-prometheus2:test/prometheus-config-change

Branch merges

Propose for merging

Merged into charm-prometheus2:master at revision 2c7524dca133eeb08e9c89512146ed799e314fdc

Ramesh Sattaru (community): Approve on 2022-12-23

🤖 prod-jenkaas-bootstack (community): Approve (continuous-integration) on 2022-12-23

Chi Wai CHAN: Approve on 2022-12-21

Eric Chen: Approve on 2022-12-20

Diff: 279 lines (+137/-98)

2 files modified

src/tests/functional/requirements.txt (+1/-0)
src/tests/functional/tests/tests_prometheus.py (+136/-98)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

4f6e280... by JamesLin on 2022-12-19

test(src/tests/functional/tests/tests_prometheus.py): Add tenacity retry
in functional test

d471d99... by Haw Loeung on 2022-11-30

Ignore hidden files (such as .launchpad.yaml, .yamllint.yaml, etc.)

Reviewed-on: https://code.launchpad.net/~hloeung/charm-prometheus2/+git/charm-prometheus2/+merge/432923
Reviewed-by: Erhan Sunar <email address hidden>

eeeafb7... by Haw Loeung on 2022-11-24

Pin flake8 to a version less than 6 due to bug in the flake8-import-order plugin/module

675bb4f... by Haw Loeung on 2022-11-14

Ignore hidden files (such as .launchpad.yaml, .yamllint.yaml, etc.)

f3331e0... by Mert Kirpici on 2022-11-24

Fix functional tests

Reviewed-on: https://code.launchpad.net/~mertkirpici/charm-prometheus2/+git/charm-prometheus2/+merge/433507
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: Ramesh Sattaru <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

bf235cf... by Mert Kirpici on 2022-11-23

tests/functional: run bionic-vault tests on bionic

This file was removed by mistake, causing all the machines created from
juju model defaults

Signed-off-by: Mert Kırpıcı <email address hidden>

2d5bcfc... by James Simpson on 2022-10-11

Add support for running prometheus as non-root user

Reviewed-on: https://code.launchpad.net/~jsimpso/charm-prometheus2/+git/charm-prometheus2/+merge/430075
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>
Reviewed-by: Erhan Sunar <email address hidden>
Reviewed-by: Chi Wai CHAN <email address hidden>
Reviewed-by: Robert Gildein <email address hidden>

394f25e... by James Simpson on 2022-09-27

Fix malformed string

6b54fed... by James Simpson on 2022-09-19

Refactor tests

* Split four test scenarios into individual functions
* Add descriptive docstrings per-test.

db2a9b4... by James Simpson on 2022-09-19

Add support for running prometheus as non-root user

This commit introduces changes required to support the prometheus
service running as a non-root user (See LP#1909947).

When `write_rendered_template` is called, it will check the current
user and group ownership values. If the owner is "snap_daemon", the
current user and group settings applied by the snap will be honored. If
the owner is anything else, ownership will be set to "root:root"
(the current behaviour).

Tests have been added to cover the new code.

All other changes are a result of "make black && make lint".

https://bugs.launchpad.net/prometheus-snap/+bug/1909947