Merge ~johnsca/charm-prometheus2:johnsca/feature/manual-job-relation into ~prometheus-charmers/charm-prometheus2:master
| Status: | Merged |
|---|---|
| Approved by: | Jeremy Lounder |
| Approved revision: | af63107d34c25e4743da4a5a5cfaadbbaf0d2153 |
| Merged at revision: | 73f989011ff8c12a44014f2ba98fb0c144645d9b |
| Proposed branch: | ~johnsca/charm-prometheus2:johnsca/feature/manual-job-relation |
| Merge into: | ~prometheus-charmers/charm-prometheus2:master |
| Diff against target: |
110 lines (+31/-4) 4 files modified
layer.yaml (+2/-1) metadata.yaml (+2/-0) reactive/prometheus.py (+18/-1) templates/prometheus.yml.j2 (+9/-2) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeremy Lounder (community) | Approve | ||
| Stuart Bishop (community) | Approve | ||
| Prometheus Charmers | Pending | ||
|
Review via email:
|
|||
Commit message
Add relation endpoint for charms to provide manual job configs
The charm currently supports manual job configuration stanzas via charm
config, but that means charms like Kubernetes which want to use those
have to depend on the operator to manually download and pass in the job
config data. This change adds a new relation endpoint for charms to be
able to provide manual job stanzas automatically over the relation.
Also, fix repo URL in layer.yaml
This caused me to waste some time working on the wrong charm when I used
`charm pull-source`. It would be great if we could figure out a better
way to tie a charm to its source layer repo that would be less likely to
get out of date.
Description of the change
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
| Cory Johns (johnsca) wrote | # |
| Kevin W Monroe (kwmonroe) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.