~paulgear/prometheus-charm/+git/prometheus-charm:master

Branch merges

Propose for merging

Merged into prometheus-charm:master at revision f1a713254fd41761c87b2c5617731ca189fae03b

Haw Loeung: Approve on 2018-05-11

Diff: 23 lines (+3/-2)

1 file modified

reactive/prometheus.py (+3/-2)

api

Rejected for merging into prometheus-charm:master

Jacek Nykis (community): Needs Information on 2017-07-12

Diff: 372 lines (+137/-68)

3 files modified

config.yaml (+11/-0)
reactive/prometheus.py (+123/-68)
templates/promreg.yaml.j2 (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

be35fee... by Paul Gear on 2018-05-11

[trivial] flake8 run

ed0f475... by Casey Marshall on 2018-05-10

Use external path for nrpe check_http plugin.

Fixes the 404 warning state that prometheus is in w/nagios
when the external_url config option is set; commonly used with url
rewriting in frontend like haproxy.

Reviewed-on: https://code.launchpad.net/~cmars/prometheus-charm/+git/prometheus-charm/+merge/342903
Reviewed-by: Paul Gear <email address hidden>
Reviewed-by: Domas Monkus <email address hidden>

e78b063... by Casey Marshall on 2018-04-09

Use external path for nrpe check_http plugin.

Fixes the 404 warning state that prometheus is in w/nagios
when the external_url config option is set; commonly used with url
rewriting in frontend like haproxy.

1c55932... by Jacek Nykis on 2017-10-11

Ensure prometheus.yml is updated on web-listen-port update

3f5a88d... by Jacek Nykis on 2017-10-11

Merge tasdomas' web-listen-port and external_url fixes

8ef84b7... by Domas Monkus on 2017-10-05

Prometheus external_url setting affects the scrape metrics path for prometheus itself.

9c1462b... by mattyw <email address hidden> on 2017-10-04

reactive/prometheus: Started working on fix for prometheus external_url changing metrics path

166479c... by Jacek Nykis on 2017-09-19

prometheus.py: The configure_rules function needs to be called immediately, rather than scheduling for later, the rules for state execution are non deterministic, but we require this to be called before promtool validates them

e5ba35e... by mattyw <email address hidden> on 2017-09-19

prometheus.py: The configure_rules function needs to be called immediately, rather than scheduling for later, the rules for state execution are non deterministic, but we require this to be called before promtool validates them

ed0ca10... by Jacek Nykis on 2017-09-18

Merge mattyw's custom-rules bugfix