Merge charm-juju-controller:xp-test into charm-juju-controller:master

Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: f99ca371284fc59473b48651fc78fac95ab520f8
Merged at revision: b2751b9f7036f1d23734895e3afcfdcb5217b680
Proposed branch: charm-juju-controller:xp-test
Merge into: charm-juju-controller:master
Diff against target: 69 lines (+27/-13)
1 file modified
src/README.md (+27/-13)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Drew Freiberger (community) Approve
James Troup (community) Needs Information
Review via email: mp+406274@code.launchpad.net

Commit message

Minor update to README.md format

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
James Troup (elmo) :
review: Needs Information
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
Drew Freiberger (afreiberger) wrote :

I've hopefully updated to provide clarity per your question, @elmo.

review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision b2751b9f7036f1d23734895e3afcfdcb5217b680

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/README.md b/src/README.md
index 5c838cb..852c87b 100644
--- a/src/README.md
+++ b/src/README.md
@@ -10,17 +10,29 @@ machines.
1010
11In order to monitor a controller on machine 0 in a model named 'controller':11In order to monitor a controller on machine 0 in a model named 'controller':
1212
13 juju switch controller13```bash
14 juju deploy cs:~llama-charmers/juju-controller --to 0 juju-controller14juju switch controller
15 juju deploy cs:nrpe nrpe-controller15juju deploy cs:~llama-charmers/juju-controller --to 0 juju-controller
16 juju add-relation nrpe-controller juju-controller16juju deploy cs:nrpe nrpe-controller
17 juju config nrpe-controller nagios_host_context=mysitename17juju add-relation nrpe-controller juju-controller
18 juju offer nrpe-controller:monitors18juju config nrpe-controller nagios_host_context=mysitename
19 Application "nrpe" endpoints [monitors] available at "admin/controller.nrpe-controller"19juju offer nrpe-controller:monitors
20```
2021
21 juju switch $nagiosmodel22Note the output of the "offer" command will look like the following example.
22 juju add-relation nagios admin/controller.nrpe-controller23You will need the output's "available at" value for the next add-relation command:
2324
25```
26Application "nrpe" endpoints [monitors] available at "admin/controller.nrpe-controller"
27```
28
29You can then follow-up within the model with the nagios application with
30the following (substituting admin/controller.nrpe-controller for the output from your offer command above:
31
32```bash
33juju switch $model_with_nagios
34juju add-relation nagios:monitors admin/controller.nrpe-controller
35```
2436
25You can alternately use this as a bundle, for example:37You can alternately use this as a bundle, for example:
2638
@@ -65,19 +77,21 @@ relations:
65 - telegraf-controller:juju-info77 - telegraf-controller:juju-info
66```78```
6779
68To get the offers for other apps, try:80To query the offers for other apps, try:
6981
70```bash82```bash
71$ juju offer filebeat-controller:logstash83$ juju offer filebeat-controller:logstash
72Application "filebeat-controller" endpoints [logstash] available at "admin/controller.filebeat-controller"84Application "filebeat-controller" endpoints [logstash] available at "admin/controller.filebeat-controller"
73$ juju offer telegraf-controller:prometheus-client85$ juju offer telegraf-controller:prometheus-client
74Application "telegraf-controller" endpoints [prometheus-client] available at "admin/controller.telegraf-controller"86Application "telegraf-controller" endpoints [prometheus-client] available at "admin/controller.telegraf-controller"
75$ juju offer landscape-client-controller:registration87```
76Application "landscape-client-controller" endpoints [registration] available at "admin/controller.landscape-client-controller"88
89To consume those offers, switch to the model with the consuming application such as prometheus or graylog with:
90
91```bash
77juju switch $model92juju switch $model
78juju add-relation prometheus:target admin/controller.telegraf-controller93juju add-relation prometheus:target admin/controller.telegraf-controller
79juju add-relation graylog admin/controller.filebeat-controller94juju add-relation graylog admin/controller.filebeat-controller
80
81```95```
8296
83# Bugs97# Bugs

Subscribers

No one subscribed via source and target branches