diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index aa1191d77..89f84bc43 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -11,7 +11,7 @@ on: - 'env_vars/*' - 'docker-compose*.yaml' - 'Dockerfiles/*/rhel/*' - - '*/windows/*' + - 'Dockerfiles/*/windows/*' - "**.md" defaults: @@ -37,39 +37,39 @@ jobs: with: fetch-depth: 1 - - name: Check build.xml file + - name: Check build.json file id: build_exists run: | - if [[ ! -f "./build.xml" ]]; then - echo "::error::File build.xml is missing" + if [[ ! -f "./build.json" ]]; then + echo "::error::File build.json is missing" exit 1 fi - name: Prepare Operating System list id: os run: | - os_list=$(jq -r '.os | keys | [ .[] | tostring ] | @json' "./build.xml") + os_list=$(jq -r '.os | keys | [ .[] | tostring ] | @json' "./build.json") echo "::set-output name=list::$os_list" - name: Prepare Platform list id: platform_list run: | - platform_list=$(jq -r '.os | tostring | @json' "./build.xml") + platform_list=$(jq -r '.os | tostring | @json' "./build.json") echo "::set-output name=list::$platform_list" - name: Prepare Database engine list id: database run: | - database_list=$(jq -r '[.components | values[] ] | sort | unique | del(.. | select ( . == "" ) ) | [ .[] | tostring ] | @json' "./build.xml") + database_list=$(jq -r '[.components | values[] ] | sort | unique | del(.. | select ( . == "" ) ) | [ .[] | tostring ] | @json' "./build.json") echo "::set-output name=list::$database_list" - name: Prepare Zabbix component list id: components run: | - component_list=$(jq -r '.components | keys | [ .[] | tostring ] | @json' "./build.xml") + component_list=$(jq -r '.components | keys | [ .[] | tostring ] | @json' "./build.json") echo "::set-output name=list::$component_list" @@ -104,7 +104,7 @@ jobs: - name: Prepare Platform list id: platform run: | - platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.xml") + platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.json") echo ::set-output name=list::$platform_list @@ -174,7 +174,7 @@ jobs: - name: Prepare Platform list id: platform run: | - platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.xml") + platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.json") echo ::set-output name=list::$platform_list @@ -262,7 +262,7 @@ jobs: if [ "${{ matrix.os }}" == "alpine" ] && [ "${{ matrix.build }}" == "web-service" ]; then platform_list="linux/amd64,linux/arm64" else - platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.xml") + platform_list=$(jq -r '.os.${{ matrix.os }} | join(",")' "./build.json") fi echo ::set-output name=list::$platform_list @@ -270,7 +270,7 @@ jobs: - name: Detect Build Base Image id: build_base_image run: | - BUILD_BASE=$(jq -r '.components."${{ matrix.build }}"' "./build.xml") + BUILD_BASE=$(jq -r '.components."${{ matrix.build }}"' "./build.json") echo ::set-output name=build_base::${BUILD_BASE} diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile index 2a2e99770..0269db6c6 100644 --- a/Dockerfiles/agent/windows/Dockerfile +++ b/Dockerfiles/agent/windows/Dockerfile @@ -39,8 +39,8 @@ RUN Set-Location -Path $env:SystemDrive\.; ` ` Write-Host 'Installing ...'; ` Expand-Archive ` - -Path git.zip ` - -DestinationPath $env:SystemDrive\git\.; ` + -Path git.zip ` + -DestinationPath $env:SystemDrive\git\.; ` Remove-Item -Force -Path $env:SystemDrive\git.zip; ` $env:PATH = [string]::Format('{0}\git\cmd;{0}\git\mingw64\bin;{0}\git\usr\bin;', $env:SystemDrive) + $env:PATH; ` [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` @@ -48,50 +48,50 @@ RUN Set-Location -Path $env:SystemDrive\.; ` Write-Host 'Verifying install ("git version") ...'; ` git version; ` ` - Write-Host ('Downloading {0} ...' -f $env:NASM_URL); ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` + Write-Host ('Downloading {0} ...' -f $env:NASM_URL); ` + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest -OutFile $env:SystemDrive\nasm_installer.exe -Uri $env:NASM_URL; ` $sha256 = 'a02325b9fe54f917f5d6a3036637b38dbb6addf6f7ba9d344d9b943a143fe7d0'; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` + Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` if ((Get-FileHash $env:SystemDrive\nasm_installer.exe -Algorithm sha256).Hash -ne $sha256) { ` Write-Host 'Checksum NASM failed!'; ` exit 1; ` }; ` - Write-Host 'Installing ...'; ` + Write-Host 'Installing ...'; ` Start-Process ` - -FilePath $env:SystemDrive\nasm_installer.exe ` - -ArgumentList '/S' -Wait; ` + -FilePath $env:SystemDrive\nasm_installer.exe ` + -ArgumentList '/S' -Wait; ` Remove-Item -Force -Path $env:SystemDrive\nasm_installer.exe; ` - ` - $env:PATH = [string]::Format('{0}\NASM;', ${env:ProgramFiles}) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Verifying install ("nasm -v") ...'; ` - nasm -v; ` - ` - Write-Host ('Downloading {0} ...' -f $env:PERL_URL); ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` + ` + $env:PATH = [string]::Format('{0}\NASM;', ${env:ProgramFiles}) + $env:PATH; ` + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` + ` + Write-Host 'Verifying install ("nasm -v") ...'; ` + nasm -v; ` + ` + Write-Host ('Downloading {0} ...' -f $env:PERL_URL); ` + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest -OutFile $env:SystemDrive\perl_installer.msi -Uri $env:PERL_URL; ` - ` + ` $sha256 = '241a881670164feb0b91bb69d39fbbf84c981bec0d9f8c19959f8f48fd177768'; ` - Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` + Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` if ((Get-FileHash $env:SystemDrive\perl_installer.msi -Algorithm sha256).Hash -ne $sha256) { ` Write-Host 'Checksum Strawberry Perl failed!'; ` exit 1; ` }; ` - Write-Host 'Installing ...'; ` + Write-Host 'Installing ...'; ` Start-Process ` - -FilePath 'msiexec.exe' ` - -ArgumentList """/i $env:SystemDrive\perl_installer.msi /qn /norestart INSTALLDIR=$env:SystemDrive\Strawberry""" ` - -Wait; ` + -FilePath 'msiexec.exe' ` + -ArgumentList """/i $env:SystemDrive\perl_installer.msi /qn /norestart INSTALLDIR=$env:SystemDrive\Strawberry""" ` + -Wait; ` Remove-Item -Force -Path $env:SystemDrive\perl_installer.msi; ` - $env:PATH = [string]::Format('{0}\Strawberry\perl\bin;', $env:SystemDrive) + $env:PATH; ` - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` - ` - Write-Host 'Verifying install ("perl -V") ...'; ` - perl -V; ` - ` - Write-Host 'Installing Text::Template...'; ` + $env:PATH = [string]::Format('{0}\Strawberry\perl\bin;', $env:SystemDrive) + $env:PATH; ` + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` + ` + Write-Host 'Verifying install ("perl -V") ...'; ` + perl -V; ` + ` + Write-Host 'Installing Text::Template...'; ` cpan Text::Template; ` ` Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); ` @@ -139,30 +139,30 @@ RUN Set-Location -Path $env:SystemDrive\.; ` Expand-Archive -Path $env:SystemDrive\pcre.zip -DestinationPath $env:SystemDrive; ` Remove-Item -Force -Path $env:SystemDrive\pcre.zip; ` Rename-Item -Path $env:SystemDrive\pcre-$env:PCRE_VERSION -NewName $env:SystemDrive\pcre_build; ` - New-Item -ItemType directory -Path "$env:SystemDrive\pcre_build\build" | Out-Null; ` + New-Item -ItemType directory -Path "$env:SystemDrive\pcre_build\build" | Out-Null; ` ` Set-Location -Path $env:SystemDrive\pcre_build\build; ` Write-Host 'Building PCRE library ...'; ` cmake --log-level=ERROR ` - -G 'Visual Studio 16 2019' ` - -A $env:BUILD_ARCH ` - -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON ` - -DPCRE_SUPPORT_UTF=ON ` - -DCMAKE_C_FLAGS_RELEASE:string="""/MT""" ..; ` + -G 'Visual Studio 16 2019' ` + -A $env:BUILD_ARCH ` + -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON ` + -DPCRE_SUPPORT_UTF=ON ` + -DCMAKE_C_FLAGS_RELEASE:string="""/MT""" ..; ` msbuild PCRE.sln ` - -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" ` - /verbosity:quiet ` - /property:Configuration=Release ` - /property:Platform=$env:BUILD_ARCH ` - /target:pcre; ` - ` - Write-Host 'PCRE is ready...'; + -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" ` + /verbosity:quiet ` + /property:Configuration=Release ` + /property:Platform=$env:BUILD_ARCH ` + /target:pcre; ` + ` + Write-Host 'PCRE is ready...'; RUN Set-Location -Path $env:SystemDrive\.; ` - ` + ` Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); ` Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` - ` + ` Write-Host ('Downloading {0} ...' -f $env:OPENSSL_URL); ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; ` @@ -176,7 +176,7 @@ RUN Set-Location -Path $env:SystemDrive\.; ` ` Write-Host 'Extracting archive ...'; ` tar -zxf $env:SystemDrive\openssl.tar.gz; ` - Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; ` + Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; ` Rename-Item -Path $env:SystemDrive\openssl-$env:OPENSSL_VERSION -NewName $env:SystemDrive\openssl_build; ` ` Write-Host 'Building OpenSSL library...'; ` @@ -194,21 +194,21 @@ RUN Set-Location -Path $env:SystemDrive\.; ` set CL=/MP; ` nmake /S; ` nmake /S install_sw; ` - Write-Host 'OpenSSL is ready...'; + Write-Host 'OpenSSL is ready...'; COPY modbus.vs16.vcxproj c:\ COPY modbus.vs16.sln c:\ COPY modbus.vs16.vcxproj.filters c:\ RUN Set-Location -Path $env:SystemDrive\.; ` - ` + ` Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); ` Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` - ` - Write-Host ('Checkout GIT {0} repository ...' -f $env:LIBMODBUS_URL); ` + ` + Write-Host ('Checkout GIT {0} repository ...' -f $env:LIBMODBUS_URL); ` git -c advice.detachedHead=false clone $env:LIBMODBUS_URL --branch $env:LIBMODBUS_VERSION --depth 1 --single-branch $env:SystemDrive\libmodbus; ` - ` - Write-Host 'Building Libmodbus library...'; ` + ` + Write-Host 'Building Libmodbus library...'; ` Copy-Item -Path $env:SystemDrive\modbus.vs16.vcxproj $env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj; ` Copy-Item -Path $env:SystemDrive\modbus.vs16.sln $env:SystemDrive\libmodbus\src\win32\modbus.vs16.sln; ` Copy-Item -Path $env:SystemDrive\modbus.vs16.vcxproj.filters $env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj.filters; ` @@ -216,10 +216,10 @@ RUN Set-Location -Path $env:SystemDrive\.; ` cscript .\configure.js; ` msbuild modbus.vs16.sln ` -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" ` - /verbosity:quiet ` + /verbosity:quiet ` /property:Configuration=Release ` /property:Platform=$env:BUILD_ARCH; ` - Write-Host 'Libmodbus is ready...'; + Write-Host 'Libmodbus is ready...'; FROM builder_base as builder_zabbix @@ -233,7 +233,7 @@ ARG ZBX_COMPONENT=all ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM RUN Set-Location -Path $env:SystemDrive\.; ` - ` + ` Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); ` Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; ` ` @@ -258,15 +258,15 @@ RUN Set-Location -Path $env:SystemDrive\.; ` MODBINCDIR=$env:SystemDrive\libmodbus\src ` MODBLIBDIR=$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release ` $env:ZBX_COMPONENT; ` - ` + ` Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; ` & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; ` dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; ` - ` + ` New-Item -ItemType directory -Path $env:SystemDrive\zabbix | Out-Null; ` New-Item -ItemType directory -Path $env:SystemDrive\zabbix\sbin | Out-Null; ` New-Item -ItemType directory -Path $env:SystemDrive\zabbix\conf | Out-Null; ` - ` + ` Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe $env:SystemDrive\zabbix\sbin; ` Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_get.exe $env:SystemDrive\zabbix\sbin; ` Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_sender.exe $env:SystemDrive\zabbix\sbin; ` diff --git a/Dockerfiles/agent/windows/README.md b/Dockerfiles/agent/windows/README.md deleted file mode 100644 index 4cc642f18..000000000 --- a/Dockerfiles/agent/windows/README.md +++ /dev/null @@ -1,244 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix agent? - -Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc). - -# Zabbix agent images - -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix agent are: - - Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) - Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) - Zabbix agent 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest) (unsupported) - Zabbix agent 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*) (unsupported) - Zabbix agent 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest) (unsupported) - Zabbix agent 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*) (unsupported) - Zabbix agent 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest) - Zabbix agent 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*) - Zabbix agent 4.2 (tags: alpine-4.2-latest, ubuntu-4.2-latest, centos-4.2-latest) (unsupported) - Zabbix agent 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) - Zabbix agent 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) - Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) - Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) - Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) - Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) - Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) - Zabbix agent 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-agent` - -Start a Zabbix agent container as follows: - - docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" -d zabbix/zabbix-agent:tag - -Where `some-zabbix-agent` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent/tags/). - -## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks) - -This image exposes the standard Zabbix agent port (``10050``) to perform passive checks, so container linking makes Zabbix agent instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server or Zabbix proxy containers (Active checks) - -This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent instance. Start your application container like this in order to link Zabbix agent to Zabbix server or Zabbix proxy containterns: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent:latest -``` - -## Container shell access and viewing Zabbix agent logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent` container: - -```console -$ docker exec -ti some-zabbix-agent /bin/bash -``` - -The Zabbix agent log is available through Docker's container log: - -```console -$ docker logs some-zabbix-agent -``` - -## Privileged mode - -By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent is designed to monitor system resources, to do that Zabbix agent container must be privileged or you may mount some system-wide volumes. For example: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent:latest -``` -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent:latest -``` - -## Environment Variables - -When you start the `zabbix-agent` image, you can adjust the configuration of the Zabbix agent by passing one or more environment variables on the `docker run` command line. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agentd.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agentd.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks. - -### `ZBX_PASSIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`. - -### `ZBX_PASSIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. - -### `ZBX_ACTIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`. - -### `ZBX_ACTIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``. - -### `ZBX_LOADMODULE` - -The variable is list of comma separated loadable Zabbix modules. It works with volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agentd.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``3``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_SOURCEIP= -ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 -ZBX_LOGREMOTECOMMANDS=0 -ZBX_HOSTINTERFACE= # Available since 4.4.0 -ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 -ZBX_STARTAGENTS=3 -ZBX_HOSTNAMEITEM=system.hostname -ZBX_METADATA= -ZBX_METADATAITEM= -ZBX_REFRESHACTIVECHECKS=120 -ZBX_BUFFERSEND=5 -ZBX_BUFFERSIZE=100 -ZBX_MAXLINESPERSECOND=20 -ZBX_LISTENIP= -ZBX_UNSAFEUSERPARAMETERS=0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCRLFILE= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSKEYFILE= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_TLSCIPHERALL= # Available since 4.4.7 -ZBX_TLSCIPHERALL13= # Available since 4.4.7 -ZBX_TLSCIPHERCERT= # Available since 4.4.7 -ZBX_TLSCIPHERCERT13= # Available since 4.4.7 -ZBX_TLSCIPHERPSK= # Available since 4.4.7 -ZBX_TLSCIPHERPSK13= # Available since 4.4.7 -ZBX_DENYKEY=system.run[*] # Available since 5.0.0 -ZBX_ALLOWKEY= # Available since 5.0.0 -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_agentd.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``. - -Please use official documentation for [``zabbix_agentd.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agentd) to get more information about the variables. - -## Allowed volumes for the Zabbix agent container - -### ``/etc/zabbix/zabbix_agentd.d`` - -The volume allows include ``*.conf`` files and extend Zabbix agent using ``UserParameter`` feature. - -### ``/var/lib/zabbix/modules`` - -The volume allows load additional modules and extend Zabbix agent using ``LoadModule`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSKEY_FILE`` and ``ZBX_TLSPSKFILE`` variables. - -# The image variants - -The `zabbix-agent` images come in many flavors, each designed for a specific use case. - -## `zabbix-agent:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-agent:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-agent:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# Supported Docker versions - -This image is officially supported on Docker version 1.12.0. - -Support for older versions (down to 1.6) is provided on a best-effort basis. - -Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/3.0/agent) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agent.d`` volume with additional configuration files with ``Alias`` options. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile index 7e06009a5..d45535d58 100644 --- a/Dockerfiles/agent2/windows/Dockerfile +++ b/Dockerfiles/agent2/windows/Dockerfile @@ -64,9 +64,9 @@ RUN Set-Location -Path $env:SystemDrive\.; ` }; ` Write-Host 'Installing ...'; ` Start-Process ` - -FilePath $env:SystemDrive\go-amd64.msi ` - -Wait ` - -ArgumentList '/qn /norestart'; ` + -FilePath $env:SystemDrive\go-amd64.msi ` + -Wait ` + -ArgumentList '/qn /norestart'; ` Remove-Item -Force -Path $env:SystemDrive\go-amd64.msi; ` ` $env:PATH = [string]::Format('{0}\Go\bin;', ${env:ProgramFiles}) + $env:PATH; ` @@ -87,9 +87,9 @@ RUN Set-Location -Path $env:SystemDrive\.; ` ` Write-Host 'Installing ...'; ` Start-Process ` - -FilePath $env:SystemDrive\7z.msi ` - -Wait ` - -ArgumentList '/qn /norestart'; ` + -FilePath $env:SystemDrive\7z.msi ` + -Wait ` + -ArgumentList '/qn /norestart'; ` Remove-Item -Force -Path $env:SystemDrive\7z.msi; ` $env:PATH = [string]::Format('{0}\7-Zip;', ${env:ProgramFiles}) + $env:PATH; ` [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); ` @@ -208,7 +208,7 @@ RUN Set-Location -Path $env:SystemDrive\.; ` ` Write-Host 'Extracting archive ...'; ` tar -zxf $env:SystemDrive\openssl.tar.gz; ` - Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; ` + Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; ` Rename-Item -Path $env:SystemDrive\openssl-$env:OPENSSL_VERSION -NewName $env:SystemDrive\openssl_build; ` ` Write-Host 'Building OpenSSL library...'; ` diff --git a/Dockerfiles/agent2/windows/README.md b/Dockerfiles/agent2/windows/README.md deleted file mode 100644 index ca33c13f5..000000000 --- a/Dockerfiles/agent2/windows/README.md +++ /dev/null @@ -1,225 +0,0 @@ -![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) - -# What is Zabbix? - -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning. - -For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com - -# What is Zabbix agent 2? - -Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc). - -# Zabbix agent 2 images - -These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.12 images. The available versions of Zabbix agent 2 are: - - Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported) - Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported) - Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) - Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) - Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) - Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) - Zabbix agent 2 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) - Zabbix agent 2 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) - -Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. - -# How to use this image - -## Start `zabbix-agent2` - -Start a Zabbix agent 2 container as follows: - - docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" -d zabbix/zabbix-agent2:tag - -Where `some-zabbix-agent2` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent2/tags/). - -## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks) - -This image exposes the standard Zabbix agent 2 port (``10050``) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container: - -```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 -d zabbix/zabbix-server:latest -``` - -## Connect to Zabbix server or Zabbix proxy containers (Active checks) - -This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containterns: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent2:latest -``` - -## Container shell access and viewing Zabbix agent 2 logs - -The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent2` container: - -```console -$ docker exec -ti some-zabbix-agent /bin/bash -``` - -The Zabbix agent 2 log is available through Docker's container log: - -```console -$ docker logs some-zabbix-agent -``` - -## Privileged mode - -By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example: - -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent2:latest -``` -```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent2:latest -``` - -## Environment Variables - -When you start the `zabbix-agent2` image, you can adjust the configuration of the Zabbix agent 2 by passing one or more environment variables on the `docker run` command line. - -### `ZBX_HOSTNAME` - -This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agent2.conf``. - -### `ZBX_SERVER_HOST` - -This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agent2.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks. - -### `ZBX_PASSIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`. - -### `ZBX_PASSIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. - -### `ZBX_ACTIVE_ALLOW` - -This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`. - -### `ZBX_ACTIVESERVERS` - -The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``. - -### `ZBX_DEBUGLEVEL` - -The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agent2.conf``. Allowed values are listed below: -- ``0`` - basic information about starting and stopping of Zabbix processes; -- ``1`` - critical information -- ``2`` - error information -- ``3`` - warnings -- ``4`` - for debugging (produces lots of information) -- ``5`` - extended debugging (produces even more information) - -### `ZBX_TIMEOUT` - -The variable is used to specify timeout for processing checks. By default, value is ``3``. - -### Other variables - -Additionally the image allows to specify many other environment variables listed below: - -``` -ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0 -ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0 -ZBX_ENABLESTATUSPORT= -ZBX_SOURCEIP= -ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 -ZBX_LOGREMOTECOMMANDS=0 -ZBX_STARTAGENTS=3 -ZBX_HOSTNAMEITEM=system.hostname -ZBX_METADATA= -ZBX_METADATAITEM= -ZBX_REFRESHACTIVECHECKS=120 -ZBX_BUFFERSEND=5 -ZBX_BUFFERSIZE=100 -ZBX_MAXLINESPERSECOND=20 -ZBX_LISTENIP= -ZBX_UNSAFEUSERPARAMETERS=0 -ZBX_TLSCONNECT=unencrypted -ZBX_TLSACCEPT=unencrypted -ZBX_TLSCAFILE= -ZBX_TLSCRLFILE= -ZBX_TLSSERVERCERTISSUER= -ZBX_TLSSERVERCERTSUBJECT= -ZBX_TLSCERTFILE= -ZBX_TLSKEYFILE= -ZBX_TLSPSKIDENTITY= -ZBX_TLSPSKFILE= -ZBX_DENYKEY=system.run[*] # Available since 5.0.0 -ZBX_ALLOWKEY= # Available since 5.0.0 -``` - -Default values of these variables are specified after equal sign. - -The allowed variables are identical of parameters in official ``zabbix_agent2.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``. - -Please use official documentation for [``zabbix_agent2.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agent2) to get more information about the variables. - -## Allowed volumes for the Zabbix agent 2 container - -### ``/etc/zabbix/zabbix_agentd.d`` - -The volume allows include ``*.conf`` files and extend Zabbix agent 2 using ``UserParameter`` feature. - -### ``/var/lib/zabbix/enc`` - -The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSKEY_FILE`` and ``ZBX_TLSPSKFILE`` variables. - -### ``/var/lib/zabbix/buffer`` - -The volume is used to store the file, where Zabbix Agent2 should keep SQLite database. To enable the feature specify ``ZBX_ENABLEPERSISTENTBUFFER=true``. Available since 5.0.0. - -# The image variants - -The `zabbix-agent2` images come in many flavors, each designed for a specific use case. - -## `zabbix-agent2:alpine-` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `zabbix-agent2:ubuntu-` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `zabbix-agent2:ol-` - -Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. - -# Supported Docker versions - -This image is officially supported on Docker version 1.12.0. - -Support for older versions (down to 1.6) is provided on a best-effort basis. - -Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon. - -# User Feedback - -## Documentation - -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. - -## Issues - -If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues). - -### Known issues - -Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agent.d`` volume with additional configuration files with ``Alias`` options. - -## Contributing - -You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. - -Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/build.xml b/build.json similarity index 100% rename from build.xml rename to build.json