From e06cef7b2d2904e73442b7c7e67b5a9773919a86 Mon Sep 17 00:00:00 2001
From: anima <p.schreiner@4nima.de>
Date: Mon, 10 Feb 2025 00:29:56 +0100
Subject: [PATCH] add some disk checks

---
 checks/check_snmp_synology.py | 89 +++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/checks/check_snmp_synology.py b/checks/check_snmp_synology.py
index 8473582..f3be56f 100755
--- a/checks/check_snmp_synology.py
+++ b/checks/check_snmp_synology.py
@@ -8,7 +8,7 @@
     - https://easysnmp.readthedocs.io/en/latest/session_api.html
 """
 
-__version__     = '0.10.1'
+__version__     = '0.11.0'
 __author__      = 'anima'
 
 # imports
@@ -390,6 +390,66 @@ class SNMPSynologyMemoryResource(nagiosplugin.Resource):
 #
 # Synology [DSM & DSM UC] Checks disks
 #
+class SNMPSynologyDiskRetryResource(nagiosplugin.Resource, SNMPSynologyDisk):
+    def __init__(self, session) -> None:
+        self.session = session
+
+    def probe(self) -> list:
+        """check staus and health of all disks
+        
+        Returns:
+            Generator[nagisplugin.Metric]: multiple metric elements (yield)
+        """
+        disks = self.get_disks()
+        for disk in disks:
+            yield nagiosplugin.Metric(name=disk['id'], value=int(disk['retry']), uom=' retrys', context='disk_retry_scalar_context')
+
+
+class SNMPSynologyDiskIdentResource(nagiosplugin.Resource, SNMPSynologyDisk):
+    def __init__(self, session) -> None:
+        self.session = session
+
+    def probe(self) -> list:
+        """check staus and health of all disks
+        
+        Returns:
+            Generator[nagisplugin.Metric]: multiple metric elements (yield)
+        """
+        disks = self.get_disks()
+        for disk in disks:
+            yield nagiosplugin.Metric(name=disk['id'], value=int(disk['identFail']), uom=' fails', context='disk_ident_scalar_context')
+
+
+class SNMPSynologyDiskLifeResource(nagiosplugin.Resource, SNMPSynologyDisk):
+    def __init__(self, session) -> None:
+        self.session = session
+
+    def probe(self) -> list:
+        """check staus and health of all disks
+        
+        Returns:
+            Generator[nagisplugin.Metric]: multiple metric elements (yield)
+        """
+        disks = self.get_disks()
+        for disk in disks:
+            yield nagiosplugin.Metric(name=disk['id'], value=int(disk['remainLife']), uom=' remaining life', context='disk_life_scalar_context')
+
+
+class SNMPSynologyDiskSectorsResource(nagiosplugin.Resource, SNMPSynologyDisk):
+    def __init__(self, session) -> None:
+        self.session = session
+
+    def probe(self) -> list:
+        """check staus and health of all disks
+        
+        Returns:
+            Generator[nagisplugin.Metric]: multiple metric elements (yield)
+        """
+        disks = self.get_disks()
+        for disk in disks:
+            yield nagiosplugin.Metric(name=disk['id'], value=int(disk['badSectors']), uom=' bad sectors', context='disk_sectors_scalar_context')
+
+
 class SNMPSynologyDiskHealthResource(nagiosplugin.Resource, SNMPSynologyDisk):
     def __init__(self, session) -> None:
         self.session = session
@@ -429,7 +489,7 @@ class SNMPSynologyDiskStatusResult(nagiosplugin.Result):
         elif self.metric.value['status'] == '4': status = 'SystemPartitionFailed'
         elif self.metric.value['status'] == '5': status = 'Crashed'
         else: status = 'unknown'
-        return f'{self.metric.name} (model: {self.metric.value['model']}) (role: {self.metric.value["role"]}) is in status {status}!'
+        return f'{self.metric.name} (model: {self.metric.value["model"]} - {self.metric.value["type"]}) (role: {self.metric.value["role"]}) is in status {status}!'
 
 
 class SNMPSynologyDiskHealthContext(nagiosplugin.Context):
@@ -484,6 +544,10 @@ def parse_args() -> argparse.Namespace:
             'cpu',
             'memory',
             'disk',
+            'disk_retry',
+            'disk_ident',
+            'disk_life',
+            'disk_sectors',
         ],
         help='check mode to run')
 
@@ -570,7 +634,26 @@ def main():
             SNMPSynologyDiskStatusContext(name='disk_status_context'),
             SNMPSynologySummary())
             check.name = "Disk Health"
-            pass
+        case 'disk_retry':
+            check = nagiosplugin.Check(SNMPSynologyDiskRetryResource(session=session),
+            nagiosplugin.ScalarContext(name='disk_retry_scalar_context', warning=args.warning, critical=args.critical),
+            nagiosplugin.Summary())
+            check.name = "Disk Connection Retrys"
+        case 'disk_life':
+            check = nagiosplugin.Check(SNMPSynologyDiskLifeResource(session=session),
+            nagiosplugin.ScalarContext(name='disk_life_scalar_context', warning=args.warning, critical=args.critical),
+            nagiosplugin.Summary())
+            check.name = "Disk Remaining Life"
+        case 'disk_ident':
+            check = nagiosplugin.Check(SNMPSynologyDiskIdentResource(session=session),
+            nagiosplugin.ScalarContext(name='disk_ident_scalar_context', warning=args.warning, critical=args.critical),
+            nagiosplugin.Summary())
+            check.name = "Disk IdentFail"
+        case 'disk_sectors':
+            check = nagiosplugin.Check(SNMPSynologyDiskSectorsResource(session=session),
+            nagiosplugin.ScalarContext(name='disk_sectors_scalar_context', warning=args.warning, critical=args.critical),
+            nagiosplugin.Summary())
+            check.name = "Disk BadSectors"
         case _:
             raise nagiosplugin.CheckError(f'Unknown check mode: {args.check_mode}')