mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-25 01:04:01 +01:00
Added Zabbix agent 2 Ubuntu image
This commit is contained in:
parent
13cfbd80df
commit
0bf2a20d6c
@ -18,11 +18,11 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi
|
||||
|
||||
Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported)
|
||||
Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported)
|
||||
Zabbix agent 2 5.0 (tags: alpine-5.0-latest)
|
||||
Zabbix agent 2 5.0.* (tags: alpine-5.0.*)
|
||||
Zabbix agent 2 5.2 (tags: alpine-5.2-latest, alpine-latest, latest)
|
||||
Zabbix agent 2 5.2.* (tags: alpine-5.2.*)
|
||||
Zabbix agent 2 5.4 (tags: alpine-trunk)
|
||||
Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest)
|
||||
Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest)
|
||||
Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk)
|
||||
|
||||
Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
|
||||
|
||||
|
@ -18,11 +18,11 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi
|
||||
|
||||
Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported)
|
||||
Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported)
|
||||
Zabbix agent 2 5.0 (tags: alpine-5.0-latest)
|
||||
Zabbix agent 2 5.0.* (tags: alpine-5.0.*)
|
||||
Zabbix agent 2 5.2 (tags: alpine-5.2-latest, alpine-latest, latest)
|
||||
Zabbix agent 2 5.2.* (tags: alpine-5.2.*)
|
||||
Zabbix agent 2 5.4 (tags: alpine-trunk)
|
||||
Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest)
|
||||
Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest)
|
||||
Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk)
|
||||
|
||||
Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
|
||||
|
||||
|
1
agent2/ubuntu/.dockerignore
Normal file
1
agent2/ubuntu/.dockerignore
Normal file
@ -0,0 +1 @@
|
||||
build.sh
|
128
agent2/ubuntu/Dockerfile
Normal file
128
agent2/ubuntu/Dockerfile
Normal file
@ -0,0 +1,128 @@
|
||||
FROM ubuntu:focal
|
||||
|
||||
LABEL org.opencontainers.image.title="Zabbix agent 2" \
|
||||
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||
org.opencontainers.image.vendor="Zabbix LLC" \
|
||||
org.opencontainers.image.url="https://zabbix.com/" \
|
||||
org.opencontainers.image.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \
|
||||
org.opencontainers.image.licenses="GPL v2.0"
|
||||
|
||||
STOPSIGNAL SIGTERM
|
||||
|
||||
RUN set -eux && \
|
||||
ARCH_SUFFIX="$(arch)"; \
|
||||
case "$ARCH_SUFFIX" in \
|
||||
i686) export ARCH_SUFFIX='i386' ;; \
|
||||
x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
|
||||
aarch64) export ARCH_SUFFIX='arm64' ;; \
|
||||
armv7l) export ARCH_SUFFIX='armhf' ;; \
|
||||
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
|
||||
s390x) export ARCH_SUFFIX='s390x' ;; \
|
||||
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
|
||||
esac; \
|
||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||
groupadd --system --gid 1995 zabbix && \
|
||||
useradd \
|
||||
--system --comment "Zabbix monitoring system" \
|
||||
-g zabbix -G root \
|
||||
--uid 1997 \
|
||||
--shell /sbin/nologin \
|
||||
--home-dir /var/lib/zabbix/ \
|
||||
zabbix && \
|
||||
mkdir -p /etc/zabbix && \
|
||||
mkdir -p /etc/zabbix/zabbix_agentd.d && \
|
||||
mkdir -p /var/lib/zabbix && \
|
||||
mkdir -p /var/lib/zabbix/enc && \
|
||||
mkdir -p /var/lib/zabbix/modules && \
|
||||
apt-get -y update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
|
||||
tini \
|
||||
tzdata \
|
||||
ca-certificates \
|
||||
libssl1.1 \
|
||||
libcurl4 \
|
||||
libldap-2.4 && \
|
||||
apt-get -y autoremove && \
|
||||
apt-get -y clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=5.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.10
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||
org.opencontainers.image.version="${ZBX_VERSION}" \
|
||||
org.opencontainers.image.source="${ZBX_SOURCES}"
|
||||
|
||||
RUN set -eux && \
|
||||
apt-get -y update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
|
||||
autoconf \
|
||||
automake \
|
||||
libpcre3-dev \
|
||||
libssl-dev \
|
||||
zlib1g-dev \
|
||||
make \
|
||||
pkg-config \
|
||||
git \
|
||||
gcc \
|
||||
golang && \
|
||||
cd /tmp/ && \
|
||||
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
|
||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||
./bootstrap.sh && \
|
||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||
./configure \
|
||||
--datadir=/usr/lib \
|
||||
--libdir=/usr/lib/zabbix \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc/zabbix \
|
||||
--prefix=/usr \
|
||||
--with-openssl \
|
||||
--enable-ipv6 \
|
||||
--enable-agent2 \
|
||||
--enable-agent \
|
||||
--silent && \
|
||||
make -j"$(nproc)" -s && \
|
||||
cp /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 /usr/sbin/zabbix_agent2 && \
|
||||
cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
|
||||
cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
|
||||
cp /tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_agent2.conf /etc/zabbix/zabbix_agent2.conf && \
|
||||
strip /usr/sbin/zabbix_agent2 && \
|
||||
strip /usr/bin/zabbix_get && \
|
||||
strip /usr/bin/zabbix_sender && \
|
||||
cd /tmp/ && \
|
||||
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||
apt-get -y purge \
|
||||
autoconf \
|
||||
automake \
|
||||
libpcre3-dev \
|
||||
libssl-dev \
|
||||
zlib1g-dev \
|
||||
make \
|
||||
pkg-config \
|
||||
git \
|
||||
gcc \
|
||||
golang && \
|
||||
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
|
||||
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
|
||||
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
|
||||
apt-get -y autoremove && \
|
||||
apt-get -y clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
EXPOSE 10050/TCP
|
||||
|
||||
WORKDIR /var/lib/zabbix
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
CMD ["/usr/sbin/zabbix_agent2", "--foreground", "-c", "/etc/zabbix/zabbix_agent2.conf"]
|
215
agent2/ubuntu/README.md
Normal file
215
agent2/ubuntu/README.md
Normal file
@ -0,0 +1,215 @@
|
||||
![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png)
|
||||
|
||||
# What is Zabbix?
|
||||
|
||||
Zabbix is an enterprise-class open source distributed monitoring solution.
|
||||
|
||||
Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.
|
||||
|
||||
For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com
|
||||
|
||||
# What is Zabbix agent 2?
|
||||
|
||||
Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications (hard drives, memory, processor statistics etc).
|
||||
|
||||
# Zabbix agent 2 images
|
||||
|
||||
These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.12 images. The available versions of Zabbix agent 2 are:
|
||||
|
||||
Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported)
|
||||
Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported)
|
||||
Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest)
|
||||
Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest)
|
||||
Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.0.*)
|
||||
Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk)
|
||||
|
||||
Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
|
||||
|
||||
# How to use this image
|
||||
|
||||
## Start `zabbix-agent2`
|
||||
|
||||
Start a Zabbix agent 2 container as follows:
|
||||
|
||||
docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" -d zabbix/zabbix-agent2:tag
|
||||
|
||||
Where `some-zabbix-agent2` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent2/tags/).
|
||||
|
||||
## Connects from Zabbix server or Zabbix proxy in other containers (Passive checks)
|
||||
|
||||
This image exposes the standard Zabbix agent 2 port (``10050``) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container:
|
||||
|
||||
```console
|
||||
$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 -d zabbix/zabbix-server:latest
|
||||
```
|
||||
|
||||
## Connect to Zabbix server or Zabbix proxy containers (Active checks)
|
||||
|
||||
This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containterns:
|
||||
|
||||
```console
|
||||
$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent2:latest
|
||||
```
|
||||
|
||||
## Container shell access and viewing Zabbix agent 2 logs
|
||||
|
||||
The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-agent2` container:
|
||||
|
||||
```console
|
||||
$ docker exec -ti some-zabbix-agent /bin/bash
|
||||
```
|
||||
|
||||
The Zabbix agent 2 log is available through Docker's container log:
|
||||
|
||||
```console
|
||||
$ docker logs some-zabbix-agent
|
||||
```
|
||||
|
||||
## Privileged mode
|
||||
|
||||
By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example:
|
||||
|
||||
```console
|
||||
$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent2:latest
|
||||
```
|
||||
```console
|
||||
$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent2:latest
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
When you start the `zabbix-agent2` image, you can adjust the configuration of the Zabbix agent 2 by passing one or more environment variables on the `docker run` command line.
|
||||
|
||||
### `ZBX_HOSTNAME`
|
||||
|
||||
This variable is unique, case sensitive hostname. By default, value is `hostname` of the container. It is ``Hostname`` parameter in ``zabbix_agent2.conf``.
|
||||
|
||||
### `ZBX_SERVER_HOST`
|
||||
|
||||
This variable is IP or DNS name of Zabbix server or Zabbix proxy. By default, value is `zabbix-server`. It is ``Server`` parameter in ``zabbix_agent2.conf``. It is allowed to specify Zabbix server or Zabbix proxy port number using ``ZBX_SERVER_PORT`` variable. It make sense in case of non-default port for active checks.
|
||||
|
||||
### `ZBX_PASSIVE_ALLOW`
|
||||
|
||||
This variable is boolean (``true`` or ``false``) and enables or disables feature of passive checks. By default, value is `true`.
|
||||
|
||||
### `ZBX_PASSIVESERVERS`
|
||||
|
||||
The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container.
|
||||
|
||||
### `ZBX_ACTIVE_ALLOW`
|
||||
|
||||
This variable is boolean (``true`` or ``false``) and enables or disables feature of active checks. By default, value is `true`.
|
||||
|
||||
### `ZBX_ACTIVESERVERS`
|
||||
|
||||
The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent 2 container. You may specify port of Zabbix server or Zabbix proxy in such syntax: ``zabbix-server:10061,zabbix-proxy:10072``.
|
||||
|
||||
### `ZBX_DEBUGLEVEL`
|
||||
|
||||
The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_agent2.conf``. Allowed values are listed below:
|
||||
- ``0`` - basic information about starting and stopping of Zabbix processes;
|
||||
- ``1`` - critical information
|
||||
- ``2`` - error information
|
||||
- ``3`` - warnings
|
||||
- ``4`` - for debugging (produces lots of information)
|
||||
- ``5`` - extended debugging (produces even more information)
|
||||
|
||||
### `ZBX_TIMEOUT`
|
||||
|
||||
The variable is used to specify timeout for processing checks. By default, value is ``3``.
|
||||
|
||||
### Other variables
|
||||
|
||||
Additionally the image allows to specify many other environment variables listed below:
|
||||
|
||||
```
|
||||
ZBX_ENABLEPERSISTENTBUFFER=false # Available since 5.0.0
|
||||
ZBX_PERSISTENTBUFFERPERIOD=1h # Available since 5.0.0
|
||||
ZBX_ENABLESTATUSPORT=
|
||||
ZBX_SOURCEIP=
|
||||
ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
|
||||
ZBX_LOGREMOTECOMMANDS=0
|
||||
ZBX_STARTAGENTS=3
|
||||
ZBX_HOSTNAMEITEM=system.hostname
|
||||
ZBX_METADATA=
|
||||
ZBX_METADATAITEM=
|
||||
ZBX_REFRESHACTIVECHECKS=120
|
||||
ZBX_BUFFERSEND=5
|
||||
ZBX_BUFFERSIZE=100
|
||||
ZBX_MAXLINESPERSECOND=20
|
||||
ZBX_LISTENIP=
|
||||
ZBX_UNSAFEUSERPARAMETERS=0
|
||||
ZBX_TLSCONNECT=unencrypted
|
||||
ZBX_TLSACCEPT=unencrypted
|
||||
ZBX_TLSCAFILE=
|
||||
ZBX_TLSCRLFILE=
|
||||
ZBX_TLSSERVERCERTISSUER=
|
||||
ZBX_TLSSERVERCERTSUBJECT=
|
||||
ZBX_TLSCERTFILE=
|
||||
ZBX_TLSKEYFILE=
|
||||
ZBX_TLSPSKIDENTITY=
|
||||
ZBX_TLSPSKFILE=
|
||||
ZBX_DENYKEY=system.run[*] # Available since 5.0.0
|
||||
ZBX_ALLOWKEY= # Available since 5.0.0
|
||||
```
|
||||
|
||||
Default values of these variables are specified after equal sign.
|
||||
|
||||
The allowed variables are identical of parameters in official ``zabbix_agent2.conf`` configuration file. For example, ``ZBX_REFRESHACTIVECHECKS`` = ``RefreshActiveChecks``.
|
||||
|
||||
Please use official documentation for [``zabbix_agent2.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_agent2) to get more information about the variables.
|
||||
|
||||
## Allowed volumes for the Zabbix agent 2 container
|
||||
|
||||
### ``/etc/zabbix/zabbix_agentd.d``
|
||||
|
||||
The volume allows include ``*.conf`` files and extend Zabbix agent 2 using ``UserParameter`` feature.
|
||||
|
||||
### ``/var/lib/zabbix/enc``
|
||||
|
||||
The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSKEY_FILE`` and ``ZBX_TLSPSKFILE`` variables.
|
||||
|
||||
### ``/var/lib/zabbix/buffer``
|
||||
|
||||
The volume is used to store the file, where Zabbix Agent2 should keep SQLite database. To enable the feature specify ``ZBX_ENABLEPERSISTENTBUFFER=true``. Available since 5.0.0.
|
||||
|
||||
# The image variants
|
||||
|
||||
The `zabbix-agent2` images come in many flavors, each designed for a specific use case.
|
||||
|
||||
## `zabbix-agent2:alpine-<version>`
|
||||
|
||||
This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
|
||||
|
||||
This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
|
||||
|
||||
To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
|
||||
|
||||
# Supported Docker versions
|
||||
|
||||
This image is officially supported on Docker version 1.12.0.
|
||||
|
||||
Support for older versions (down to 1.6) is provided on a best-effort basis.
|
||||
|
||||
Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
|
||||
|
||||
# User Feedback
|
||||
|
||||
## Documentation
|
||||
|
||||
Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request.
|
||||
|
||||
## Issues
|
||||
|
||||
If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues).
|
||||
|
||||
### Known issues
|
||||
|
||||
Currently it is not allowed to specify ``ZBX_ALIAS`` environment variable. Please use ``/etc/zabbix/zabbix_agent.d`` volume with additional configuration files with ``Alias`` options.
|
||||
|
||||
## Contributing
|
||||
|
||||
You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
|
||||
|
||||
Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
|
1
agent2/ubuntu/build.sh
Symbolic link
1
agent2/ubuntu/build.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../../build.sh
|
217
agent2/ubuntu/docker-entrypoint.sh
Executable file
217
agent2/ubuntu/docker-entrypoint.sh
Executable file
@ -0,0 +1,217 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -o pipefail
|
||||
|
||||
set +e
|
||||
|
||||
# Script trace mode
|
||||
if [ "${DEBUG_MODE}" == "true" ]; then
|
||||
set -o xtrace
|
||||
fi
|
||||
|
||||
# Default Zabbix installation name
|
||||
# Default Zabbix server host
|
||||
: ${ZBX_SERVER_HOST:="zabbix-server"}
|
||||
# Default Zabbix server port number
|
||||
: ${ZBX_SERVER_PORT:="10051"}
|
||||
|
||||
# Default directories
|
||||
# User 'zabbix' home directory
|
||||
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
|
||||
# Configuration files directory
|
||||
ZABBIX_ETC_DIR="/etc/zabbix"
|
||||
|
||||
escape_spec_char() {
|
||||
local var_value=$1
|
||||
|
||||
var_value="${var_value//\\/\\\\}"
|
||||
var_value="${var_value//[$'\n']/}"
|
||||
var_value="${var_value//\//\\/}"
|
||||
var_value="${var_value//./\\.}"
|
||||
var_value="${var_value//\*/\\*}"
|
||||
var_value="${var_value//^/\\^}"
|
||||
var_value="${var_value//\$/\\\$}"
|
||||
var_value="${var_value//\&/\\\&}"
|
||||
var_value="${var_value//\[/\\[}"
|
||||
var_value="${var_value//\]/\\]}"
|
||||
|
||||
echo "$var_value"
|
||||
}
|
||||
|
||||
update_config_var() {
|
||||
local config_path=$1
|
||||
local var_name=$2
|
||||
local var_value=$3
|
||||
local is_multiple=$4
|
||||
|
||||
local masklist=("TLSPSKIdentity")
|
||||
|
||||
if [ ! -f "$config_path" ]; then
|
||||
echo "**** Configuration file '$config_path' does not exist"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
|
||||
echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
|
||||
else
|
||||
echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
|
||||
fi
|
||||
|
||||
# Remove configuration parameter definition in case of unset parameter value
|
||||
if [ -z "$var_value" ]; then
|
||||
sed -i -e "/^$var_name=/d" "$config_path"
|
||||
echo "removed"
|
||||
return
|
||||
fi
|
||||
|
||||
# Remove value from configuration parameter in case of double quoted parameter value
|
||||
if [ "$var_value" == '""' ]; then
|
||||
sed -i -e "/^$var_name=/s/=.*/=/" "$config_path"
|
||||
echo "undefined"
|
||||
return
|
||||
fi
|
||||
|
||||
# Use full path to a file for TLS related configuration parameters
|
||||
if [[ $var_name =~ ^TLS.*File$ ]]; then
|
||||
var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
|
||||
fi
|
||||
|
||||
# Escaping characters in parameter value and name
|
||||
var_value=$(escape_spec_char "$var_value")
|
||||
var_name=$(escape_spec_char "$var_name")
|
||||
|
||||
if [ "$(grep -E "^$var_name=" $config_path)" ] && [ "$is_multiple" != "true" ]; then
|
||||
sed -i -e "/^$var_name=/s/=.*/=$var_value/" "$config_path"
|
||||
echo "updated"
|
||||
elif [ "$(grep -Ec "^# $var_name=" $config_path)" -gt 1 ]; then
|
||||
sed -i -e "/^[#;] $var_name=$/i\\$var_name=$var_value" "$config_path"
|
||||
echo "added first occurrence"
|
||||
elif [ "$(grep -Ec "^[#;] $var_name=" $config_path)" -gt 0 ]; then
|
||||
sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=$var_value/" "$config_path"
|
||||
echo "added"
|
||||
else
|
||||
sed -i -e '$a\' -e "$var_name=$var_value" "$config_path"
|
||||
echo "added at the end"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
update_config_multiple_var() {
|
||||
local config_path=$1
|
||||
local var_name=$2
|
||||
local var_value=$3
|
||||
|
||||
var_value="${var_value%\"}"
|
||||
var_value="${var_value#\"}"
|
||||
|
||||
local IFS=,
|
||||
local OPT_LIST=($var_value)
|
||||
|
||||
for value in "${OPT_LIST[@]}"; do
|
||||
update_config_var $config_path $var_name $value true
|
||||
done
|
||||
}
|
||||
|
||||
prepare_zbx_agent_config() {
|
||||
echo "** Preparing Zabbix agent configuration file"
|
||||
ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agent2.conf
|
||||
|
||||
: ${ZBX_PASSIVESERVERS:=""}
|
||||
: ${ZBX_ACTIVESERVERS:=""}
|
||||
|
||||
[ -n "$ZBX_PASSIVESERVERS" ] && ZBX_PASSIVESERVERS=","$ZBX_PASSIVESERVERS
|
||||
|
||||
ZBX_PASSIVESERVERS=$ZBX_SERVER_HOST$ZBX_PASSIVESERVERS
|
||||
|
||||
[ -n "$ZBX_ACTIVESERVERS" ] && ZBX_ACTIVESERVERS=","$ZBX_ACTIVESERVERS
|
||||
|
||||
ZBX_ACTIVESERVERS=$ZBX_SERVER_HOST":"$ZBX_SERVER_PORT$ZBX_ACTIVESERVERS
|
||||
|
||||
update_config_var $ZBX_AGENT_CONFIG "PidFile"
|
||||
update_config_var $ZBX_AGENT_CONFIG "LogType" "console"
|
||||
update_config_var $ZBX_AGENT_CONFIG "LogFile"
|
||||
update_config_var $ZBX_AGENT_CONFIG "LogFileSize"
|
||||
update_config_var $ZBX_AGENT_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "SourceIP"
|
||||
update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
|
||||
|
||||
: ${ZBX_PASSIVE_ALLOW:="true"}
|
||||
if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then
|
||||
echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks"
|
||||
update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}"
|
||||
else
|
||||
update_config_var $ZBX_AGENT_CONFIG "Server"
|
||||
fi
|
||||
|
||||
update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
|
||||
: ${ZBX_ACTIVE_ALLOW:="true"}
|
||||
if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then
|
||||
echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks"
|
||||
update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}"
|
||||
else
|
||||
update_config_var $ZBX_AGENT_CONFIG "ServerActive"
|
||||
fi
|
||||
|
||||
if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then
|
||||
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
|
||||
update_config_var $ZBX_AGENT_CONFIG "PersistentBufferFile" "$ZABBIX_USER_HOME_DIR/buffer/"
|
||||
update_config_var $ZBX_AGENT_CONFIG "PersistentBufferPeriod" "${ZBX_PERSISTENTBUFFERPERIOD}"
|
||||
else
|
||||
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "0"
|
||||
fi
|
||||
|
||||
if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then
|
||||
update_config_var $ZBX_AGENT_CONFIG "StatusPort" "31999"
|
||||
fi
|
||||
|
||||
# update_config_var $ZBX_AGENT_CONFIG "HostInterface" "${ZBX_HOSTINTERFACE}"
|
||||
# update_config_var $ZBX_AGENT_CONFIG "HostInterfaceItem" "${ZBX_HOSTINTERFACEITEM}"
|
||||
|
||||
update_config_var $ZBX_AGENT_CONFIG "Hostname" "${ZBX_HOSTNAME}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "HostMetadata" "${ZBX_METADATA}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "HostMetadataItem" "${ZBX_METADATAITEM}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "RefreshActiveChecks" "${ZBX_REFRESHACTIVECHECKS}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "BufferSend" "${ZBX_BUFFERSEND}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "BufferSize" "${ZBX_BUFFERSIZE}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "MaxLinesPerSecond" "${ZBX_MAXLINESPERSECOND}"
|
||||
# Please use include to enable Alias feature
|
||||
# update_config_multiple_var $ZBX_AGENT_CONFIG "Alias" ${ZBX_ALIAS}
|
||||
update_config_var $ZBX_AGENT_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "Include" "/etc/zabbix/zabbix_agentd.d/"
|
||||
update_config_var $ZBX_AGENT_CONFIG "UnsafeUserParameters" "${ZBX_UNSAFEUSERPARAMETERS}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
|
||||
update_config_var $ZBX_AGENT_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
|
||||
|
||||
update_config_multiple_var $ZBX_AGENT_CONFIG "DenyKey" "${ZBX_DENYKEY}"
|
||||
update_config_multiple_var $ZBX_AGENT_CONFIG "AllowKey" "${ZBX_ALLOWKEY}"
|
||||
}
|
||||
|
||||
prepare_agent() {
|
||||
echo "** Preparing Zabbix agent"
|
||||
prepare_zbx_agent_config
|
||||
}
|
||||
|
||||
#################################################
|
||||
|
||||
if [ "${1#-}" != "$1" ]; then
|
||||
set -- /usr/sbin/zabbix_agent2 "$@"
|
||||
fi
|
||||
|
||||
if [ "$1" == '/usr/sbin/zabbix_agent2' ]; then
|
||||
prepare_agent
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
|
||||
#################################################
|
13
agent2/ubuntu/hooks/build
Executable file
13
agent2/ubuntu/hooks/build
Executable file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Additional information: https://docs.docker.com/docker-cloud/builds/advanced/
|
||||
#
|
||||
|
||||
MAJOR_VERSION=$(cat Dockerfile | grep "ARG MAJOR_VERSION" | cut -f2 -d"=")
|
||||
MINOR_VERSION=$(cat Dockerfile | grep "ARG ZBX_VERSION" | cut -f2 -d".")
|
||||
|
||||
VCS_REF=$MAJOR_VERSION.$MINOR_VERSION
|
||||
BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
|
||||
|
||||
echo "$BUILD_DATE - Building $VCS_REF version..."
|
||||
docker build --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$BUILD_DATE" -t $IMAGE_NAME .
|
Loading…
Reference in New Issue
Block a user