From 8fb143b4fb2013e1d0bb6b352e3b7880f24ee703 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 20 May 2024 14:16:26 +0900
Subject: [PATCH 1/3] Updated build process for Zabbix agent (windows)

---
 Dockerfiles/agent2/windows/docker-entrypoint.ps1 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
index 22c0b540d..183114cbc 100644
--- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
@@ -109,7 +109,7 @@ function Update-Config-Multiple-Var {
 }
 
 function Prepare-Zbx-Agent-Config {
-    Write-Host "** Preparing Zabbix agent configuration file"
+    Write-Host "** Preparing Zabbix agent 2 configuration file"
 
     $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.conf"
 
@@ -226,9 +226,19 @@ function Prepare-Zbx-Agent-Config {
 
 }
 
+function Prepare-Zbx-Agent-Plugins-Config {
+    Write-Host "** Preparing Zabbix agent 2 (plugins) configuration file"
+
+    $ZbxAgentConfig="$ZabbixConfigDir\zabbix_agent2.conf"
+
+#    Update-Config-Var $ZbxAgentConfig "Plugins.MongoDB.System.Path" "$ZabbixUserHomeDir\zabbix-agent2-plugin\zabbix-agent2-plugin-mongodb.exe"
+#    Update-Config-Var $ZbxAgentConfig "Plugins.PostgreSQL.System.Path" "$ZabbixUserHomeDir\zabbix-agent2-plugin\zabbix-agent2-plugin-postgresql.exe"
+}
+
 function PrepareAgent {
-    Write-Host "** Preparing Zabbix agent"
+    Write-Host "** Preparing Zabbix agent 2"
     Prepare-Zbx-Agent-Config
+    Prepare-Zbx-Agent-Plugins-Config
 }
 
 $commandArgs=$args

From 8faaae8b36e72d8f73f4ca8b99977b253924c471 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 20 May 2024 14:32:40 +0900
Subject: [PATCH 2/3] Updated build process for Zabbix agent (windows)

---
 Dockerfiles/agent/windows/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile
index 10e53c0fe..68cf0b5d2 100644
--- a/Dockerfiles/agent/windows/Dockerfile
+++ b/Dockerfiles/agent/windows/Dockerfile
@@ -39,7 +39,7 @@ RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemD
     $env:ZBX_HOME = [string]::Format('{0}\zabbix', $env:SystemDrive); `
     [Environment]::SetEnvironmentVariable('ZBX_HOME', $env:ZBX_HOME, [EnvironmentVariableTarget]::Machine); `
     `
-    Write-Host ('Verifying Zabbix agent 2 {0} ...' -f $env:ZBX_VERSION); `
+    Write-Host ('Verifying Zabbix agent {0} ...' -f $env:ZBX_VERSION); `
     zabbix_agentd.exe -V;
 
 RUN Set-Location -Path $env:SystemDrive\.; `

From 47f4f62147fa2cfec66e32d1d34fdad2a78f7ccb Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 20 May 2024 16:41:12 +0900
Subject: [PATCH 3/3] Updated build process for Zabbix agent (windows)

---
 .github/workflows/images_build_windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index a5181551d..e06af631c 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -144,7 +144,7 @@ jobs:
     name: Build ${{ matrix.component }} base on ${{ matrix.os }}
     needs: init_build
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 90
+    timeout-minutes: 120
     permissions:
       contents: read
       id-token: write