Fix: Template adjustments

partitioning/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.1] - 2025-12-16
+### Added
+- **CLI**: Added `--verbose` / `-v` flag to switch between INFO (default) and DEBUG logging levels.
+- **CLI**: Added `-r` short flag for `--dry-run`.
+
 ## [0.4.0] - 2025-12-16
 ### Added
 - **Monitoring**: Added `--discovery` argument for Zabbix Low-Level Discovery (LLD) of partitioned tables.
@@ -19,10 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.3.0] - 2025-12-14
 ### Changed
 - **Refactor**: Complete rewrite of `zabbix_partitioning.py` using Class-based structure (`ZabbixPartitioner`).
-- **Configuration**: Switched to YAML configuration file (`zabbix_partitioning.conf`).
-- **Safety**: Added checks to prevent partitioning of tables incompatible with Zabbix 7.0 schema (e.g., `auditlog` without `clock` in PK).
-- **Docker**: Introduced Docker container support (`Dockerfile`, `entrypoint.py`).
+- **Configuration**: Extended comments in the configuration file (`zabbix_partitioning.conf`). The config file is self-explanatory now.
+- **Docker**: Introduced Docker container support (`Dockerfile`, `entrypoint.py`). The script can be run in a stateless manner using Docker.
 
 ### Added
-- **Optimization**: Added `initial_partitioning_start` option (`db_min` vs `retention`) to speed up initialization on large DBs.
-- **Reliability**: Use `pymysql` with robust connection handling and SSL support.
+- **Optimization**: Added `initial_partitioning_start` option (`db_min` vs `retention`) to speed up initialization on large DBs.

partitioning/script/zabbix_partitioning.conf

@@ -2,9 +2,9 @@
 database:
     type: mysql
     # host: Database server hostname or IP
-    host: localhost
+    # host: localhost
     # socket: Path to the MySQL unix socket (overrides host if set)
-    socket: /var/run/mysqlrouter/mysql_rw.sock
+    socket: /var/run/mysqld/mysqld.sock
     # port: Database port (default: 3306)
     # port: 3306
     # credentials

partitioning/script/zabbix_partitioning.py

@@ -21,7 +21,7 @@ from typing import Optional, Dict, List, Any, Union, Tuple
 from contextlib import contextmanager
 
 # Semantic Versioning
-VERSION = '0.4.0'
+VERSION = '0.4.1'
 
 # Constants
 PART_PERIOD_REGEX = r'([0-9]+)(h|d|m|y)'
@@ -543,9 +543,9 @@ class ZabbixPartitioner:
             if mode != 'init' and not self.dry_run:
                 pass 
 
-def setup_logging(config_log_type: str):
+def setup_logging(config_log_type: str, verbose: bool = False):
     logger = logging.getLogger('zabbix_partitioning')
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(logging.DEBUG if verbose else logging.INFO)
     
     formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
     
@@ -562,7 +562,8 @@ def parse_args():
     parser = argparse.ArgumentParser(description='Zabbix Partitioning Manager')
     parser.add_argument('-c', '--config', default='/etc/zabbix/zabbix_partitioning.conf', help='Config file path')
     parser.add_argument('-i', '--init', action='store_true', help='Initialize partitions')
-    parser.add_argument('--dry-run', action='store_true', help='Simulate queries')
+    parser.add_argument('-r', '--dry-run', action='store_true', help='Simulate queries')
+    parser.add_argument('-v', '--verbose', action='store_true', help='Enable debug logging')
     
     # Monitoring args
     parser.add_argument('--discovery', action='store_true', help='Output Zabbix LLD JSON')
@@ -604,12 +605,10 @@ def main():
         elif args.init: mode = 'init'
         
         # Setup logging
-        # If discovery or check, we mute info logs to stdout to keep output clean, 
-        # unless errors happen.
         if mode in ['discovery', 'check']:
              logging.basicConfig(level=logging.ERROR) # Only show critical errors
         else:
-             setup_logging(config.get('logging', 'console'))
+             setup_logging(config.get('logging', 'console'), verbose=args.verbose)
              
         logger = logging.getLogger('zabbix_partitioning')
         

partitioning/zabbix_mysql_partitioning_template.yaml

@@ -2,7 +2,7 @@ zabbix_export:
   version: '7.0'
   template_groups:
     - uuid: e29f7cbf75cf41cb81078cb4c10d584a
-      name: 'Templates/Databases'
+      name: Templates/Databases
   templates:
     - uuid: 69899eb3126b4c62b70351f305b69dd9
       template: 'Zabbix Partitioning Monitor'
@@ -16,39 +16,35 @@ zabbix_export:
            UserParameter=zabbix.partitioning.check[*], /usr/local/bin/zabbix_partitioning.py -c $1 --check-days $2
         
         Or use Docker wrapper scripts.
-        
       groups:
-        - name: 'Templates/Databases'
+        - name: Templates/Databases
       items:
         - uuid: bc753e750cc2485f917ba1f023c87d05
           name: 'Partitioning Last Run Status'
-          type: TRAP
-          key: partitioning.run.status
-          delay: 0
+          type: ZABBIX_ACTIVE
+          key: 'log[/var/log/syslog,zabbix_partitioning]'
           history: 7d
+          value_type: LOG
           trends: '0'
-          value_type: TEXT
-          description: 'Send "Success" or "Failed" via zabbix_sender or check log file'
           triggers:
             - uuid: 25497978dbb943e49dac8f3b9db91c29
-              expression: 'find(/Zabbix Partitioning Monitor/partitioning.run.status,,"like","Failed")=1'
-              name: 'Zabbix Partitioning Failed'
+              expression: 'find(/Zabbix Partitioning Monitor/log[/var/log/syslog,zabbix_partitioning],,"like","Failed")=1'
+              name: 'Partitioning Script Failed'
               priority: HIGH
               description: 'The partitioning script reported a failure.'
               tags:
                 - tag: services
                   value: database
-
       discovery_rules:
         - uuid: 097c96467035468a80ce5c519b0297bb
           name: 'Partitioning Discovery'
-          key: 'zabbix.partitioning.discovery[/etc/zabbix/zabbix_partitioning.conf]'
-          delay: 1h
+          key: 'zabbix.partitioning.discovery[{$PATH.TO.CONFIG}]'
+          delay: 1d
           description: 'Discover partitioned tables'
           item_prototypes:
             - uuid: 1fbff85191c244dca956be7a94bf08a3
-              name: 'Partitions remaining: {#TABLE}'
-              key: 'zabbix.partitioning.check[/etc/zabbix/zabbix_partitioning.conf, {#TABLE}]'
+              name: 'Days remaining: {#TABLE}'
+              key: 'zabbix.partitioning.check[{$PATH.TO.CONFIG}, {#TABLE}]'
               delay: 12h
               history: 7d
               description: 'Days until the last partition runs out for {#TABLE}'
@@ -59,7 +55,13 @@ zabbix_export:
                   value: '{#TABLE}'
               trigger_prototypes:
                 - uuid: da23fae76a41455c86c58267d6d9f86d
-                  expression: 'last(/Zabbix Partitioning Monitor/zabbix.partitioning.check[/etc/zabbix/zabbix_partitioning.conf, {#TABLE}])<=3'
-                  name: 'Partitioning critical: {#TABLE} has less than 3 days of partitions'
-                  priority: HIGH
+                  expression: 'last(/Zabbix Partitioning Monitor/zabbix.partitioning.check[{$PATH.TO.CONFIG}, {#TABLE}])<={$PARTITION.DAYS}'
+                  name: 'Partitioning critical: {#TABLE} has less than {$PARTITION.DAYS} days in partition'
+                  opdata: 'Days till Zabbix server will crash: {ITEM.LASTVALUE}'
+                  priority: DISASTER
                   description: 'New partitions are not being created. Check the script logs.'
+      macros:
+        - macro: '{$PARTITION.DAYS}'
+          value: '3'
+        - macro: '{$PATH.TO.CONFIG}'
+          value: /etc/zabbix/scripts/zabbix_partitioning.conf