diff --git a/checks/iferrordetails b/checks/iferrordetails index 832242de6a398e0fc2b67f4266cc1db04e3646a5..ff449e068c2de585af12112e31252184826c7562 100644 --- a/checks/iferrordetails +++ b/checks/iferrordetails @@ -22,12 +22,10 @@ # - factory_settings['iferrordetails_defaults'] = { 'notFound': 3, } - ########################################################################### # # DATA Parser function @@ -113,6 +111,9 @@ def parse_iferrordetails(info): dot3StatsSymbolErrors, dot3StatsDuplexStatus, dot3StatsRateControlAbility, \ dot3StatsRateControlStatus = entry + ifName = 'unknown' + ifOperStatus = '4' + for interface in interfaces: if ifIndex == interface[0]: ifIndex, ifName, ifOperStatus = interface @@ -122,8 +123,6 @@ def parse_iferrordetails(info): else: dot3StatsDuplexStatus = get_dot3StatsDuplexStatus(dot3StatsDuplexStatus) - - errorsDetails = { 'dot3StatsAlignmentErrors': int(dot3StatsAlignmentErrors), 'dot3StatsFCSErrors': int(dot3StatsFCSErrors), @@ -148,7 +147,6 @@ def parse_iferrordetails(info): return parsed - ########################################################################### # # INVENTORY function @@ -160,7 +158,6 @@ def inventory_iferrordetails(parsed): for entry in parsed.keys(): yield entry, {} - ########################################################################### # # CHECK function @@ -201,11 +198,10 @@ def check_iferrordetails(item, params, parsed): ('dot3statssymbolerrors', errorDetails['dot3StatsSymbolErrors']), ] - yield state, infotext + longoutput, perfdata + return state, infotext + longoutput, perfdata else: - yield params['notFound'], 'item missing' - + return params['notFound'], 'item missing' ########################################################################### # diff --git a/iferrordetails.mkp b/iferrordetails.mkp index 3145b01e1f0451f341a8e2b939f90b1111768667..7afd0cfccbabfed2847696b5d832f07ed1ba1dd8 100644 Binary files a/iferrordetails.mkp and b/iferrordetails.mkp differ diff --git a/packages/iferrordetails b/packages/iferrordetails index b6373dab0e50603642f60ee62b7e1793e834278e..d7ffd4bbd2cc68324527e75986578b85ec46d6ac 100644 --- a/packages/iferrordetails +++ b/packages/iferrordetails @@ -8,4 +8,4 @@ 'title': u'CInterface error details', 'version': '20200403.v0.0.1', 'version.min_required': '1.2.8b8', - 'version.packaged': '1.6.0p8'} \ No newline at end of file + 'version.packaged': '1.4.0p38'} \ No newline at end of file diff --git a/web/plugins/metrics/iferrordetails.py b/web/plugins/metrics/iferrordetails.py index e4fb7cdb2433362522fccdd4e22aabf4e3075419..2b8bab85daf461e2fe084c8c25e221fba4454940 100644 --- a/web/plugins/metrics/iferrordetails.py +++ b/web/plugins/metrics/iferrordetails.py @@ -54,18 +54,8 @@ metric_info['iferrordetails_dot3statsfcserrors'] = { 'unit' : 'count', 'color' : '12/a', } -metric_info['iferrordetails_dot3statssinglecollisionframes'] = { - 'title' : _('Single collision frames'), - 'unit' : 'count', - 'color' : '13/a', -} -metric_info['iferrordetails_dot3statsmultiplecollisionframes'] = { - 'title' : _('Multiple collision frames'), - 'unit' : 'count', - 'color' : '14/a', -} metric_info['iferrordetails_dot3statssqetesterrors'] = { - 'title' : _('sqe test errors'), + 'title' : _('SQE test errors'), 'unit' : 'count', 'color' : '15/a', } @@ -74,23 +64,18 @@ metric_info['iferrordetails_dot3statsdeferredtransmissions'] = { 'unit' : 'count', 'color' : '16/a', } -metric_info['iferrordetails_dot3statslatecollisions'] = { - 'title' : _('Late collisions'), - 'unit' : 'count', - 'color' : '21/a', -} -metric_info['iferrordetails_dot3statsexcessivecollisions'] = { - 'title' : _('Excessive collisions'), - 'unit' : 'count', - 'color' : '22/a', -} metric_info['iferrordetails_dot3statsinternalmactransmiterr'] = { - 'title' : _('internal MAC transmit errors'), + 'title' : _('intern. MAC transmit errors'), 'unit' : 'count', 'color' : '23/a', } +metric_info['iferrordetails_dot3statsinternalmacreceiveerrors'] = { + 'title': _('intern. MAC receive errors'), + 'unit': 'count', + 'color': '26/a', +} metric_info['iferrordetails_dot3statscarriersenseerrors'] = { - 'title' : _('Sarrier sense errors'), + 'title' : _('Carrier sense errors'), 'unit' : 'count', 'color' : '24/a', } @@ -99,17 +84,32 @@ metric_info['iferrordetails_dot3statsframetoolongs'] = { 'unit' : 'count', 'color' : '25/a', } -metric_info['iferrordetails_dot3statsinternalmacreceiveerrors'] = { - 'title' : _('Internal MAC receive errors'), - 'unit' : 'count', - 'color' : '26/a', -} + metric_info['iferrordetails_dot3statssymbolerrors'] = { 'title' : _('Symbol errors'), 'unit' : 'count', 'color' : '31/a', } - +metric_info['iferrordetails_dot3statssinglecollisionframes'] = { + 'title' : _('Single collisions'), + 'unit' : 'count', + 'color' : '13/a', +} +metric_info['iferrordetails_dot3statsmultiplecollisionframes'] = { + 'title' : _('Multiple collisions'), + 'unit' : 'count', + 'color' : '23/a', +} +metric_info['iferrordetails_dot3statslatecollisions'] = { + 'title': _('Late collisions'), + 'unit': 'count', + 'color': '33/a', +} +metric_info['iferrordetails_dot3statsexcessivecollisions'] = { + 'title': _('Excessive collisions'), + 'unit': 'count', + 'color': '43/a', +} ###################################################################################################################### # @@ -121,13 +121,13 @@ graph_info.append({ 'title': _('Interface error details'), 'metrics': [ ('iferrordetails_dot3statsalignmenterrors', 'line'), - ('iferrordetails_dot3statsfcserrors', 'line'), - ('iferrordetails_dot3statssqetesterrors', 'line'), - ('iferrordetails_dot3statsdeferredtransmissions', 'line'), - ('iferrordetails_dot3statsinternalmactransmiterr', 'line'), - ('iferrordetails_dot3statsinternalmacreceiveerrors', 'line'), ('iferrordetails_dot3statscarriersenseerrors', 'line'), + ('iferrordetails_dot3statsdeferredtransmissions', 'line'), + ('iferrordetails_dot3statsfcserrors', 'line'), ('iferrordetails_dot3statsframetoolongs', 'line'), + ('iferrordetails_dot3statsinternalmacreceiveerrors', 'line'), + ('iferrordetails_dot3statsinternalmactransmiterr', 'line'), + ('iferrordetails_dot3statssqetesterrors', 'line'), ('iferrordetails_dot3statssymbolerrors', 'line'), ], })