Commit a1805972 authored by Jan Koester's avatar Jan Koester
Browse files

bugfix szabbix

parent 32334cdc
Loading
Loading
Loading
Loading
+1 −1
Changes for tools/mkzabbix.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ def discovery(prefix):
            'uuid': uid('trigger', prefix, word),
            'expression': 'find(/%s/%s,,"regexp","^%s")=1' % (TEMPLATE, text_key, word),
            # the name with the value it fired on: "RAID md0: critical: 1 member(s) missing"
            'name': '%s: {ITEM.VALUE1}' % label,
            'name': '%s: %s' % (label, word),
            'event_name': '%s: {ITEM.VALUE1}' % label,
            'priority': sev,
            'description': 'snmpdd reports the status %s; the text after it says why.' % word,
+12 −12
Changes for zabbix/snmpdd_zabbix_template.yaml: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: 'd6686b3bff9446de9fdb83de8d99ed11'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.raid.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'RAID {#NAME}: {ITEM.VALUE1}'
              name: 'RAID {#NAME}: critical'
              event_name: 'RAID {#NAME}: {ITEM.VALUE1}'
              priority: 'HIGH'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -1426,7 +1426,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: 'f8cd6442f3434848922842c32b9eafe2'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.raid.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'RAID {#NAME}: {ITEM.VALUE1}'
              name: 'RAID {#NAME}: warning'
              event_name: 'RAID {#NAME}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'
@@ -2008,7 +2008,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: 'c98e3ee845b54b98adcda50f4166f5c8'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.vg.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'VG {#NAME}: {ITEM.VALUE1}'
              name: 'VG {#NAME}: critical'
              event_name: 'VG {#NAME}: {ITEM.VALUE1}'
              priority: 'HIGH'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -2017,7 +2017,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: '80b4447fa42c4054831712b38dacb748'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.vg.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'VG {#NAME}: {ITEM.VALUE1}'
              name: 'VG {#NAME}: warning'
              event_name: 'VG {#NAME}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'
@@ -2882,7 +2882,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: '46cf39123ff441688b072bb6c80ca472'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.fs.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'FS {#NAME}: {ITEM.VALUE1}'
              name: 'FS {#NAME}: critical'
              event_name: 'FS {#NAME}: {ITEM.VALUE1}'
              priority: 'HIGH'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -2891,7 +2891,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: '19eb7798855947799d94dcf9a219d6bc'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.fs.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'FS {#NAME}: {ITEM.VALUE1}'
              name: 'FS {#NAME}: warning'
              event_name: 'FS {#NAME}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'
@@ -4315,7 +4315,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: '166f7985a4474968a8a2202ee90b35a5'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.disk.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'Disk {#NAME}: {ITEM.VALUE1}'
              name: 'Disk {#NAME}: critical'
              event_name: 'Disk {#NAME}: {ITEM.VALUE1}'
              priority: 'HIGH'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -4324,7 +4324,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: 'e6c70286c000417d96c91ca2925d5faa'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.disk.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'Disk {#NAME}: {ITEM.VALUE1}'
              name: 'Disk {#NAME}: warning'
              event_name: 'Disk {#NAME}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'
@@ -4812,7 +4812,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: '16c6ccc6c5224752b9a60384c54a7018'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.svc.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'Service {#NAME}: {ITEM.VALUE1}'
              name: 'Service {#NAME}: critical'
              event_name: 'Service {#NAME}: {ITEM.VALUE1}'
              priority: 'HIGH'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -4821,7 +4821,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: '28bdf668fb994f8da02fa9a212115af7'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.svc.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'Service {#NAME}: {ITEM.VALUE1}'
              name: 'Service {#NAME}: warning'
              event_name: 'Service {#NAME}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'
@@ -5494,7 +5494,7 @@ zabbix_export:
          trigger_prototypes:
            - uuid: '67d35dbd90ec4489ac738c80b7774719'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.attr.statustext["{#NAME}"],,"regexp","^critical")=1'
              name: 'Disk {#DISK} attribute {#ID} {#ATTR}: {ITEM.VALUE1}'
              name: 'Disk {#DISK} attribute {#ID} {#ATTR}: critical'
              event_name: 'Disk {#DISK} attribute {#ID} {#ATTR}: {ITEM.VALUE1}'
              priority: 'AVERAGE'
              description: 'snmpdd reports the status critical; the text after it says why.'
@@ -5503,7 +5503,7 @@ zabbix_export:
                  value: 'availability'
            - uuid: '1ae8b7a8d810411188b11d61936bfc9e'
              expression: 'find(/FenrirOS snmpdd by SNMP traps/snmpdd.attr.statustext["{#NAME}"],,"regexp","^warning")=1'
              name: 'Disk {#DISK} attribute {#ID} {#ATTR}: {ITEM.VALUE1}'
              name: 'Disk {#DISK} attribute {#ID} {#ATTR}: warning'
              event_name: 'Disk {#DISK} attribute {#ID} {#ATTR}: {ITEM.VALUE1}'
              priority: 'WARNING'
              description: 'snmpdd reports the status warning; the text after it says why.'