Automatic commit of package [zabbix-agent-addons] release [0.2.159-1].

Created by command:

/usr/bin/tito tag

.tito/packages/zabbix-agent-addons

@@ -1 +1 @@
-0.2.158-1 ./
+0.2.159-1 ./

zabbix-agent-addons.spec

@@ -4,7 +4,7 @@
 
 Summary: Scripts for Zabbix monitoring
 Name: zabbix-agent-addons
-Version: 0.2.158
+Version: 0.2.159
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 BuildArch: noarch
@@ -106,6 +106,10 @@ fi
 %endif
 
 %changelog
+* Thu Jan 20 2022 Daniel Berteaud <dbd@ehtrace.com> 0.2.159-1
+- Update Docker template (dbd@ehtrace.com)
+- Don't query state in docker discovery (dbd@ehtrace.com)
+
 * Thu Jan 13 2022 Daniel Berteaud <dbd@ehtrace.com> 0.2.158-1
 - Small fixes for Docker check script and template (dbd@ehtrace.com)
 

zabbix_scripts/disco_docker_sudo

@@ -31,8 +31,7 @@ if ($what =~ m/^containers?/){
   $format = '{' .
                '"{#DOCKER_CONTAINER_ID}":"{{ .ID }}",' .
                '"{#DOCKER_CONTAINER_IMAGE}": "{{ .Image }}",' .
-               '"{#DOCKER_CONTAINER_NAME}":"{{ .Names }}",' .
-               '"{#DOCKER_CONTAINER_STATE}": "{{ .State }}"' .
+               '"{#DOCKER_CONTAINER_NAME}":"{{ .Names }}"' .
                '}';
   $cmd = "$docker container list --all --format '$format'";
 } elsif ($what =~ m/^networks?/){

zabbix_templates/Template_App_Docker.yaml

@@ -1,6 +1,6 @@
 zabbix_export:
   version: '5.4'
-  date: '2022-01-13T12:58:38Z'
+  date: '2022-01-20T13:55:05Z'
   groups:
     -
       uuid: 7df96b18c230490a9a0a9e2307226338
@@ -120,12 +120,16 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.info.ServerVersion
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1h
           master_item:
             key: 'container.docker.check[global]'
           triggers:
             -
               uuid: 8c535ff0d73240c395226ee91a8096c4
-              expression: '(last(/Template_App_Docker/container.docker.check[global,ServerVersion])<>last(/Template_App_Docker/container.docker.check[global,ServerVersion],#6))=1'
+              expression: '(last(/Template_App_Docker/container.docker.check[global,ServerVersion])<>last(/Template_App_Docker/container.docker.check[global,ServerVersion],#2))=1'
               name: 'Docker version changed ({ITEM.LASTVALUE1})'
               priority: WARNING
         -
@@ -204,9 +208,11 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: d2bdccc7bf8a49c6a2c584a5394a0c27
-                  expression: 'avg(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},CPUPerc],30m)>{$DOCKER_CPU_PCT_WARN}'
+                  expression: 'avg(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},CPUPerc],1h)>{$DOCKER_CPU_PCT_WARN:"{#DOCKER_CONTAINER_NAME}"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'avg(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},CPUPerc],1h)<({$DOCKER_CPU_PCT_WARN:"{#DOCKER_CONTAINER_NAME}"}-2) or avg(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},CPUPerc],5m)<({$DOCKER_CPU_PCT_WARN:"{#DOCKER_CONTAINER_NAME}"}/3)'
                   name: 'Container {#DOCKER_CONTAINER_NAME} CPU usage is {ITEM.VALUE1}'
-                  priority: WARNING
+                  priority: INFO
             -
               uuid: f56ddbaef3af4fa898ae2403a812db3c
               name: 'Docker: Container {#DOCKER_CONTAINER_NAME}: Dead'
@@ -323,9 +329,9 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 9fdd469b0866409ca7889288eb5f229a
-                  expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])>{$DOCKER_MEM_PCT_WARN}'
+                  expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])>{$DOCKER_MEM_PCT_WARN:"{#DOCKER_CONTAINER_NAME}"}'
                   recovery_mode: RECOVERY_EXPRESSION
-                  recovery_expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])<({$DOCKER_MEM_PCT_WARN}-2)'
+                  recovery_expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])<({$DOCKER_MEM_PCT_WARN:"{#DOCKER_CONTAINER_NAME}"}-2)'
                   name: 'Container {#DOCKER_CONTAINER_NAME} memory usage is at {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   manual_close: 'YES'
@@ -491,17 +497,17 @@ zabbix_export:
           trigger_prototypes:
             -
               uuid: 57d9a11b38b246539a82bf4ba1a79a98
-              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
-              name: 'Container {#DOCKER_CONTAINER_NAME} as just restarted'
+              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN:"{#DOCKER_CONTAINER_NAME}"} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
+              name: 'Container {#DOCKER_CONTAINER_NAME} has just restarted'
               priority: INFO
             -
               uuid: ce3cc3148fa24c6097cbf38b47e9e655
-              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="exited" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
-              name: 'Container {#DOCKER_CONTAINER_NAME} as just started'
+              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN:"{#DOCKER_CONTAINER_NAME}"} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="exited" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
+              name: 'Container {#DOCKER_CONTAINER_NAME} has just started'
               priority: INFO
             -
               uuid: ebdea3b26c624714811124fe4681ccec
-              expression: 'max(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime],15m)<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])>0 and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#3)="running"'
+              expression: 'max(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime],20m)<{$DOCKER_UPTIME_WARN:"{#DOCKER_CONTAINER_NAME}"} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])>0 and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#3)="running"'
               name: 'Container {#DOCKER_CONTAINER_NAME} seems to restart in a loop'
               priority: AVERAGE
               manual_close: 'YES'
@@ -568,10 +574,10 @@ zabbix_export:
       macros:
         -
           macro: '{$DOCKER_CPU_PCT_WARN}'
-          value: '80'
+          value: '90'
         -
           macro: '{$DOCKER_MEM_PCT_WARN}'
-          value: '80'
+          value: '85'
         -
           macro: '{$DOCKER_UPTIME_WARN}'
           value: '300'