services: add background glue for interface handling speed-up

src/opnsense/scripts/filter/list_counters.py

+#!/usr/local/bin/python2.7
+
+"""
+    Copyright (c) 2017 Ad Schellevis
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+    --------------------------------------------------------------------------------------
+    list pf byte/packet counter
+"""
+import tempfile
+import subprocess
+import os
+import sys
+import ujson
+
+if __name__ == '__main__':
+    result = dict()
+    with tempfile.NamedTemporaryFile() as output_stream:
+        subprocess.call(['/sbin/pfctl', '-vvsI'], stdout=output_stream, stderr=open(os.devnull, 'wb'))
+        output_stream.seek(0)
+        data = output_stream.read().strip()
+        intf = None
+        for line in data.split('\n'):
+            if line.find('[') == -1  and line[0] not in (' ', '\t'):
+                intf = line.strip()
+                result[intf] = {'inbytespass': 0, 'outbytespass': 0, 'inpktspass': 0, 'outpktspass': 0,
+                                'inbytesblock': 0, 'outbytesblock': 0, 'inpktsblock': 0, 'outpktsblock': 0,
+                                'inpkts':0, 'inbytes': 0, 'outpkts': 0, 'outbytes': 0}
+            if intf is  not None and line.find('[') > -1:
+                packets = int(line.split(' Packets:')[-1].strip().split()[0])
+                bytes = int(line.split(' Bytes:')[-1].strip().split()[0])
+                if line.find('In4/Pass:') > -1 or line.find('In6/Pass:') > -1:
+                    result[intf]['inpktspass'] += packets
+                    result[intf]['inbytespass'] += bytes
+                    result[intf]['inpkts'] += packets
+                    result[intf]['inbytes'] += bytes
+                elif line.find('In4/Block:') > -1 or line.find('In6/Block:') > -1:
+                    result[intf]['inbytesblock'] += packets
+                    result[intf]['inpktsblock'] += bytes
+                    result[intf]['inpkts'] += packets
+                    result[intf]['inbytes'] += bytes
+                elif line.find('Out4/Pass:') > -1 or line.find('Out6/Pass:') > -1:
+                    result[intf]['outpktspass'] += packets
+                    result[intf]['outbytespass'] += bytes
+                    result[intf]['outpkts'] += packets
+                    result[intf]['outbytes'] += bytes
+                elif line.find('Out4/Block:') > -1 or line.find('Out6/Block:') > -1:
+                    result[intf]['outpktsblock'] += packets
+                    result[intf]['outbytesblock'] += bytes
+                    result[intf]['outpkts'] += packets
+                    result[intf]['outbytes'] += bytes
+
+    # handle command line argument (type selection)
+    if len(sys.argv) > 1 and sys.argv[1] == 'json':
+        print(ujson.dumps(result))
+    else:
+        # output plain
+        print ('------------------------- COUNTERS -------------------------')
+        for intf in result:
+            print ('[%s] %s' % (intf, unicode(result[intf])))

src/opnsense/scripts/system/list_interrupts.py

+#!/usr/local/bin/python2.7
+
+"""
+    Copyright (c) 2017 Ad Schellevis
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+    --------------------------------------------------------------------------------------
+    list device interrupts stats
+"""
+import tempfile
+import subprocess
+import os
+import sys
+import ujson
+
+if __name__ == '__main__':
+    result = dict()
+    with tempfile.NamedTemporaryFile() as output_stream:
+        subprocess.call(['/usr/bin/vmstat', '-i'], stdout=output_stream, stderr=open(os.devnull, 'wb'))
+        output_stream.seek(0)
+        data = output_stream.read().strip()
+
+        intf = None
+        interrupts = dict()
+        interrupt_map = dict()
+        for line in data.split('\n'):
+            if line.find(':') > -1:
+                intrp = line.split(':')[0].strip()
+                parts = ':'.join(line.split(':')[1:]).split()
+                interrupts[intrp] = {'devices': [], 'total': None, 'rate': None}
+                for part in parts:
+                    if not part.isdigit():
+                        interrupts[intrp]['devices'].append(part)
+                        devnm = part.split(':')[0]
+                        if devnm not in interrupt_map:
+                            interrupt_map[devnm] = list()
+                        interrupt_map[devnm].append(intrp)
+                    elif interrupts[intrp]['total'] is None:
+                        interrupts[intrp]['total'] = int(part)
+                    else:
+                        interrupts[intrp]['rate'] = int(part)
+        result['interrupts'] = interrupts # interrupts as reported by vmstat
+        result['interrupt_map'] = interrupt_map # link device to interrupt
+
+    # handle command line argument (type selection)
+    if len(sys.argv) > 1 and sys.argv[1] == 'json':
+        print(ujson.dumps(result))
+    else:
+        # output plain
+        if 'interrupts' in result:
+            for intr in result['interrupts']:
+                print ('%-10s [%-20s] %-10d %d' % (intr,
+                                          ','.join(result['interrupts'][intr]['devices']),
+                                          result['interrupts'][intr]['total'],
+                                          result['interrupts'][intr]['rate']
+                                          ))

src/opnsense/service/conf/actions.d/actions_filter.conf

@@ -47,6 +47,12 @@ parameters: %s
 type:script_output
 message:request pfsync info
 
+[list.counters]
+command:/usr/local/opnsense/scripts/filter/list_counters.py
+parameters: %s
+type:script_output
+message:request pfctl byte/packet counters
+
 [delete.table]
 command:/usr/local/opnsense/scripts/filter/delete_table.py
 parameters: %s %s

src/opnsense/service/conf/actions.d/actions_system.conf

@@ -9,3 +9,9 @@ command:/usr/local/opnsense/scripts/system/ssl_ciphers.py
 parameters:
 type:script_output
 message:list ssl ciphers
+
+[list.interrupts]
+command:/usr/local/opnsense/scripts/system/list_interrupts.py
+parameters: %s
+type:script_output
+message:request vmstat interrupt counters