From 44c65a6e38c2ad7140b1ca6b2be29f98b7795f63 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Fri, 3 Apr 2020 23:13:16 +0200
Subject: [PATCH] update project

---
 checks/iferrordetails                 |  14 ++----
 iferrordetails.mkp                    | Bin 3444 -> 3448 bytes
 packages/iferrordetails               |   2 +-
 web/plugins/metrics/iferrordetails.py |  68 +++++++++++++-------------
 4 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/checks/iferrordetails b/checks/iferrordetails
index 832242d..ff449e0 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
GIT binary patch
literal 3448
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

literal 3444
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

diff --git a/packages/iferrordetails b/packages/iferrordetails
index b6373da..d7ffd4b 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 e4fb7cd..2b8bab8 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'),
     ],
 })
-- 
GitLab