Merge lp://staging/~michael.nelson/charms/trusty/kibana/kibana4-merge-upstream into lp://staging/~canonical-is-sa/charms/trusty/kibana/kibana4
| Status: | Merged |
|---|---|
| Merged at revision: | 23 |
| Proposed branch: | lp://staging/~michael.nelson/charms/trusty/kibana/kibana4-merge-upstream |
| Merge into: | lp://staging/~canonical-is-sa/charms/trusty/kibana/kibana4 |
| Diff against target: |
97 lines (+21/-17) 5 files modified
hooks/rest-relation-departed (+1/-0) hooks/rest-relation-joined (+1/-0) metadata.yaml (+3/-1) tests/11-scale-elastic.py (+15/-15) tests/12-port-change.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~michael.nelson/charms/trusty/kibana/kibana4-merge-upstream |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Foley (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge upstream kibana changes and update test (so it's not expecting kibana to proxy external requests for :9200 to ES).
Description of the change
This just merges the upstream changes that landed last week (r23) and then updates a test which is assuming that requests to kibana on :9200 will be proxied to ES (something that we've explicitly dis-allowed in our kibana4 branch).
Ensured the test works locally:
dev-trusty# ~/charms/
$ ./tests/
2015-11-09 03:09:35 Starting deployment of local
2015-11-09 03:09:35 Deploying services...
2015-11-09 03:09:35 Deploying service elasticsearch using cs:trusty/
2015-11-09 03:09:43 Deploying service kibana using /home/michael/
2015-11-09 03:09:48 Deploying service logstash-indexer using cs:precise/
2015-11-09 03:13:08 Adding relations...
2015-11-09 03:13:08 Adding relation logstash-
2015-11-09 03:13:09 Adding relation kibana:rest <-> elasticsearch:
2015-11-09 03:14:09 Exposing service 'kibana'
2015-11-09 03:14:09 Deployment complete in 275.00 seconds
dev-trusty# ~/charms/
$
+1