Merge pull request #1176 from zabbix/fix_style_trunk

Fix style trunk

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+repos:
 - repo: https://github.com/gitleaks/gitleaks
   rev: v8.16.3
   hooks:
@@ -10,11 +11,31 @@
   rev: v4.5.0
   hooks:
   - id: end-of-file-fixer
-   - id: trailing-whitespace
+    exclude: |
-   - id: check-yaml
+     (?x)(
-   - id: check-symlinks
+         ^env_vars/\.MYSQL |
-   - id: pretty-format-json
+         ^env_vars/\.POSTGRES
--   repo: https://github.com/asottile/setup-cfg-fmt
+     )
-    rev: v2.5.0
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.5.0
   hooks:
-    -   id: setup-cfg-fmt
+  - 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']

Dockerfiles/build-mysql/alpine/conf/agent2_build.patch

@@ -1,13 +0,0 @@
-diff --git a/src/go/Makefile.am b/src/go/Makefile.am
-index 2dd9e84e4ea..74bc3fbb91e 100644
---- a/src/go/Makefile.am
-+++ b/src/go/Makefile.am
-@@ -49,7 +49,7 @@ endif
- all: build
- 
- zabbix.com/cmd/zabbix_agent2:
--	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
-+	CGO_CFLAGS="${CGO_CFLAGS} -D_LARGEFILE64_SOURCE" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
- 
- zabbix.com/cmd/zabbix_web_service:
- 	go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service

Dockerfiles/build-pgsql/alpine/conf/agent2_build.patch

@@ -1,13 +0,0 @@
-diff --git a/src/go/Makefile.am b/src/go/Makefile.am
-index 2dd9e84e4ea..74bc3fbb91e 100644
---- a/src/go/Makefile.am
-+++ b/src/go/Makefile.am
-@@ -49,7 +49,7 @@ endif
- all: build
- 
- zabbix.com/cmd/zabbix_agent2:
--	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
-+	CGO_CFLAGS="${CGO_CFLAGS} -D_LARGEFILE64_SOURCE" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
- 
- zabbix.com/cmd/zabbix_web_service:
- 	go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service

Dockerfiles/build-sqlite3/alpine/conf/agent2_build.patch

@@ -1,13 +0,0 @@
-diff --git a/src/go/Makefile.am b/src/go/Makefile.am
-index 2dd9e84e4ea..74bc3fbb91e 100644
---- a/src/go/Makefile.am
-+++ b/src/go/Makefile.am
-@@ -49,7 +49,7 @@ endif
- all: build
- 
- zabbix.com/cmd/zabbix_agent2:
--	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
-+	CGO_CFLAGS="${CGO_CFLAGS} -D_LARGEFILE64_SOURCE" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
- 
- zabbix.com/cmd/zabbix_web_service:
- 	go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service

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
-

build.json

@@ -6,29 +6,29 @@
       "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 },

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