lp:~verterok/charms/trusty/logstash/merge-canonical-is-sa

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~tanuki/charms/trusty/logstash/trunk at revision 56

Celso Providelo (community): Approve on 2015-09-08

Diff: 2823 lines (+1907/-134)

30 files modified

charm-helpers.yaml (+1/-0)
config.yaml (+24/-0)
hooks/client-relation-changed (+3/-1)
hooks/config-changed (+2/-0)
hooks/nrpe-external-master-relation-changed (+39/-0)
lib/charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
lib/charmhelpers/contrib/charmsupport/nrpe.py (+360/-0)
lib/charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
lib/charmhelpers/contrib/templating/__init__.py (+15/-0)
lib/charmhelpers/contrib/templating/jinja.py (+25/-9)
lib/charmhelpers/core/__init__.py (+15/-0)
lib/charmhelpers/core/decorators.py (+57/-0)
lib/charmhelpers/core/fstab.py (+30/-12)
lib/charmhelpers/core/hookenv.py (+105/-22)
lib/charmhelpers/core/host.py (+103/-38)
lib/charmhelpers/core/services/__init__.py (+18/-2)
lib/charmhelpers/core/services/base.py (+16/-0)
lib/charmhelpers/core/services/helpers.py (+37/-9)
lib/charmhelpers/core/strutils.py (+42/-0)
lib/charmhelpers/core/sysctl.py (+56/-0)
lib/charmhelpers/core/templating.py (+20/-3)
lib/charmhelpers/core/unitdata.py (+477/-0)
lib/charmhelpers/fetch/__init__.py (+44/-14)
lib/charmhelpers/fetch/archiveurl.py (+76/-22)
lib/charmhelpers/fetch/bzrurl.py (+30/-2)
lib/charmhelpers/fetch/giturl.py (+71/-0)
lib/charmhelpers/payload/__init__.py (+16/-0)
lib/charmhelpers/payload/archive.py (+16/-0)
lib/charmhelpers/payload/execd.py (+16/-0)
metadata.yaml (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

56. By Guillermo Gonzalez on 2015-09-08

merge trunk

55. By Guillermo Gonzalez on 2015-09-07

merge with lp:~canonical-is-sa/charms/trusty/logstash/trunk

54. By Thomi Richards on 2015-09-01

Merge code to expose tcp port 5959.

53. By Celso Providelo on 2015-08-14

Calling hooks/start directly, imports do not work.

52. By Celso Providelo on 2015-08-14

Fixing extra-config config value lookup.

51. By Celso Providelo on 2015-08-14

Restarting services on configuration changes.

50. By Celso Providelo on 2015-08-13

Supporting 'extra-config' (for PD forwarding).

49. By Guillermo Gonzalez on 2015-08-04

Disable call of install hook from config-changed, as it fails if the tarball was already installed/extracted

48. By Celso Providelo on 2015-06-30

Enabling python-logstash support via udp:5959.

47. By Charles Butler on 2015-04-20

[r,a=lazypower] Michael Foley 2015-04-17 [foley] Add myself to maintainers field
Michael Foley 2015-04-17 [merge] [mthaddon,r=foli] Add support for exec.d infrastructure so we can customise instances
Tom Haddon 2015-04-16 Add support for exec.d infrastructure so we can customise instances
Michael Foley 2015-04-17 [merge] [foley] merge in upstream changes for fixing local tarball installation
Michael Foley 2015-04-15 [foli] changed lumberjack-relation-joined lumberjack-relation-changed with symlink for joined
Michael Foley 2015-04-15 [foli] add relation for haproxy to proxy lumberjack on port 5043
Michael Foley 2015-04-07 [foli] lumberjack conf file only enabled if ssl cert/key are configured
Michael Foley 2015-04-07 [merge] [mthaddon,r=foli] Open the port we need for the service
Tom Haddon 2015-04-02 Open the port we need for the service
Michael Foley 2015-04-01 [foli] Fix more copy-paste errors by adding necessary imports, fix file perms for ssl
Michael Foley 2015-04-01 [foli] Fix copy-paste error for config_data for ssl cert/key
Michael Foley 2015-03-31 [foli] Added lumberjack input conf file, added ssl_cert & ssl_key configuration