Merge lp://staging/~hloeung/mojo/mojo-specs-nrpe-nagios-master into lp://staging/mojo/mojo-specs
Proposed by
Haw Loeung
| Status: | Merged |
|---|---|
| Approved by: | Alexandre Gomes |
| Approved revision: | 166 |
| Merged at revision: | 164 |
| Proposed branch: | lp://staging/~hloeung/mojo/mojo-specs-nrpe-nagios-master |
| Merge into: | lp://staging/mojo/mojo-specs |
| Diff against target: |
415 lines (+56/-21) 28 files modified
charm-testing/apache-openid/deploy (+2/-0) charm-testing/apache2/deploy (+2/-1) charm-testing/canonical-livepatch/deploy (+2/-1) charm-testing/cassandra/deploy (+2/-1) charm-testing/content-cache/deploy (+1/-0) charm-testing/elasticsearch/deploy (+2/-1) charm-testing/filebeat/deploy (+2/-1) charm-testing/grafana/deploy (+3/-1) charm-testing/graylog/deploy (+2/-0) charm-testing/haproxy/deploy (+2/-1) charm-testing/influxdb/deploy (+3/-1) charm-testing/jenkins/deploy (+1/-0) charm-testing/juju-introspection-proxy/deploy (+2/-1) charm-testing/memcached/deploy (+2/-1) charm-testing/mongodb/deploy (+2/-1) charm-testing/nrpe/deploy (+2/-1) charm-testing/ntp/deploy (+2/-1) charm-testing/pgbouncer/deploy (+2/-1) charm-testing/postgresql/deploy (+2/-1) charm-testing/prometheus-openstack-exporter/deploy (+2/-1) charm-testing/prometheus2/deploy (+2/-1) charm-testing/rsyslog/deploy (+1/-0) charm-testing/squid-reverseproxy/deploy (+2/-1) charm-testing/telegraf/deploy (+2/-1) charm-testing/ubuntu-repository-cache/deploy (+2/-0) charm-testing/vault/deploy (+1/-0) mojo-how-to/devel/services (+3/-1) mojo-how-to/production/services (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~hloeung/mojo/mojo-specs-nrpe-nagios-master |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexandre Gomes | Approve | ||
|
Review via email:
|
|||
Commit message
Fixed setting nagios_master as required
Latest changes in the nrpe charm (316db7ce / LP:1887106) now requires either nagios_master set or an external monitor relation. This causes CI to fail and eventually time out as it's stuck with the nrpe unit in 'blocked' state.
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.