Merge lp:~cprov/charms/trusty/logstash/heap_size into lp:~canonical-is-sa/charms/trusty/logstash/logstash2

[Celso Providelo]

Allowing changing the logstash maximum heap size as a configuration.

Allowing changing the logstash maximum heap size as a configuration.

Defaults to 1000m instead of the application 500m default value and allow adjustments.

[Guillermo Gonzalez (verterok)]

Celso,

If this is to apply it to the OLS ELK, it's using a a different charm:

lp:~canonical-is-sa/charms/trusty/logstash/logstash2;revno=61,overwrite=true

the spec in use (for both staging and production) is: is/mojo-is-logging-kibana/ @ lp:canonical-mojo-specs.

review: Needs Information

[Michael Nelson (michael.nelson)]

LGTM. Note that in the ES charm, we're explicitly giving unlimited memlock. See the task at:

http://bazaar.launchpad.net/~onlineservices-charmers/charms/trusty/elasticsearch/elasticsearch2/view/head:/tasks/install-elasticsearch.yml#L49

which installs this template:

http://bazaar.launchpad.net/~onlineservices-charmers/charms/trusty/elasticsearch/elasticsearch2/view/head:/templates/limits.conf

review: Approve

[lp:~cprov/charms/trusty/logstash/heap_size]

61. By Celso Providelo on 2016-11-23

Special (no-) limits configuration for logstash, so it can eat as much memory it is configured too.

[Michael Nelson (michael.nelson)]

+1 from me (see note above about using memlock)

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-01-22 21:34:37 +0000
+++ config.yaml	2016-11-23 22:47:42 +0000
@@ -40,6 +40,11 @@
             match => { ... }
           }
       More info at https://www.elastic.co/guide/en/logstash/current/plugins-filters-grok.html#_custom_patterns
+  heap_size:
+    default: "1000m"
+    type: string
+    description: |
+      Maximum Java heap size for the logstash process.
   nagios_context:
     default: "juju"
     type: string
 
=== added file 'files/limits.conf'
--- files/limits.conf	1970-01-01 00:00:00 +0000
+++ files/limits.conf	2016-11-23 22:47:42 +0000
@@ -0,0 +1,3 @@
+# Ensure Logstash user can run with max open files and unlimited memlock.
+{{ USER }} - nofile 65535
+{{ USER }} - memlock unlimited
 
=== modified file 'files/upstart/logstash-indexer.conf'
--- files/upstart/logstash-indexer.conf	2014-09-23 12:11:08 +0000
+++ files/upstart/logstash-indexer.conf	2016-11-23 22:47:42 +0000
@@ -11,6 +11,7 @@
 respawn
 respawn limit 5 30
 env HOME={{BASEPATH}}
+env LS_HEAP_SIZE={{HEAP_SIZE}}
 chdir {{BASEPATH}}
 setuid logstash
 setgid adm
@@ -18,4 +19,4 @@
 
 script
     {{BASEPATH}}/bin/logstash agent -f {{BASEPATH}}/conf.d/
-end script
 \ No newline at end of file
+end script
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2016-01-22 21:34:37 +0000
+++ hooks/config-changed	2016-11-23 22:47:42 +0000
@@ -113,7 +113,11 @@
 def place_upstart_template():
     out = os.path.join(os.path.sep, 'etc', 'init', '{}.conf'.format(SERVICE))
     templ = os.path.join('files', 'upstart')
-    opts = {'BASEPATH': BASEPATH}
+    config_data = hookenv.config()
+    opts = {
+        'BASEPATH': BASEPATH,
+        'HEAP_SIZE': config_data['heap_size'],
+    }
 
     with open(out, 'w') as p:
         p.write(render('{}.conf'.format(SERVICE), opts, template_dir=templ))
 
=== modified file 'hooks/install'
--- hooks/install	2015-04-17 08:26:14 +0000
+++ hooks/install	2016-11-23 22:47:42 +0000
@@ -11,6 +11,7 @@
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 
+from charmhelpers.contrib.templating.jinja import render
 from charmhelpers.core.hookenv import (
     config,
     log,
@@ -52,6 +53,9 @@
       create_skeleton()
       create_user()
 
+    # Update logstash user limits, so it can have it all.
+    update_limits()
+
     # finalize the installation and make sure logstash owns everything
     subprocess.call(['chown', '-R', 'logstash', BASEPATH])
 
@@ -111,6 +115,16 @@
     except KeyError:
         subprocess.call(['useradd', 'logstash'])
 
+
+def update_limits():
+    out = '/etc/security/limits.d/{}.conf'.format(SERVICE)
+    opts = {
+        'USER': 'logstash'
+    }
+    with open(out, 'w') as fd:
+        fd.write(render('limits.conf', opts, template_dir='files'))
+
+
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
     hooks.execute(sys.argv)