Merge lp:~ricardokirkner/charms/trusty/logstash/logstash2-beats into lp:~canonical-is-sa/charms/trusty/logstash/logstash2

[Ricardo Kirkner]

enable beats protocol as input to logstash

[Guillermo Gonzalez (verterok)]

please fix comment on line 78?

+1

review: Approve

[Ricardo Kirkner (ricardokirkner)]

> please fix comment on line 78?

we're only enabling checks for beats protocol if ssl cert is configured (as otherwise beats protocol is not enabled at all).

[Guillermo Gonzalez (verterok)]

indeed, ignore me :-)

[Laurent Sesquès (sajoupa)]

review: Approve

=== added file 'hooks/beats-relation-changed'
--- hooks/beats-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/beats-relation-changed	2017-11-30 14:24:04 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eux
+
+hostname=$(unit-get private-address)
+juju-log "Setting beats URL to $hostname:5044"
+relation-set port=5044 hostname=$hostname

=== added symlink 'hooks/beats-relation-joined'
=== target is u'beats-relation-changed'
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2016-11-23 22:25:02 +0000
+++ hooks/config-changed	2017-11-30 14:24:04 +0000
@@ -37,7 +37,10 @@
     place_upstart_template()
 
     # This only actually opens the port if we've exposed the service in juju
+    # open port for lumberjack
     hookenv.open_port(5043)
+    # open port for beats
+    hookenv.open_port(5044)
 
     # Verify the config to get a decent error message for bad configuration.
     try:
@@ -61,6 +64,7 @@
     files = os.listdir('templates')
     opts = {'BASEPATH': BASEPATH}
     lumberjack_template = "input-lumberjack.conf"
+    beats_template = "input-beats.conf"
     cert_dir = os.path.join(BASEPATH, 'ssl')
     cert_file = os.path.join(cert_dir, 'logstash.crt')
     key_file = os.path.join(cert_dir, 'logstash.key')
@@ -72,7 +76,7 @@
         # hooks/client-relation-changed
         if os.path.basename(f) == "output-elasticsearch.conf":
             continue
-        if os.path.basename(f) != lumberjack_template:
+        if os.path.basename(f) not in (lumberjack_template, beats_template):
             with open(os.path.join(BASEPATH, 'conf.d', f), 'w') as p:
                 p.write(render(os.path.basename(f), opts))
 
@@ -89,7 +93,7 @@
         with open(os.path.join(patterns_dir, 'extra-patterns'), 'w') as f:
             f.write(str(base64.b64decode(config_data['extra-patterns'])))
 
-    # Only setup lumberjack protocol if ssl cert and key are configured
+    # Setup ssl cert and key if configured
     if config_data['ssl_cert'] and config_data['ssl_key']:
         if not os.path.exists(cert_dir):
             os.mkdir(cert_dir, 0770)
@@ -106,9 +110,14 @@
             with open(key_file, 'w') as f:
                 f.write(str(base64.b64decode(config_data['ssl_key'])))
 
+        # Only setup lumberjack protocol if ssl cert and key are configured
         with open(os.path.join(BASEPATH, 'conf.d', lumberjack_template), 'w') as p:
             p.write(render(os.path.basename(lumberjack_template), opts))
 
+        # Only setup beats protocol if ssl cert and key are configured
+        with open(os.path.join(BASEPATH, 'conf.d', beats_template), 'w') as p:
+            p.write(render(os.path.basename(beats_template), opts))
+
 
 def place_upstart_template():
     out = os.path.join(os.path.sep, 'etc', 'init', '{}.conf'.format(SERVICE))

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2016-01-25 13:09:45 +0000
+++ hooks/nrpe-external-master-relation-changed	2017-11-30 14:24:04 +0000
@@ -120,6 +120,24 @@
             )
         else:
             log('No client relations. Not adding e2e check.')
+    # Only setup beats protocol if ssl cert and key are configured
+    if config_data['ssl_cert'] and config_data['ssl_key']:
+        if check_tcp_params:
+            nrpe_compat.add_check(
+                shortname='beats_tcp',
+                description='Check logstash beats input tcp port',
+                check_cmd='check_tcp %s' % check_tcp_params
+            )
+        if check_cert_params:
+            # check certificate expiry date, daily and retry every 2 hs
+            cert_check = CustomIntervalCheck(
+                shortname='beats_ssl_check',
+                description='Check logstash ssl certificate expiry date',
+                check_cmd='check_tcp --ssl {}'.format(check_cert_params),
+                normal_check_interval=1440,  # minutes
+                retry_check_interval=120,  # minutes
+            )
+            nrpe_compat.checks.append(cert_check)
 
     nrpe_compat.write()
 

=== added file 'templates/input-beats.conf'
--- templates/input-beats.conf	1970-01-01 00:00:00 +0000
+++ templates/input-beats.conf	2017-11-30 14:24:04 +0000
@@ -0,0 +1,14 @@
+input {
+  beats {
+    # The port to listen on
+    port => 5044
+
+    ssl => true
+    # The paths to your ssl cert and key
+    ssl_certificate => "{{BASEPATH}}/ssl/logstash.crt"
+    ssl_key => "{{BASEPATH}}/ssl/logstash.key"
+
+    # Set this to whatever you want.
+    type => "beats"
+  }
+}