diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 337bf9058..a57b6ed28 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -34,4 +34,4 @@
```paste below
-```
\ No newline at end of file
+```
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 252c73636..2fa6f8be5 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -47,7 +47,7 @@ jobs:
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit
-
+
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0438c73dc..74989927d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,20 +1,41 @@
- - repo: https://github.com/gitleaks/gitleaks
- rev: v8.16.3
- hooks:
- - id: gitleaks
- - repo: https://github.com/jumanjihouse/pre-commit-hooks
- rev: 3.0.0
- hooks:
- - id: shellcheck
- - repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.5.0
- hooks:
- - id: end-of-file-fixer
- - id: trailing-whitespace
- - id: check-yaml
- - id: check-symlinks
- - id: pretty-format-json
-- repo: https://github.com/asottile/setup-cfg-fmt
- rev: v2.5.0
- hooks:
- - id: setup-cfg-fmt
+repos:
+- repo: https://github.com/gitleaks/gitleaks
+ rev: v8.16.3
+ hooks:
+ - id: gitleaks
+- repo: https://github.com/jumanjihouse/pre-commit-hooks
+ rev: 3.0.0
+ hooks:
+ - id: shellcheck
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: end-of-file-fixer
+ exclude: |
+ (?x)(
+ ^env_vars/\.MYSQL |
+ ^env_vars/\.POSTGRES
+ )
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: trailing-whitespace
+ exclude: |
+ (?x)(
+ .*\.patch$
+ )
+ - id: check-yaml
+ args: [--allow-multiple-documents]
+ - id: check-symlinks
+# - id: pretty-format-json
+ - id: check-added-large-files
+#- repo: https://github.com/adrienverge/yamllint.git
+# rev: v1.21.0 # or higher tag
+# hooks:
+# - id: yamllint
+# args: [--format, parsable, --strict]
+#- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
+# rev: 0.2.3
+# hooks:
+# - id: yamlfmt
+# args: [--mapping, '2', --sequence, '1', --offset, '0', --colons, --width, '400']
diff --git a/Dockerfiles/agent/windows/docker-entrypoint.ps1 b/Dockerfiles/agent/windows/docker-entrypoint.ps1
index ea526c194..c7a459b23 100644
--- a/Dockerfiles/agent/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent/windows/docker-entrypoint.ps1
@@ -40,7 +40,7 @@ function Update-Config-Var {
if (-not(Test-Path -Path $ConfigPath -PathType Leaf)) {
throw "**** Configuration file '$ConfigPath' does not exist"
}
-
+
if ($MaskList.Contains($VarName) -eq $true -And [string]::IsNullOrWhitespace($VarValue) -ne $true) {
Write-Host -NoNewline "** Updating '$ConfigPath' parameter ""$VarName"": '****'. Enable DEBUG_MODE to view value ..."
}
@@ -50,12 +50,12 @@ function Update-Config-Var {
if ([string]::IsNullOrWhitespace($VarValue)) {
if ((Get-Content $ConfigPath | %{$_ -match "^$VarName="}) -contains $true) {
- (Get-Content $ConfigPath) |
+ (Get-Content $ConfigPath) |
Where-Object {$_ -notmatch "^$VarName=" } |
Set-Content $ConfigPath
}
- Write-Host "removed"
+ Write-Host "removed"
return
}
@@ -64,7 +64,7 @@ function Update-Config-Var {
Write-Host "undefined"
return
}
-
+
if ($VarName -match '^TLS.*File$') {
$VarValue="$ZabbixUserHomeDir\enc\$VarValue"
}
@@ -75,7 +75,7 @@ function Update-Config-Var {
Write-Host updated
}
elseif ((Get-Content $ConfigPath | select-string -pattern "^[#;] $VarName=").length -gt 0) {
- (Get-Content $ConfigPath) |
+ (Get-Content $ConfigPath) |
Foreach-Object {
$_
if ($_ -match "^[#;] $VarName=") {
diff --git a/Dockerfiles/agent2/rhel/licenses/apache-2.0.txt b/Dockerfiles/agent2/rhel/licenses/apache-2.0.txt
index 39f57220f..9006b97b3 100644
--- a/Dockerfiles/agent2/rhel/licenses/apache-2.0.txt
+++ b/Dockerfiles/agent2/rhel/licenses/apache-2.0.txt
@@ -199,4 +199,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
index 2d0736052..8777e39fc 100644
--- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
@@ -40,7 +40,7 @@ function Update-Config-Var {
if (-not(Test-Path -Path $ConfigPath -PathType Leaf)) {
throw "**** Configuration file '$ConfigPath' does not exist"
}
-
+
if ($MaskList.Contains($VarName) -eq $true -And [string]::IsNullOrWhitespace($VarValue) -ne $true) {
Write-Host -NoNewline "** Updating '$ConfigPath' parameter ""$VarName"": '****'. Enable DEBUG_MODE to view value ..."
}
@@ -50,12 +50,12 @@ function Update-Config-Var {
if ([string]::IsNullOrWhitespace($VarValue)) {
if ((Get-Content $ConfigPath | %{$_ -match "^$VarName="}) -contains $true) {
- (Get-Content $ConfigPath) |
+ (Get-Content $ConfigPath) |
Where-Object {$_ -notmatch "^$VarName=" } |
Set-Content $ConfigPath
}
- Write-Host "removed"
+ Write-Host "removed"
return
}
@@ -64,7 +64,7 @@ function Update-Config-Var {
Write-Host "undefined"
return
}
-
+
if ($VarName -match '^TLS.*File$') {
$VarValue="$ZabbixUserHomeDir\enc\$VarValue"
}
@@ -75,7 +75,7 @@ function Update-Config-Var {
Write-Host updated
}
elseif ((Get-Content $ConfigPath | select-string -pattern "^[#;] $VarName=").length -gt 0) {
- (Get-Content $ConfigPath) |
+ (Get-Content $ConfigPath) |
Foreach-Object {
$_
if ($_ -match "^[#;] $VarName=") {
diff --git a/Dockerfiles/build-base/windows/modbus.vs16.sln b/Dockerfiles/build-base/windows/modbus.vs16.sln
index 19ce76466..5e593bcee 100644
--- a/Dockerfiles/build-base/windows/modbus.vs16.sln
+++ b/Dockerfiles/build-base/windows/modbus.vs16.sln
@@ -28,4 +28,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6CF51673-664F-4C9F-B3FE-991FF423F3B6}
EndGlobalSection
-EndGlobal
\ No newline at end of file
+EndGlobal
diff --git a/Dockerfiles/build-base/windows/modbus.vs16.vcxproj b/Dockerfiles/build-base/windows/modbus.vs16.vcxproj
index 9cf530ccf..e1d48e03c 100644
--- a/Dockerfiles/build-base/windows/modbus.vs16.vcxproj
+++ b/Dockerfiles/build-base/windows/modbus.vs16.vcxproj
@@ -262,4 +262,4 @@
-
\ No newline at end of file
+
diff --git a/Dockerfiles/build-base/windows/modbus.vs16.vcxproj.filters b/Dockerfiles/build-base/windows/modbus.vs16.vcxproj.filters
index 819f877e5..19d40f654 100644
--- a/Dockerfiles/build-base/windows/modbus.vs16.vcxproj.filters
+++ b/Dockerfiles/build-base/windows/modbus.vs16.vcxproj.filters
@@ -59,4 +59,4 @@
Resource Files
-
\ No newline at end of file
+
diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md
index 3bc4e3704..77abee817 100644
--- a/Dockerfiles/proxy-mysql/README.md
+++ b/Dockerfiles/proxy-mysql/README.md
@@ -113,7 +113,7 @@ This variable is port Zabbix server listening on. By default, value is `10051`.
This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server'
### `DB_SERVER_PORT`
-
+
This variable is port of MySQL server. By default, value is '3306'.
### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE`
diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
index c2e7d941c..bd3ce7f9e 100755
--- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
@@ -331,7 +331,7 @@ apply_db_scripts() {
}
create_db_schema_postgresql() {
- DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
+ DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
index c2e7d941c..bd3ce7f9e 100755
--- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
@@ -331,7 +331,7 @@ apply_db_scripts() {
}
create_db_schema_postgresql() {
- DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
+ DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
index c2e7d941c..bd3ce7f9e 100755
--- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
@@ -331,7 +331,7 @@ apply_db_scripts() {
}
create_db_schema_postgresql() {
- DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
+ DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
index 9e1be2ee9..bcede0389 100755
--- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -331,7 +331,7 @@ apply_db_scripts() {
}
create_db_schema_postgresql() {
- DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
+ DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid =
c.relnamespace WHERE n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
index 7b1080149..c28b761b9 100644
--- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
+++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
@@ -1,3 +1,3 @@
PidFile "/tmp/httpd.pid"
-
\ No newline at end of file
+
diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
index 7b1080149..c28b761b9 100644
--- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
+++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
@@ -1,3 +1,3 @@
PidFile "/tmp/httpd.pid"
-
\ No newline at end of file
+
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
index 2d0e119c5..270fdc2cb 100644
--- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
@@ -104,7 +104,7 @@ RUN set -eux && \
rm -rf /var/lib/apt/lists/*
EXPOSE 8080/TCP 8443/TCP
-
+
WORKDIR /usr/share/zabbix
COPY ["docker-entrypoint.sh", "/usr/bin/"]
diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
index 7b1080149..c28b761b9 100644
--- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
+++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf
@@ -1,3 +1,3 @@
PidFile "/tmp/httpd.pid"
-
\ No newline at end of file
+
diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
index 7b1080149..c28b761b9 100644
--- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
+++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf
@@ -1,3 +1,3 @@
PidFile "/tmp/httpd.pid"
-
\ No newline at end of file
+
diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
index f558c4d2f..a4368f121 100755
--- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -209,7 +209,7 @@ prepare_zbx_web_config() {
export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE}
: ${ZBX_DB_VERIFY_HOST:="false"}
export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,}
-
+
export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo
index 4a460fee8..d2d149230 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo
+++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo
@@ -5,4 +5,3 @@ gpgcheck=1
enabled=0
gpgkey=https://nginx.org/keys/nginx_signing.key
module_hotfixes=true
-
diff --git a/Dockerfiles/web-service/README.md b/Dockerfiles/web-service/README.md
index 2f5be9784..b675422b3 100644
--- a/Dockerfiles/web-service/README.md
+++ b/Dockerfiles/web-service/README.md
@@ -103,7 +103,7 @@ Please use official documentation for [``zabbix_web_service.conf``](https://www.
## Allowed volumes for the Zabbix web service container
### ``/var/lib/zabbix/enc``
-
+
The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCERTFILE`` and ``ZBX_TLSKEY_FILE`` variables.
# The image variants
diff --git a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref
index 4c83dc746..48609ef42 100644
--- a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref
+++ b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref
@@ -11,4 +11,4 @@ Pin-Priority: 300
# named dependencies:
Package: chromium*
Pin: origin "ftp.debian.org"
-Pin-Priority: 700
\ No newline at end of file
+Pin-Priority: 700
diff --git a/build.json b/build.json
index 931d9aa08..4905c9bb5 100644
--- a/build.json
+++ b/build.json
@@ -8,43 +8,43 @@
"linux/s390x",
"linux/ppc64le"
],
+ "centos": [
+ "linux/amd64",
+ "linux/arm64",
+ "linux/ppc64le"
+ ],
"ol": [
"linux/amd64",
"linux/arm64"
],
+ "rhel": [
+ "X64",
+ "ARM64"
+ ],
"ubuntu": [
"linux/amd64",
"linux/arm/v7",
"linux/arm64",
"linux/s390x"
- ],
- "centos": [
- "linux/amd64",
- "linux/arm64",
- "linux/ppc64le"
- ],
- "rhel": [
- "X64",
- "ARM64"
]
},
"os-windows": {
- "windows-2022": "ltsc2022",
- "windows-2019": "ltsc2019"
+ "windows-2019": "ltsc2019",
+ "windows-2022": "ltsc2022"
},
"components": {
- "agent": { "base" : "build-mysql", "rhel" : true },
- "agent2": { "base" : "build-mysql", "rhel" : true },
- "java-gateway": { "base" : "build-mysql", "rhel" : true },
- "proxy-mysql": { "base" : "build-mysql", "rhel" : true },
- "proxy-sqlite3": { "base" : "build-sqlite3", "rhel" : true },
- "server-mysql": { "base" : "build-mysql", "rhel" : true },
- "server-pgsql": { "base" : "build-pgsql", "rhel" : false },
- "snmptraps": { "base" : "", "rhel" : true },
- "web-apache-mysql": { "base" : "build-mysql", "rhel" : false },
- "web-apache-pgsql": { "base" : "build-pgsql", "rhel" : false },
- "web-nginx-mysql": { "base" : "build-mysql", "rhel" : true },
- "web-nginx-pgsql": { "base" : "build-mysql", "rhel" : false },
- "web-service": { "base" : "build-mysql", "rhel" : true }
+ "agent": { "base": "build-mysql", "rhel": true },
+ "agent2": { "base": "build-mysql", "rhel": true },
+ "java-gateway": { "base": "build-mysql", "rhel": true },
+ "proxy-mysql": { "base": "build-mysql", "rhel": true },
+ "proxy-sqlite3": { "base": "build-sqlite3", "rhel": true },
+ "server-mysql": { "base": "build-mysql", "rhel": true },
+ "server-pgsql": { "base": "build-pgsql", "rhel": false },
+ "snmptraps": { "base": "", "rhel": true },
+ "web-apache-mysql": { "base": "build-mysql", "rhel": false },
+ "web-apache-pgsql": { "base": "build-pgsql", "rhel": false },
+ "web-nginx-mysql": { "base": "build-mysql", "rhel": true },
+ "web-nginx-pgsql": { "base": "build-mysql", "rhel": false },
+ "web-service": { "base": "build-mysql", "rhel": true }
}
}
diff --git a/env_vars/mysql_init/init_proxy_db.sql b/env_vars/mysql_init/init_proxy_db.sql
index ca8c6e4c8..0f01f932a 100644
--- a/env_vars/mysql_init/init_proxy_db.sql
+++ b/env_vars/mysql_init/init_proxy_db.sql
@@ -1,2 +1,2 @@
CREATE DATABASE IF NOT EXISTS `zabbix_proxy`;
-GRANT ALL ON `zabbix_proxy`.* TO 'zabbix'@'%';
\ No newline at end of file
+GRANT ALL ON `zabbix_proxy`.* TO 'zabbix'@'%';
diff --git a/kubernetes.yaml b/kubernetes.yaml
index 02a023716..4720823c4 100644
--- a/kubernetes.yaml
+++ b/kubernetes.yaml
@@ -603,12 +603,6 @@ spec:
periodSeconds: 5
timeoutSeconds: 3
failureThreshold: 40
- livenessProbe:
- tcpSocket:
- port: 10051
- timeoutSeconds: 3
- failureThreshold: 3
- periodSeconds: 10
securityContext:
capabilities: {}
privileged: false