~jsimpso/charm-prometheus-alertmanager:master

Branch merges

Propose for merging

Merged into charm-prometheus-alertmanager:master at revision 3a934be68001fdc96fea97a1aed6ae83cd1a9fe6

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

Erhan Sunar (community): Approve on 2022-12-13

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

Diff: 9 lines (+2/-0)

1 file modified

src/wheelhouse.txt (+2/-0)

api

Merged into charm-prometheus-alertmanager:master at revision d6be73d5f5729153f6d5b3baf6fece01f1ebe1ec

Eric Chen: Needs Fixing on 2022-09-29

Robert Gildein: Approve on 2022-09-27

Chi Wai CHAN: Approve on 2022-09-27

BootStack Reviewers: Pending requested 2022-09-21

Diff: 355 lines (+227/-8)

3 files modified

src/config.yaml (+23/-0)
src/reactive/alertmanager.py (+41/-7)
src/tests/unit/test_reactive_alertmanager.py (+163/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

3b04dbc... by James Simpson on 2022-12-12

Pin MarkupSafe<2.1.0 for bug LP:1999356

674712d... by Mert Kirpici on 2022-11-23

Pin Jinja2 for focal builds

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

a7beec3... by Mert Kirpici on 2022-11-22

build: pin Jinja2 version for focal builds

See the commented issue in wheelhouse.txt

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

d6be73d... by James Simpson on 2022-09-29

Add advertise_address and extra_peers options

Reviewed-on: https://code.launchpad.net/~jsimpso/charm-prometheus-alertmanager/+git/charm-prometheus-alertmanager/+merge/430219
Reviewed-by: Eric Chen <email address hidden>
Reviewed-by: Chi Wai CHAN <email address hidden>
Reviewed-by: Robert Gildein <email address hidden>

bbd6a46... by James Simpson on 2022-09-27

Remove typo

3e67080... by James Simpson on 2022-09-21

Add advertise_address and extra_peers options

This MP introduces the "advertise_address" and "extra_peers" charm
configuration options.

"advertise_address" allows for manual control over alertmanager's
  "--cluster.advertise-address" command line option.

This is required if you're deploying alertmanager to a device with
    only a public IP address[1]

When not manually provided, this option is omitted entirely (as is the
current behaviour).

The "extra_peers" option allows for manual cluster peers to be provided,
in addition to those provided via juju relation. This introduces the
possibility of clustering AlertManager servers across regions not
linked by a shared juju controller.

Tests have been added to cover the newly introduced code.

[1] https://github.com/prometheus/alertmanager#high-availability

591d11c... by Xav Paice on 2022-03-07

add charmcraft.yaml

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

dea8fad... by Xav Paice on 2022-03-07

add charmcraft.yaml

5da5970... by Chris Johnston on 2022-02-11

Cleanup readme.

Reviewed-on: https://code.launchpad.net/~cjohnston/charm-prometheus-alertmanager/+git/charm-prometheus-alertmanager/+merge/415469
Reviewed-by: James Troup <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>

5f7ebe4... by Chris Johnston on 2022-02-11

Cleanup readme. LP: #1891101