fix: improve include/exclude conditions

Signed-off-by: djerfy <[email protected]>

README.md

@@ -16,7 +16,7 @@
   <a style="text-decoration:none" href="https://github.com/djerfy/zabbix-kubernetes-discovery/actions/workflows/trivy-scan-code.yml">
     <img alt="Pipeline Helm" src="https://img.shields.io/github/actions/workflow/status/djerfy/zabbix-kubernetes-discovery/trivy-scan-code.yml?logo=github&color=0&label=Trivy%20Scan&style=flat-square">
   </a>
-  <a style="text-decoration:none" href="https://github.com/djerfy/zabbix-kubernetes-discovery/releases/tag/v1.4.14">
+  <a style="text-decoration:none" href="https://github.com/djerfy/zabbix-kubernetes-discovery/releases/tag/v1.4.15">
     <img alt="Release" src="https://img.shields.io/github/v/release/djerfy/zabbix-kubernetes-discovery?logo=github&color=0&label=Release&style=flat-square">
   </a>
 </p>

helm/zabbix-kubernetes-discovery/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: zabbix-kubernetes-discovery
-version: 1.4.14
-appVersion: "1.4.14"
+version: 1.4.15
+appVersion: "1.4.15"
 description: Kubernetes monitoring for Zabbix with discovery objects
 annotations:
   category: Monitoring

helm/zabbix-kubernetes-discovery/README.md

@@ -44,7 +44,7 @@ $ helm delete zabbix-kubernetes-discovery \
 | `serviceAccount.create`                           | boolean | `true`                                                      |
 | `serviceAccount.name`                             | string  | `zabbix-kubernetes-discovery`                               |
 | `deployment.name`                                 | string  | `zabbix-kubernetes-discovery`                               |
-| `deployment.image.name`                           | string  | `ghcr.io/djerfy/zabbix-kubernetes-discovery:v1.4.14`        |
+| `deployment.image.name`                           | string  | `ghcr.io/djerfy/zabbix-kubernetes-discovery:v1.4.15`        |
 | `deployment.image.pullPolicy`                     | string  | `IfNotPresent`                                              |
 | `deployment.replicas`                             | integer | `1`                                                         |
 | `deployment.strategy`                             | string  | `Recreate`                                                  |

helm/zabbix-kubernetes-discovery/values.yaml

@@ -13,7 +13,7 @@ serviceAccount:
 deployment:
   name: zabbix-kubernetes-discovery
   image:
-    name: ghcr.io/djerfy/zabbix-kubernetes-discovery:v1.4.14
+    name: ghcr.io/djerfy/zabbix-kubernetes-discovery:v1.4.15
     pullPolicy: IfNotPresent
   replicas: 1
   strategy: Recreate

src/modules/kubernetes/get.py

@@ -37,13 +37,13 @@ def getNode(
             }
         }
 
-        if match_label is not None and not ifLabelMatch(match_label, node.metadata.labels):
+        if match_label and not ifLabelMatch(match_label, node.metadata.labels):
             continue
 
-        if not ifObjectMatch(include_name, json['name']):
+        if include_name and not ifObjectMatch(include_name, json['name']):
             continue
 
-        if ifObjectMatch(exclude_name, json['name']):
+        if exclude_name and ifObjectMatch(exclude_name, json['name']):
             continue
 
         if name == json['name']:
@@ -90,19 +90,19 @@ def getDaemonset(
             if json['replicas'][i] is None:
                 json['replicas'][i] = 0
 
-        if match_label is not None and not ifLabelMatch(match_label, daemonset.metadata.labels):
+        if match_label and not ifLabelMatch(match_label, daemonset.metadata.labels):
             continue
 
-        if not ifObjectMatch(include_name, json['name']):
+        if include_name and not ifObjectMatch(include_name, json['name']):
             continue
 
-        if not ifObjectMatch(include_namespace, json['namespace']):
+        if include_namespace and not ifObjectMatch(include_namespace, json['namespace']):
             continue
 
-        if ifObjectMatch(exclude_name, json['name']):
+        if exclude_name and ifObjectMatch(exclude_name, json['name']):
             continue
 
-        if ifObjectMatch(exclude_namespace, json['namespace']):
+        if exclude_namespace and ifObjectMatch(exclude_namespace, json['namespace']):
             continue
 
         if name == json['name']:
@@ -152,19 +152,19 @@ def getVolume(
                 volume['namespace'] = volume['pvcRef']['namespace']
                 volume['name'] = volume['pvcRef']['name']
 
-                if match_label is not None and not ifLabelMatch(match_label, volume.metadata.labels):
+                if match_label and not ifLabelMatch(match_label, volume.metadata.labels):
                     continue
 
-                if not ifObjectMatch(include_name, volume['name']):
+                if include_name and not ifObjectMatch(include_name, volume['name']):
                     continue
 
-                if not ifObjectMatch(include_namespace, volume['namespace']):
+                if include_namespace and not ifObjectMatch(include_namespace, volume['namespace']):
                     continue
 
-                if ifObjectMatch(exclude_name, volume['name']):
+                if exclude_name and ifObjectMatch(exclude_name, volume['name']):
                     continue
 
-                if ifObjectMatch(exclude_namespace, volume['namespace']):
+                if exclude_namespace and ifObjectMatch(exclude_namespace, volume['namespace']):
                     continue
 
                 for i in ["time", "pvcRef"]:
@@ -212,19 +212,19 @@ def getDeployment(
             }
         }
 
-        if match_label is not None and not ifLabelMatch(match_label, deployment.metadata.labels):
+        if match_label and not ifLabelMatch(match_label, deployment.metadata.labels):
             continue
 
-        if not ifObjectMatch(include_name, json['name']):
+        if include_name and not ifObjectMatch(include_name, json['name']):
             continue
 
-        if not ifObjectMatch(include_namespace, json['namespace']):
+        if include_namespace and not ifObjectMatch(include_namespace, json['namespace']):
             continue
 
-        if ifObjectMatch(exclude_name, json['name']):
+        if exclude_name and ifObjectMatch(exclude_name, json['name']):
             continue
 
-        if ifObjectMatch(exclude_namespace, json['namespace']):
+        if exclude_namespace and ifObjectMatch(exclude_namespace, json['namespace']):
             continue
 
         for i in ["desired", "ready", "available"]:
@@ -270,19 +270,19 @@ def getStatefulset(
             }
         }
 
-        if match_label is not None and not ifLabelMatch(match_label, statefulset.metadata.labels):
+        if match_label and not ifLabelMatch(match_label, statefulset.metadata.labels):
             continue
 
-        if not ifObjectMatch(include_name, json['name']):
+        if include_name and not ifObjectMatch(include_name, json['name']):
             continue
 
-        if not ifObjectMatch(include_namespace, json['namespace']):
+        if include_namespace and not ifObjectMatch(include_namespace, json['namespace']):
             continue
 
-        if ifObjectMatch(exclude_name, json['name']):
+        if exclude_name and ifObjectMatch(exclude_name, json['name']):
             continue
 
-        if ifObjectMatch(exclude_namespace, json['namespace']):
+        if exclude_namespace and ifObjectMatch(exclude_namespace, json['namespace']):
             continue
 
         for i in ["desired", "ready", "available"]:
@@ -371,19 +371,19 @@ def getCronjob(
             }
         }
 
-        if match_label is not None and not ifLabelMatch(match_label, cronjob.metadata.labels):
+        if match_label and not ifLabelMatch(match_label, cronjob.metadata.labels):
             continue
 
-        if not ifObjectMatch(include_name, json['name']):
+        if include_name and not ifObjectMatch(include_name, json['name']):
             continue
 
-        if not ifObjectMatch(include_namespace, json['namespace']):
+        if include_namespace and not ifObjectMatch(include_namespace, json['namespace']):
             continue
 
-        if ifObjectMatch(exclude_name, json['name']):
+        if exclude_name and ifObjectMatch(exclude_name, json['name']):
             continue
 
-        if ifObjectMatch(exclude_namespace, json['namespace']):
+        if exclude_namespace and ifObjectMatch(exclude_namespace, json['namespace']):
             continue
 
         if name == json['name']:

zabbix/TemplateZabbixKubernetesDiscovery.yaml

@@ -1356,7 +1356,7 @@ zabbix_export:
           value: Kubernetes
         -
           tag: Version
-          value: 1.4.14
+          value: 1.4.15
       macros:
         -
           macro: '{$KUBERNETES.NODE.PODS.CRITICAL}'