Merge pull request #23 from votdev/issue_22

SUSE · May 14, 2020 · 08cd07e · 08cd07e
2 parents 838b50a + 47ad8c0
commit 08cd07e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+v1.4
+  * Issue #22: Prevent Python type errors when sending an SNMP trap.
+
 v1.3
 
   * Add 'trap-default-severity' configuration option.

diff --git a/prometheus-webhook-snmp b/prometheus-webhook-snmp
@@ -8,7 +8,7 @@ import click
 from prometheus_webhook_snmp import utils
 
 
-__version__ = "1.3"
+__version__ = "1.4"
 
 
 pass_context = click.make_pass_decorator(utils.Context, ensure=True)

diff --git a/prometheus-webhook-snmp.spec b/prometheus-webhook-snmp.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           prometheus-webhook-snmp
-Version:        1.3
+Version:        1.4
 Release:        0
 Summary:        Prometheus Alertmanager receiver for SNMP traps
 License:        GPL-3.0

diff --git a/prometheus_webhook_snmp/utils.py b/prometheus_webhook_snmp/utils.py
@@ -135,17 +135,17 @@ def send_snmp_trap(config, trap_data):
     var_binds = hlapi.NotificationType(hlapi.ObjectIdentity(trap_data['oid']))
     var_binds.addVarBinds(
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['alertname']),
-                         hlapi.OctetString(trap_data['alertname'])),
+                         hlapi.OctetString(trap_data['alertname'] or '')),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['status']),
                          hlapi.OctetString(trap_data['status'])),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['severity']),
                          hlapi.OctetString(trap_data['severity'])),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['instance']),
-                         hlapi.OctetString(trap_data['instance'])),
+                         hlapi.OctetString(trap_data['instance'] or '')),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['job']),
-                         hlapi.OctetString(trap_data['job'])),
+                         hlapi.OctetString(trap_data['job'] or '')),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['description']),
-                         hlapi.OctetString(trap_data['description'])),
+                         hlapi.OctetString(trap_data['description'] or '')),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['labels']),
                          hlapi.OctetString(json.dumps(trap_data['labels']))),
         hlapi.ObjectType(hlapi.ObjectIdentity(oids['timestamp']),

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -3,7 +3,8 @@
 
 from pyfakefs import fake_filesystem
 
-from prometheus_webhook_snmp.utils import parse_notification, Config
+from prometheus_webhook_snmp.utils import parse_notification, Config, \
+    send_snmp_trap
 
 NOTIFICATION_FIRING = {
     'receiver': 'test-01',
@@ -116,6 +117,22 @@ def test_parse_notification_no_oid(self):
         self.assertEqual(trap_data['timestamp'], 1554110387)
         self.assertIsInstance(trap_data['rawdata'], dict)
 
+    def test_send_snmp_trap(self):
+        config = Config()
+        self.assertIsInstance(config['trap_default_severity'], str)
+        send_snmp_trap(config, {
+            'oid': '1.3.6.1.4.1.50495.15.1.2.1',
+            'alertname': None,
+            'status': 'resolved',
+            'severity': config['trap_default_severity'],
+            'instance': None,
+            'job': None,
+            'description': None,
+            'labels': {},
+            'timestamp': 1554110387,
+            'rawdata': {}
+        })
+
 
 class ConfigTestCase(unittest.TestCase):
     fs = fake_filesystem.FakeFilesystem()