charm-prometheus2:federate-job-fix

Branch merges

Propose for merging

Merged into charm-prometheus2:master at revision b43e0b4c4657240a7951f192fc2b950818d4312b

JamesLin: Approve on 2023-10-13

Eric Chen: Approve on 2023-10-13

Tianqi Xiao (community): Approve on 2023-10-13

🤖 prod-jenkaas-bootstack (community): Approve (continuous-integration) on 2023-10-13

Robert Gildein: Needs Fixing on 2023-10-12

Erhan Sunar (community): Needs Fixing on 2023-09-06

Diff: 57 lines (+16/-2)

2 files modified

src/templates/prometheus.yml.j2 (+9/-1)
src/tests/unit/test_reactive_prometheus.py (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

b34224c... by Tianqi Xiao on 2023-10-05

Add python dependencies to resolve build issue with charm recipe

c13154f... by Tianqi Xiao on 2023-10-04

Fix issues with test_prometheus_yml_scrape_configs method

- This test was async and never waited, so its tests
were not actually being run. Changed it to a sync.
- Use "model.get_lead_unit_ip" from zaza to get leader unit ip for
telegraf. For it to work properly, `ZAZA_FEATURE_BUG472` env need to
be set due to https://github.com/openstack-charmers/zaza/issues/472
- Cert files assertion was failing because wrong cert dir was specified
in test and hash was added to their path in runtime in code. Change to
regex matching for correct behavior.

f8b0d89... by Tianqi Xiao on 2023-10-03

Drop bionic support

6f3039d... by Tianqi Xiao on 2023-10-02

Fix error in dependencies and functional test bundles

- Fix dependencies issues which causes install hook error
- Fix empty "vault" channel error in test bundles
- Remove deprecated "series" field in metadata.yaml

7a4e0d6... by Nishant Dash on 2023-09-07

Fixing Federate Configuration

59e1ecc... by Nishant Dash on 2023-09-06

Fixing Federate Configuration

3bf7d3f... by Chi Wai CHAN on 2023-07-12

Add deprecation notice

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

4918ea8... by Chi Wai CHAN on 2023-07-11

Remove pin for zaza-openstack-tests since it's now causing built
dependency issue (2023-07-11).

dcfb659... by Chi Wai CHAN on 2023-07-07

Add deprecation notice.

4c824e1... by Chris Johnston on 2023-05-30

Clarify config description of rules-repo and rules-update-ssh-key.

Fixes: LP: #2018932, #2018933

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