lp:~ack/landscape-charm/block-metrics-through-haproxy
- Get this branch:
- bzr branch lp:~ack/landscape-charm/block-metrics-through-haproxy
Branch merges
- Francis Ginther (community): Approve
- Adam Collard (community): Approve
- 🤖 Landscape Builder: Approve (test results)
-
Diff: 319 lines (+8/-255)6 files modifiedconfig/vhost.tmpl (+0/-66)
config/vhost.tmpl.legacy (+0/-66)
config/vhostssl.tmpl (+0/-62)
config/vhostssl.tmpl.legacy (+0/-61)
lib/relations/haproxy.py (+2/-0)
lib/relations/tests/test_haproxy.py (+6/-0)
Related bugs
Bug #1674291: Prevent access to /metrics endpoint through haproxy | High | Fix Released |
Related blueprints
Branch information
Recent revisions
- 383. By Chad Smith
-
Merge add-apt-
repository- retries [f=1370933] [r=landscape- builder, ericsnowcurrent ly] [a=Chad Smith]
Sync of charmhelpers to get updated fetch.add_source which handles 30 retries upon exit 1Add charmhelpers.
osplatform dependency to charm-helpers.yaml - 382. By Alberto Donato
-
Add devscripts and build-essential dependencies for building packages locally [trivial] [r=bjornt].
- 381. By Данило Шеган
-
Merge no-pppa-
proxy-without- hosted [f=] [r=adam- collard, ack,landscape- builder] [a=Данило Шеган]
Do not add pppa-proxy entries to HAProxy config when no hosted relation is presentWe already had this as conditional, but the conditions were not sufficient since HostedRequirer itself augmented the returned data with a "deployment-mode: standalone" when there was no hosted relation.
- 380. By Данило Шеган
-
Merge reenable-
haproxy- httpchk [f=] [r=adam- collard, ack,landscape- builder] [a=Данило Шеган]
Re-instate haproxy HEAD HTTP checkNow that pppa proxy supports unauthenticated HTTP HEAD checks, we can reinstate the check for all the services.
- 379. By Alberto Donato
-
Merge amulet-
actions- support [f=] [r=landscape- builder, simpoir, free.ekanayaka] [a=Alberto Donato]
Use standard amulet methods for creating and fetching actions, rather than our own code. - 378. By Alberto Donato
-
Merge integration-
tests-juju2 [f=] [r=adam- collard, landscape- builder, free.ekanayaka] [a=Alberto Donato]
Update charm tests to support running them with juju2.This uses bundletester instead of juju-test (which doesn't work with juju2).
- 377. By Alberto Donato
-
Use the new bundles branch location (separate project). [trivial] [r=Ursinha]
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~landscape/landscape-charm/trunk