Merge pull request #134 from magenbrot/master

aboe76 · web-flow · commit 322b63b89e7f · 2019-02-03T21:42:46.000+01:00
Add AllPortsSummary option to collectd tcpconns
diff --git a/README.rst b/README.rst
@@ -180,6 +180,11 @@ Enables and configures the syslog plugin.
 
 Enables and configures the tail plugin.
 
+``collectd.tcpconns``
+-------------------
+
+Enables and configures the tcpconns plugin.
+
 ``collectd.types``
 -------------------
 
diff --git a/collectd/files/tcpconns.conf b/collectd/files/tcpconns.conf
@@ -10,6 +10,7 @@ LoadPlugin tcpconns
 
 <Plugin "tcpconns">
   ListeningPorts {{ collectd_settings.plugins.tcpconns.listening_ports | lower }}
+  AllPortsSummary {{ collectd_settings.plugins.tcpconns.all_ports_summary | lower }}
 {%- for local_port in collectd_settings.plugins.tcpconns.local_ports %}
   LocalPort "{{ local_port }}"
 {%- endfor %}
diff --git a/collectd/map.jinja b/collectd/map.jinja
@@ -193,6 +193,7 @@
             },
             'tcpconns': {
               'listening_ports': 'true',
+              'all_ports_summary': 'false',
               'local_ports': [],
               'remote_ports': []
             },
diff --git a/pillar.example b/pillar.example
@@ -226,6 +226,7 @@ collectd:
         ReportByCpu: false
     tcpconns:
       listening_ports: 'true'
+      all_ports_summary: 'false'
       local_ports: []
       remote_ports: []
     openvpn:
