From 049aea724725ca45e6b45cecbf7fe8d4cdce70ca Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 23 Dec 2024 23:05:30 +0900
Subject: [PATCH] Added missing Zabbix agent 2 status port

---
 .env                                      | 1 +
 Dockerfiles/agent2/ubuntu/Dockerfile      | 2 +-
 Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 1 -
 compose_zabbix_components.yaml            | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 6d60ed3ee..ebce54ef0 100644
--- a/.env
+++ b/.env
@@ -47,6 +47,7 @@ ZABBIX_WEB_APACHE_HTTP_PORT=8081
 ZABBIX_WEB_APACHE_HTTPS_PORT=8443
 ZABBIX_AGENT_PORT=10050
 ZABBIX_AGENT2_PORT=10060
+ZABBIX_AGENT2_STATUS_PORT=31999
 ZABBIX_JAVA_GATEWAY_PORT=10052
 ZABBIX_SNMPTRAPS_PORT=162
 ZABBIX_WEB_SERVICE_PORT=10053
diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
index 89735c6dd..183f2b4da 100644
--- a/Dockerfiles/agent2/ubuntu/Dockerfile
+++ b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -73,7 +73,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     apt-get -y autoremove && \
     apt-get -y clean
 
-EXPOSE 10050/TCP
+EXPOSE 10050/TCP 31999/TCP
 
 WORKDIR /var/lib/zabbix
 
diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
index 3a7d0be7c..aac8b6c41 100644
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -2,7 +2,6 @@
 ARG MAJOR_VERSION=6.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.37
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml
index 0c900d055..e8201261f 100644
--- a/compose_zabbix_components.yaml
+++ b/compose_zabbix_components.yaml
@@ -433,6 +433,10 @@ services:
      published: "${ZABBIX_AGENT2_PORT}"
      protocol: tcp
      app_protocol: zabbix-agent
+   - name: zabbix-agent-status
+     target: 31999
+     published: "${ZABBIX_AGENT2_STATUS_PORT}"
+     protocol: tcp
   restart: "${RESTART_POLICY}"
   attach: false
   volumes: