charm-juju-controller

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

  1. Git
  2. lp:charm-juju-controller
  3. xp-test
  4. Merge into 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 :

FAILED: Continuous integration, rev:e71de94fadcf6d8c312198baf12ec28fb5ac5700
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/355/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/3//rebuild

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

FAILED: Continuous integration, rev:e71de94fadcf6d8c312198baf12ec28fb5ac5700
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/356/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/4//rebuild

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

FAILED: Continuous integration, rev:e71de94fadcf6d8c312198baf12ec28fb5ac5700
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/3/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/357/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/5//rebuild

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

FAILED: Continuous integration, rev:e71de94fadcf6d8c312198baf12ec28fb5ac5700
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/4/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/358/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/6//rebuild

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 :

FAILED: Continuous integration, rev:267cc41fb4040c127f5a1db033b6330b336355d1
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/158/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/409/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/9//rebuild

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 :

PASSED: Continuous integration, rev:f99ca371284fc59473b48651fc78fac95ab520f8
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/159/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/410/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/10//rebuild

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
1diff --git a/src/README.md b/src/README.md
2index 5c838cb..852c87b 100644
3--- a/src/README.md
4+++ b/src/README.md
5@@ -10,17 +10,29 @@ machines.
6
7 In order to monitor a controller on machine 0 in a model named 'controller':
8
9- juju switch controller
10- juju deploy cs:~llama-charmers/juju-controller --to 0 juju-controller
11- juju deploy cs:nrpe nrpe-controller
12- juju add-relation nrpe-controller juju-controller
13- juju config nrpe-controller nagios_host_context=mysitename
14- juju offer nrpe-controller:monitors
15- Application "nrpe" endpoints [monitors] available at "admin/controller.nrpe-controller"
16+```bash
17+juju switch controller
18+juju deploy cs:~llama-charmers/juju-controller --to 0 juju-controller
19+juju deploy cs:nrpe nrpe-controller
20+juju add-relation nrpe-controller juju-controller
21+juju config nrpe-controller nagios_host_context=mysitename
22+juju offer nrpe-controller:monitors
23+```
24
25- juju switch $nagiosmodel
26- juju add-relation nagios admin/controller.nrpe-controller
27+Note the output of the "offer" command will look like the following example.
28+You will need the output's "available at" value for the next add-relation command:
29
30+```
31+Application "nrpe" endpoints [monitors] available at "admin/controller.nrpe-controller"
32+```
33+
34+You can then follow-up within the model with the nagios application with
35+the following (substituting admin/controller.nrpe-controller for the output from your offer command above:
36+
37+```bash
38+juju switch $model_with_nagios
39+juju add-relation nagios:monitors admin/controller.nrpe-controller
40+```
41
42 You can alternately use this as a bundle, for example:
43
44@@ -65,19 +77,21 @@ relations:
45 - telegraf-controller:juju-info
46 ```
47
48-To get the offers for other apps, try:
49+To query the offers for other apps, try:
50
51 ```bash
52 $ juju offer filebeat-controller:logstash
53 Application "filebeat-controller" endpoints [logstash] available at "admin/controller.filebeat-controller"
54 $ juju offer telegraf-controller:prometheus-client
55 Application "telegraf-controller" endpoints [prometheus-client] available at "admin/controller.telegraf-controller"
56-$ juju offer landscape-client-controller:registration
57-Application "landscape-client-controller" endpoints [registration] available at "admin/controller.landscape-client-controller"
58+```
59+
60+To consume those offers, switch to the model with the consuming application such as prometheus or graylog with:
61+
62+```bash
63 juju switch $model
64 juju add-relation prometheus:target admin/controller.telegraf-controller
65 juju add-relation graylog admin/controller.filebeat-controller
66-
67 ```
68
69 # Bugs

Subscribers

No one subscribed via source and target branches