Merge ~axino/charm-telegraf/+git/telegraf-charm:socket_listener into ~telegraf-charmers/charm-telegraf:master

[Junien F]

switch from the deprecated tcp_listener to socket_listener

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Laurent Sesquès (sajoupa)]

I'll hold off on this one until we release the 1.8.1 version of telegraf on https://code.launchpad.net/~telegraf-devs/+archive/ubuntu/ppa

[Laurent Sesquès (sajoupa)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 2b6cc185daf6e43f259c0e60afda615a9e55de95

[Paul Gear (paulgear)]

I've built a new charm (on bionic) from this revno; published as cs:~telegraf-charmers/telegraf-27 (cs:telegraf-20), candidate channel.

diff --git a/reactive/telegraf.py b/reactive/telegraf.py
index 6cfdaad..4454884 100644
--- a/reactive/telegraf.py
+++ b/reactive/telegraf.py
@@ -90,7 +90,7 @@ def list_config_files():
             config_files.append(config_path)
     if 'extra_plugins.configured' in current_states.keys():
         config_files.append('{}/extra_plugins.conf'.format(get_configs_dir()))
-    config_files.append('{}/tcp_listener.conf'.format(get_configs_dir()))
+    config_files.append('{}/socket_listener.conf'.format(get_configs_dir()))
     return config_files
 
 
@@ -224,9 +224,9 @@ def get_prometheus_port():
         return int(config.get('prometheus_output_port'))
 
 
-def render_tcp_listener_config(context):
-    config_path = '{}/tcp_listener.conf'.format(get_configs_dir())
-    render(source='tcp_listener.tmpl', templates_dir=get_templates_dir(),
+def render_socket_listener_config(context):
+    config_path = '{}/socket_listener.conf'.format(get_configs_dir())
+    render(source='socket_listener.tmpl', templates_dir=get_templates_dir(),
            target=config_path, context=context)
 
 
@@ -285,7 +285,7 @@ def configure_telegraf():
         check_prometheus_port("prometheus_output", get_prometheus_port())
     context['extra_options'] = get_extra_options()
 
-    render_tcp_listener_config(context=context)
+    render_socket_listener_config(context=context)
     hookenv.log("Updating main config file")
     render(source='telegraf.conf.tmpl', templates_dir=get_templates_dir(),
            target=config_path, context=context)
diff --git a/templates/socket_listener.tmpl b/templates/socket_listener.tmpl
new file mode 100644
index 0000000..8d83e27
--- /dev/null
+++ b/templates/socket_listener.tmpl
@@ -0,0 +1,5 @@
+# Enable socket listener on loopback interface
+# Generic socket listener capable of handling multiple socket types.
+[[inputs.socket_listener]]
+  # FIXME: allow configuration
+  service_address = "tcp://127.0.0.1:8094"
diff --git a/templates/tcp_listener.tmpl b/templates/tcp_listener.tmpl
deleted file mode 100644
index 41b092e..0000000
--- a/templates/tcp_listener.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-# FIXME: this will need to change to socket listener under telegraf 1.3+
-# Enable TCP listener on loopback interface
-[[inputs.tcp_listener]]
-  # FIXME: allow configuration
-  service_address = "127.0.0.1:8094"
-  max_tcp_connections = 10
-  allowed_pending_messages = 10000