From 600c69975b4b5eb120baf0168090e72b9db7f03f Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 10 Jun 2021 17:35:33 -0400 Subject: [PATCH 1/2] Added Oracle Linux 8 images instead of CentOS 8 --- java-gateway/alpine/README.md | 2 +- java-gateway/centos/README.md | 2 +- java-gateway/ubuntu/README.md | 2 +- proxy-mysql/alpine/README.md | 2 +- proxy-mysql/centos/README.md | 2 +- proxy-mysql/ubuntu/README.md | 2 +- proxy-sqlite3/alpine/README.md | 2 +- proxy-sqlite3/centos/README.md | 2 +- proxy-sqlite3/ubuntu/README.md | 2 +- server-mysql/alpine/README.md | 2 +- server-mysql/centos/README.md | 2 +- server-mysql/ubuntu/README.md | 2 +- server-pgsql/alpine/README.md | 6 +++--- server-pgsql/centos/README.md | 6 +++--- server-pgsql/ubuntu/README.md | 6 +++--- snmptraps/alpine/README.md | 6 +++--- snmptraps/centos/README.md | 6 +++--- snmptraps/ubuntu/README.md | 6 +++--- web-apache-mysql/alpine/README.md | 6 +++--- web-apache-mysql/centos/README.md | 6 +++--- web-apache-mysql/ubuntu/README.md | 6 +++--- web-apache-pgsql/alpine/README.md | 6 +++--- web-apache-pgsql/centos/README.md | 6 +++--- web-apache-pgsql/ubuntu/README.md | 6 +++--- web-nginx-mysql/alpine/README.md | 6 +++--- web-nginx-mysql/centos/README.md | 6 +++--- web-nginx-mysql/ubuntu/README.md | 6 +++--- web-nginx-pgsql/alpine/README.md | 6 +++--- web-nginx-pgsql/centos/README.md | 6 +++--- web-nginx-pgsql/ubuntu/README.md | 6 +++--- 30 files changed, 66 insertions(+), 66 deletions(-) diff --git a/java-gateway/alpine/README.md b/java-gateway/alpine/README.md index 7897ada12..66b6e0d1e 100644 --- a/java-gateway/alpine/README.md +++ b/java-gateway/alpine/README.md @@ -112,7 +112,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-java-gateway: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 diff --git a/java-gateway/centos/README.md b/java-gateway/centos/README.md index 7897ada12..66b6e0d1e 100644 --- a/java-gateway/centos/README.md +++ b/java-gateway/centos/README.md @@ -112,7 +112,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-java-gateway: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 diff --git a/java-gateway/ubuntu/README.md b/java-gateway/ubuntu/README.md index 7897ada12..66b6e0d1e 100644 --- a/java-gateway/ubuntu/README.md +++ b/java-gateway/ubuntu/README.md @@ -112,7 +112,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-java-gateway: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 diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index f3db6d851..8f7bfb558 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -290,7 +290,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-mysql: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. diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index f3db6d851..8f7bfb558 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -290,7 +290,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-mysql: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. diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index f3db6d851..8f7bfb558 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -290,7 +290,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-mysql: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. diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index a1b2cb423..bcd4c5b1a 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -248,7 +248,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-sqlite3: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. diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index a1b2cb423..bcd4c5b1a 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -248,7 +248,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-sqlite3: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. diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index a1b2cb423..bcd4c5b1a 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -248,7 +248,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-proxy-sqlite3: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. diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 4253197e0..100ea342f 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -273,7 +273,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-server-mysql: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. diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index 4253197e0..100ea342f 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -273,7 +273,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-server-mysql: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. diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 4253197e0..100ea342f 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -273,7 +273,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git 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-` +## `zabbix-server-mysql: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. diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 1eef69d3c..7a42c8df8 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -258,7 +258,7 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-server-pgsql: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. @@ -266,11 +266,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-server-pgsql: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-` +## `zabbix-server-pgsql: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. diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index 1eef69d3c..7a42c8df8 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -258,7 +258,7 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-server-pgsql: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. @@ -266,11 +266,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-server-pgsql: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-` +## `zabbix-server-pgsql: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. diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 1eef69d3c..7a42c8df8 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -258,7 +258,7 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-server-pgsql: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. @@ -266,11 +266,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-server-pgsql: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-` +## `zabbix-server-pgsql: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. diff --git a/snmptraps/alpine/README.md b/snmptraps/alpine/README.md index b64578fd9..d638363c7 100644 --- a/snmptraps/alpine/README.md +++ b/snmptraps/alpine/README.md @@ -80,7 +80,7 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-snmptraps` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-snmptraps: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. @@ -88,11 +88,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-snmptraps: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-` +## `zabbix-snmptraps: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. diff --git a/snmptraps/centos/README.md b/snmptraps/centos/README.md index b64578fd9..d638363c7 100644 --- a/snmptraps/centos/README.md +++ b/snmptraps/centos/README.md @@ -80,7 +80,7 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-snmptraps` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-snmptraps: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. @@ -88,11 +88,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-snmptraps: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-` +## `zabbix-snmptraps: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. diff --git a/snmptraps/ubuntu/README.md b/snmptraps/ubuntu/README.md index b64578fd9..d638363c7 100644 --- a/snmptraps/ubuntu/README.md +++ b/snmptraps/ubuntu/README.md @@ -80,7 +80,7 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-snmptraps` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-snmptraps: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. @@ -88,11 +88,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-snmptraps: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-` +## `zabbix-snmptraps: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. diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index f8f7becf5..4abddc592 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -232,7 +232,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-mysql: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. @@ -240,11 +240,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-mysql: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-` +## `zabbix-web-apache-mysql: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. diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index f8f7becf5..4abddc592 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -232,7 +232,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-mysql: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. @@ -240,11 +240,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-mysql: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-` +## `zabbix-web-apache-mysql: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. diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index f8f7becf5..4abddc592 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -232,7 +232,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-mysql: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. @@ -240,11 +240,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-mysql: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-` +## `zabbix-web-apache-mysql: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. diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 079d7fd94..427cbe27e 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-pgsql: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-` +## `zabbix-web-apache-pgsql: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. diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 079d7fd94..427cbe27e 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-pgsql: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-` +## `zabbix-web-apache-pgsql: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. diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 079d7fd94..427cbe27e 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-apache-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-apache-pgsql: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-` +## `zabbix-web-apache-pgsql: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. diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index f1dd2a515..ad48b1c5d 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -233,7 +233,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-mysql: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. @@ -241,11 +241,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-mysql: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-` +## `zabbix-web-nginx-mysql: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. diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index f1dd2a515..ad48b1c5d 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -233,7 +233,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-mysql: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. @@ -241,11 +241,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-mysql: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-` +## `zabbix-web-nginx-mysql: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. diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index f1dd2a515..ad48b1c5d 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -233,7 +233,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-mysql: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. @@ -241,11 +241,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-mysql: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-` +## `zabbix-web-nginx-mysql: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. diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index bacbf51e5..b0010dc3b 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-pgsql: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-` +## `zabbix-web-nginx-pgsql: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. diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index bacbf51e5..b0010dc3b 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-pgsql: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-` +## `zabbix-web-nginx-pgsql: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. diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index bacbf51e5..b0010dc3b 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -226,7 +226,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-agent2:alpine-` +## `zabbix-web-nginx-pgsql: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. @@ -234,11 +234,11 @@ This variant is highly recommended when final image size being as small as possi 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-` +## `zabbix-web-nginx-pgsql: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-` +## `zabbix-web-nginx-pgsql: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. From 7bf89628db2b2ff9e451762802d6d87785902469 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 4 Aug 2021 13:37:59 +0200 Subject: [PATCH 2/2] Fixed ZBX_TRAPPERTIMEOUT variable name --- .env_prx | 2 +- .env_srv | 2 +- .github/workflows/CI.yml | 2 +- proxy-mysql/alpine/README.md | 2 +- proxy-mysql/alpine/docker-entrypoint.sh | 2 +- proxy-mysql/centos/README.md | 2 +- proxy-mysql/centos/docker-entrypoint.sh | 2 +- proxy-mysql/ubuntu/README.md | 2 +- proxy-mysql/ubuntu/docker-entrypoint.sh | 2 +- proxy-sqlite3/alpine/README.md | 2 +- proxy-sqlite3/alpine/docker-entrypoint.sh | 2 +- proxy-sqlite3/centos/README.md | 2 +- proxy-sqlite3/centos/docker-entrypoint.sh | 2 +- proxy-sqlite3/ubuntu/README.md | 2 +- proxy-sqlite3/ubuntu/docker-entrypoint.sh | 2 +- server-mysql/alpine/README.md | 2 +- server-mysql/alpine/docker-entrypoint.sh | 2 +- server-mysql/centos/README.md | 2 +- server-mysql/centos/docker-entrypoint.sh | 2 +- server-mysql/ubuntu/README.md | 2 +- server-mysql/ubuntu/docker-entrypoint.sh | 2 +- server-pgsql/alpine/README.md | 2 +- server-pgsql/alpine/docker-entrypoint.sh | 2 +- server-pgsql/centos/README.md | 2 +- server-pgsql/centos/docker-entrypoint.sh | 2 +- server-pgsql/ubuntu/README.md | 2 +- server-pgsql/ubuntu/docker-entrypoint.sh | 2 +- zabbix-appliance/alpine/README.md | 2 +- zabbix-appliance/alpine/docker-entrypoint.sh | 2 +- zabbix-appliance/centos/README.md | 2 +- zabbix-appliance/centos/docker-entrypoint.sh | 2 +- zabbix-appliance/rhel/README.md | 2 +- zabbix-appliance/rhel/docker-entrypoint.sh | 2 +- zabbix-appliance/ubuntu/README.md | 2 +- zabbix-appliance/ubuntu/docker-entrypoint.sh | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.env_prx b/.env_prx index 9b68b7d0a..99d3972bf 100644 --- a/.env_prx +++ b/.env_prx @@ -34,7 +34,7 @@ # ZBX_HISTORYCACHESIZE=16M # ZBX_HISTORYINDEXCACHESIZE=4M # ZBX_TIMEOUT=4 -# ZBX_TRAPPERIMEOUT=300 +# ZBX_TRAPPERTIMEOUT=300 # ZBX_UNREACHABLEPERIOD=45 # ZBX_UNAVAILABLEDELAY=60 # ZBX_UNREACHABLEDELAY=15 diff --git a/.env_srv b/.env_srv index 26de82dd0..caf398c36 100644 --- a/.env_srv +++ b/.env_srv @@ -31,7 +31,7 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_TRENDCACHESIZE=4M # ZBX_VALUECACHESIZE=8M # ZBX_TIMEOUT=4 -# ZBX_TRAPPERIMEOUT=300 +# ZBX_TRAPPERTIMEOUT=300 # ZBX_UNREACHABLEPERIOD=45 # ZBX_UNAVAILABLEDELAY=60 # ZBX_UNREACHABLEDELAY=15 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 74a373b3b..54fce93a8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -70,7 +70,7 @@ jobs: - name: Prepare platform list id: platform run: | - DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" + DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" if [ "${{ matrix.build }}" == "agent2" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index 3d2794c41..0343e7500 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 9f2450b43..09b554963 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 9b949a8e3..68216a36c 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 39d39e097..d8be8580e 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 39d39e097..d8be8580e 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index ae3bf72f4..ab319d3e9 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 6db086bca..0f33fe261 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 6db086bca..0f33fe261 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index 34d455680..1cdead183 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index b15aa17e7..c76b004f4 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index b15aa17e7..c76b004f4 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index 37214bebf..33b907288 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/alpine/README.md b/zabbix-appliance/alpine/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/alpine/README.md +++ b/zabbix-appliance/alpine/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/alpine/docker-entrypoint.sh +++ b/zabbix-appliance/alpine/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/centos/README.md b/zabbix-appliance/centos/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/centos/README.md +++ b/zabbix-appliance/centos/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/centos/docker-entrypoint.sh +++ b/zabbix-appliance/centos/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/rhel/README.md b/zabbix-appliance/rhel/README.md index ae3c8be38..afd4138e2 100644 --- a/zabbix-appliance/rhel/README.md +++ b/zabbix-appliance/rhel/README.md @@ -141,7 +141,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index 23c832139..474a58a96 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/ubuntu/README.md b/zabbix-appliance/ubuntu/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/ubuntu/README.md +++ b/zabbix-appliance/ubuntu/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/ubuntu/docker-entrypoint.sh +++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"