From e7395f4fa17c2de44b69352a323aabd894993c19 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 May 2020 18:24:13 +0300 Subject: [PATCH 1/2] Bump API version for DaemonSet in kubernetes.yaml --- kubernetes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes.yaml b/kubernetes.yaml index 031c6b7f2..a9d071615 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -449,7 +449,7 @@ spec: - name: ZBX_TIMEOUT value: "5" --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: zabbix-agent From 8bff463034fce0adf9ff38dd6dabceec8a263768 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 May 2020 18:31:14 +0300 Subject: [PATCH 2/2] Fixed SNMPTRAPS in compose files and Kubernetes --- docker-compose_v3_alpine_mysql_latest.yaml | 2 +- docker-compose_v3_alpine_mysql_local.yaml | 2 +- docker-compose_v3_alpine_pgsql_latest.yaml | 2 +- docker-compose_v3_alpine_pgsql_local.yaml | 2 +- docker-compose_v3_centos_mysql_latest.yaml | 2 +- docker-compose_v3_centos_mysql_local.yaml | 2 +- docker-compose_v3_centos_pgsql_latest.yaml | 2 +- docker-compose_v3_centos_pgsql_local.yaml | 2 +- kubernetes.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 1461aab2c..42d9d6662 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -361,7 +361,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "alpine" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index b4222a9f9..c7cadeb96 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -393,7 +393,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "alpine" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 5a2d1ff93..ab9e1dc50 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -364,7 +364,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "alpine" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index ee283ec93..82018ecdd 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -397,7 +397,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "alpine" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 5896b1789..ebe7cec89 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -361,7 +361,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "centos" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index d24981a0e..0ffe5ff01 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -393,7 +393,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "centos" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 42b3c5e74..ea81e8956 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -364,7 +364,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "centos" mysql-server: image: mysql:5.7 diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 5df507028..3891b7669 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -376,7 +376,7 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" + com.zabbix.os: "centos" mysql-server: image: mysql:5.7 diff --git a/kubernetes.yaml b/kubernetes.yaml index a9d071615..06c087cd6 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -331,7 +331,7 @@ spec: mountPath: /var/lib/zabbix/snmptraps/ readOnly: true - name: zabbix-snmptraps - image: zabbix/zabbix-snmptraps:latest + image: zabbix/zabbix-snmptraps:alpine-latest imagePullPolicy: Always ports: - containerPort: 1162