feat(infomaniak-swiss-backup-products): add --ignore-customer, --ignore-tag parameters

Author: markuslf

CHANGELOG.md

@@ -33,6 +33,7 @@ Monitoring Plugins:
 * by-ssh: add alerting on single numeric values
 * by-winrm: executes commands on remote Windows hosts by WinRM, supporting JEA (including the JEA endpoint via `--winrm-configuration-name`)
 * infomaniak-swiss-backup-devices: add `--ignore-customer`, `--ignore-name`, `--ignore-tag`, `--ignore-user` parameters to skip devices by regex
+* infomaniak-swiss-backup-products: add `--ignore-customer`, `--ignore-tag` parameters to skip products by regex
 * nextcloud-enterprise: provides information about an installed Nextcloud Enterprise subscription
 * statuspal: also detect 'emergency-maintenance' state
 * valkey-status: support user and password credentials [PR #954](https://github.com/Linuxfabrik/monitoring-plugins/pull/954), thanks to [Claudio Kuenzler](https://github.com/Napsty)
@@ -64,6 +65,7 @@ Monitoring Plugins:
 
 * all plugins: ignore unknown arguments instead of generating an error (this helps with updating Icinga and Nagios service definitions considerably)
 * by-ssh, by-winrm, disk-usage, example, file-ownership, fs-ro, infomaniak-events, journald-query, logfile, matomo-reporting, mysql-logfile, php-status, pip-updates, systemd-unit: fix `append` parameters so that user-specified values replace defaults instead of being appended to them ([#540](https://github.com/Linuxfabrik/monitoring-plugins/issues/540))
+* disk-io: also monitor normalized iowait on Linux (100% = one fully I/O-saturated core)
 * file-count: stopping when number of files actually exceed thresholds, therefore dramatically faster for large directories
 * file-ownership: `--filename` now merges with the default file list instead of replacing it; use `--no-default-files` to check only user-supplied files
 * file-ownership: extend default file list with CIS benchmark-relevant files (login.defs, sudoers, sysctl, systemd, PAM, etc.)

check-plugins/infomaniak-swiss-backup-products/README.md

@@ -31,7 +31,9 @@ Links:
 
 ```text
 usage: infomaniak-swiss-backup-products [-h] [-V] --account-id ACCOUNT_ID
-                                        [--always-ok] [-c CRIT] [--insecure]
+                                        [--always-ok] [-c CRIT]
+                                        [--ignore-customer IGNORE_CUSTOMER]
+                                        [--ignore-tag IGNORE_TAG] [--insecure]
                                         [--no-proxy] [--severity {warn,crit}]
                                         [--timeout TIMEOUT] --token TOKEN
                                         [--test TEST] [-w WARN]
@@ -46,6 +48,14 @@ options:
   --always-ok           Always returns OK.
   -c, --critical CRIT   Set the critical for the expiration date in days.
                         Default: 3
+  --ignore-customer IGNORE_CUSTOMER
+                        Any product whose customer name matches this python
+                        regex will be ignored (repeating). Example: '(?i)test'
+                        for a case-insensitive search for "test".
+  --ignore-tag IGNORE_TAG
+                        Any product whose tag matches this python regex will
+                        be ignored (repeating). Example: '(?i)deprecated' for
+                        a case-insensitive search for "deprecated".
   --insecure            This option explicitly allows to perform "insecure"
                         SSL connections. Default: False
   --no-proxy            Do not use a proxy. Default: False

check-plugins/infomaniak-swiss-backup-products/icingaweb2-module-director/infomaniak-swiss-backup-products.json

@@ -11,6 +11,14 @@
                 "--critical": {
                     "value": "$infomaniak_swiss_backup_products_critical$"
                 },
+                "--ignore-customer": {
+                    "value": "$infomaniak_swiss_backup_products_ignore_customer$",
+                    "repeat_key": true
+                },
+                "--ignore-tag": {
+                    "value": "$infomaniak_swiss_backup_products_ignore_tag$",
+                    "repeat_key": true
+                },
                 "--insecure": {
                     "set_if": "$infomaniak_swiss_backup_products_insecure$"
                 },
@@ -70,13 +78,23 @@
                 },
                 {
                     "datafield_id": 8,
-                    "is_required": "y",
+                    "is_required": "n",
                     "var_filter": null
                 },
                 {
                     "datafield_id": 9,
                     "is_required": "n",
                     "var_filter": null
+                },
+                {
+                    "datafield_id": 10,
+                    "is_required": "y",
+                    "var_filter": null
+                },
+                {
+                    "datafield_id": 11,
+                    "is_required": "n",
+                    "var_filter": null
                 }
             ],
             "imports": [],
@@ -133,6 +151,8 @@
                 "criticality": "C",
                 "infomaniak_swiss_backup_products_always_ok": false,
                 "infomaniak_swiss_backup_products_critical": 3,
+                "infomaniak_swiss_backup_products_ignore_customer": [],
+                "infomaniak_swiss_backup_products_ignore_tag": [],
                 "infomaniak_swiss_backup_products_insecure": false,
                 "infomaniak_swiss_backup_products_no_proxy": false,
                 "infomaniak_swiss_backup_products_severity": "warn",
@@ -198,6 +218,28 @@
             "uuid": "76a05455-b038-42f7-bce5-e5481d2bf5de"
         },
         "4": {
+            "varname": "infomaniak_swiss_backup_products_ignore_customer",
+            "caption": "Infomaniak Swiss Backup Products: Ignore Customer",
+            "description": "Any product whose customer name matches this python regex will be ignored (repeating). Example: '(?i)test' for a case-insensitive search for \"test\".",
+            "datatype": "Icinga\\Module\\Director\\DataType\\DataTypeArray",
+            "format": null,
+            "settings": {
+                "visibility": "visible"
+            },
+            "uuid": "743a94ab-9bba-4879-8c3e-cec64eae5900"
+        },
+        "5": {
+            "varname": "infomaniak_swiss_backup_products_ignore_tag",
+            "caption": "Infomaniak Swiss Backup Products: Ignore Tag",
+            "description": "Any product whose tag matches this python regex will be ignored (repeating). Example: '(?i)deprecated' for a case-insensitive search for \"deprecated\".",
+            "datatype": "Icinga\\Module\\Director\\DataType\\DataTypeArray",
+            "format": null,
+            "settings": {
+                "visibility": "visible"
+            },
+            "uuid": "1e326a1d-8fce-435b-bcb2-d4620ba9da60"
+        },
+        "6": {
             "varname": "infomaniak_swiss_backup_products_insecure",
             "caption": "Infomaniak Swiss Backup Products: Insecure?",
             "description": "This option explicitly allows to perform \"insecure\" SSL connections.",
@@ -206,7 +248,7 @@
             "settings": {},
             "uuid": "48300e2a-b48e-4bd0-8798-bff2644d501d"
         },
-        "5": {
+        "7": {
             "varname": "infomaniak_swiss_backup_products_no_proxy",
             "caption": "Infomaniak Swiss Backup Products: No Proxy?",
             "description": "Do not use a proxy.",
@@ -215,7 +257,7 @@
             "settings": {},
             "uuid": "c71a3e44-fa1d-4cce-a766-50860ed9d5a1"
         },
-        "6": {
+        "8": {
             "varname": "infomaniak_swiss_backup_products_severity",
             "caption": "Infomaniak Swiss Backup Products: Severity",
             "description": "Severity for alerting other values.",
@@ -228,7 +270,7 @@
             },
             "uuid": "3b29820b-fb09-4755-9f87-6b15484c1337"
         },
-        "7": {
+        "9": {
             "varname": "infomaniak_swiss_backup_products_timeout",
             "caption": "Infomaniak Swiss Backup Products: Timeout",
             "description": "Network timeout in seconds.",
@@ -239,7 +281,7 @@
             },
             "uuid": "68ca2a79-ca12-4b2c-a326-ba22479a4a50"
         },
-        "8": {
+        "10": {
             "varname": "infomaniak_swiss_backup_products_token",
             "caption": "Infomaniak Swiss Backup Products: Token",
             "description": "Infomaniak API token",
@@ -250,7 +292,7 @@
             },
             "uuid": "012e5339-a577-468a-9182-423b1005cee1"
         },
-        "9": {
+        "11": {
             "varname": "infomaniak_swiss_backup_products_warning",
             "caption": "Infomaniak Swiss Backup Products: Warning",
             "description": "Set the warning for the expiration date in days.",

check-plugins/infomaniak-swiss-backup-products/infomaniak-swiss-backup-products

@@ -13,6 +13,7 @@
 
 import argparse  # pylint: disable=C0413
 import json  # pylint: disable=C0413
+import re  # pylint: disable=C0413
 import sys  # pylint: disable=C0413
 
 import lib.args  # pylint: disable=C0413
@@ -26,7 +27,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2025100601'
+__version__ = '2026040701'
 
 DESCRIPTION = """Checks your Infomaniak Swiss Backup product details via the Infomaniak API."""
 
@@ -73,6 +74,26 @@ def parse_args():
         default=DEFAULT_CRIT,
     )
 
+    parser.add_argument(
+        '--ignore-customer',
+        help='Any product whose customer name matches this python regex will be ignored '
+             '(repeating). '
+             'Example: \'(?i)test\' for a case-insensitive search for "test".',
+        action='append',
+        default=None,
+        dest='IGNORE_CUSTOMER',
+    )
+
+    parser.add_argument(
+        '--ignore-tag',
+        help='Any product whose tag matches this python regex will be ignored '
+             '(repeating). '
+             'Example: \'(?i)deprecated\' for a case-insensitive search for "deprecated".',
+        action='append',
+        default=None,
+        dest='IGNORE_TAG',
+    )
+
     parser.add_argument(
         '--insecure',
         help='This option explicitly allows to perform "insecure" SSL connections. '
@@ -146,6 +167,12 @@ def main():
     except SystemExit:
         sys.exit(STATE_UNKNOWN)
 
+    # set default values for append parameters that were not specified
+    if args.IGNORE_CUSTOMER is None:
+        args.IGNORE_CUSTOMER = []
+    if args.IGNORE_TAG is None:
+        args.IGNORE_TAG = []
+
     # fetch data
     if args.TEST is None:
         result = lib.base.coe(lib.infomaniak.get_swiss_backup_products(
@@ -165,9 +192,20 @@ def main():
     state = STATE_OK
     perfdata = ''
     table_data = []
+    compiled_ignore_customer = [re.compile(item) for item in args.IGNORE_CUSTOMER]
+    compiled_ignore_tag = [re.compile(item) for item in args.IGNORE_TAG]
 
     # analyze data
     for product in result.get('data', {}):
+        # ignore products matching any --ignore-* parameter
+        if any(item.search(product.get('customer_name', '')) for item in compiled_ignore_customer):
+            continue
+        if any(
+            item.search(tag['name'])
+            for item in compiled_ignore_tag
+            for tag in product.get('tags', [])
+        ):
+            continue
 
         expired_at = product.get('expired_at') - lib.time.now(as_type='epoch')
         expired_at_state = lib.base.get_state(expired_at / 24 / 60 / 60, args.WARN, args.CRIT, _operator='le')

check-plugins/infomaniak-swiss-backup-products/unit-test/run

@@ -61,6 +61,22 @@ class TestCheck(unittest.TestCase):
         self.assertEqual(stderr, '')
         self.assertEqual(retc, STATE_CRIT)
 
+    def test_if_check_runs_EXAMPLE02_ignore_customer(self):
+        stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --token=TOKEN --account-id=ACCOUNT-ID --ignore-customer=\'BK-200999-1$\' --test=stdout/EXAMPLE02,,0'))
+        self.assertIn('Everything is ok.', stdout)
+        self.assertNotIn('34567', stdout)
+        self.assertIn('26056', stdout)
+        self.assertEqual(stderr, '')
+        self.assertEqual(retc, STATE_OK)
+
+    def test_if_check_runs_EXAMPLE02_ignore_tag(self):
+        stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --token=TOKEN --account-id=ACCOUNT-ID --ignore-tag=\'^tag01$\' --test=stdout/EXAMPLE02,,0'))
+        self.assertIn('Everything is ok.', stdout)
+        self.assertNotIn('34567', stdout)
+        self.assertIn('26056', stdout)
+        self.assertEqual(stderr, '')
+        self.assertEqual(retc, STATE_OK)
+
 
 if __name__ == '__main__':
     unittest.main()