lp:~michael.nelson/charms/trusty/kibana/kibana4-merge-upstream

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~canonical-is-sa/charms/trusty/kibana/kibana4 at revision 23

Michael Foley (community): Approve on 2015-11-09

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

24. By Michael Nelson on 2015-11-09

Don't test querying kibana for ES results as it shouldn't work.

23. By Michael Nelson on 2015-11-08

Merge lp:charms/trusty/kibana

22. By Michael Foley on 2015-11-04

[michael.nelson,r=foli] Fix kibana config location.

21. By Tim Kuhlman on 2015-11-04

[michael.nelson,r=timkuhlman] Kibana 4 support

20. By Michael Foley on 2015-10-30

[michael.nelson,r=foli] Merge upstream (which now has web-relation-joined http relation). Fixed conflicts. Fixed charm proof errors. RT#85874

19. By Michael Foley on 2015-04-21

[foli] merge upstream changes

18. By Michael Foley on 2015-04-17

[foli] Add support for basenode exec.d

17. By Michael Foley on 2015-03-26

[foli] revert kibana config.js, and add option elasticsearch_url which modifies config.js during install

16. By Michael Foley on 2015-03-25

[foli] temporarily changed kibana config.js to use https for elasticsearch location, this is for putting kibana behind an apache ssl proxy. plan to make this configurable.

15. By Michael Foley on 2015-03-25

[foli] changed web relation to website(http) relation