Merge ~aluria/charm-nrpe:lp1783741 into ~nrpe-charmers/charm-nrpe:master

[Alvaro Uria]

Skip speed error when operstate is down

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

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

[Xav Paice (xavpaice)]

LGTM

review: Approve

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

Change successfully merged at revision 3988f0c9a517cb8d3e5a89a1bf1f8c3d1af137ca

diff --git a/files/plugins/check_netlinks.py b/files/plugins/check_netlinks.py
index 59ae6d2..216f448 100755
--- a/files/plugins/check_netlinks.py
+++ b/files/plugins/check_netlinks.py
@@ -40,6 +40,15 @@ def check_iface(iface, skiperror, crit_thr):
                 raise WarnError('WARNING: {} iface does not '
                                 'exist'.format(iface))
             return
+        except OSError as e:
+            if metric_key == 'speed' and 'Invalid argument' in str(e) \
+              and crit_thr['operstate'] == 'down':
+                FILTER = [f for f in FILTER if f != 'speed']
+                continue
+            else:
+                raise CriticalError('CRITICAL: {} ({} returns '
+                                    'invalid argument)'.format(iface,
+                                                               metric_key))
 
         if metric_key == 'operstate' and metric_value != 'up':
             if metric_value != crit_thr['operstate']: