Compare commits
16 Commits
Author | SHA1 | Date |
---|---|---|
Paolo Asperti | e6f5f4092c | |
Paolo Asperti | 47d32d669b | |
Paolo Asperti | f05bb63007 | |
Paolo Asperti | 7759ca9ec7 | |
Paolo Asperti | bcba8d258f | |
Paolo Asperti | 1045ebebd0 | |
Paolo Asperti | e0737632f8 | |
Paolo Asperti | c37da6b538 | |
Paolo Asperti | 83e7d0bc1f | |
Paolo Asperti | eee92ba7f2 | |
Paolo Asperti | 3b8cab00ad | |
Paolo Asperti | c975d7d2b6 | |
Paolo Asperti | 46c224cd9f | |
Paolo Asperti | c2eef2b279 | |
Paolo Asperti | b9fedb034e | |
Paolo Asperti | aac9975a01 |
|
@ -3,10 +3,14 @@ FROM $BUILD_FROM
|
|||
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# Copy scripts for add-on
|
||||
COPY run.sh /
|
||||
COPY rootfs /
|
||||
|
||||
RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
|
||||
chmod a+x /run.sh
|
||||
RUN \
|
||||
apk add -U zabbix-agent2=6.0.13-r0 sudo && \
|
||||
addgroup -g 102 -S docker && \
|
||||
addgroup zabbix docker
|
||||
|
||||
CMD [ "/run.sh" ]
|
||||
LABEL \
|
||||
io.hass.version="0.2.6" \
|
||||
io.hass.type="addon" \
|
||||
io.hass.arch="amd64"
|
|
@ -3,10 +3,14 @@ FROM $BUILD_FROM
|
|||
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# Copy scripts for add-on
|
||||
COPY run.sh /
|
||||
COPY rootfs /
|
||||
|
||||
RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
|
||||
chmod a+x /run.sh
|
||||
RUN \
|
||||
apk add -U zabbix-agent2=6.0.13-r0 sudo && \
|
||||
addgroup -g 102 -S docker && \
|
||||
addgroup zabbix docker
|
||||
|
||||
CMD [ "/run.sh" ]
|
||||
LABEL \
|
||||
io.hass.version="0.2.6" \
|
||||
io.hass.type="addon" \
|
||||
io.hass.arch="armhf"
|
|
@ -3,10 +3,14 @@ FROM $BUILD_FROM
|
|||
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# Copy scripts for add-on
|
||||
COPY run.sh /
|
||||
COPY rootfs /
|
||||
|
||||
RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
|
||||
chmod a+x /run.sh
|
||||
RUN \
|
||||
apk add -U zabbix-agent2=6.0.13-r0 sudo && \
|
||||
addgroup -g 102 -S docker && \
|
||||
addgroup zabbix docker
|
||||
|
||||
CMD [ "/run.sh" ]
|
||||
LABEL \
|
||||
io.hass.version="0.2.6" \
|
||||
io.hass.type="addon" \
|
||||
io.hass.arch="aarch64"
|
|
@ -2,4 +2,8 @@
|
|||
|
||||
This addon enables a zabbix agent2 for the hassio instance.
|
||||
|
||||
You obviously neead a zabbix server for it to be meaningful.
|
||||
You obviously need a zabbix server for it to be meaningful.
|
||||
|
||||
## Docker access
|
||||
|
||||
If you need the agent to access the underlying docker, you need to disable the "Protection mode" switch and restart the container.
|
||||
|
|
|
@ -2,14 +2,16 @@
|
|||
"name": "Zabbix Agent 2",
|
||||
"url": "https://git.asperti.com/paspo/hassio-addons",
|
||||
"image": "docker.asperti.com/paspo/hassio-zabbix-agent2",
|
||||
"version": "0.2.0",
|
||||
"version": "0.2.6",
|
||||
"slug": "zabbix-agent2",
|
||||
"description": "Zabbix Agent 2 for hass.io",
|
||||
"startup": "services",
|
||||
"boot": "auto",
|
||||
"hassio_api": true,
|
||||
"docker_api": true,
|
||||
"audio": false,
|
||||
"gpio": false,
|
||||
"init": false,
|
||||
"arch": [
|
||||
"aarch64",
|
||||
"amd64"
|
||||
|
@ -17,6 +19,9 @@
|
|||
"ports": {
|
||||
"10050/tcp": 10050
|
||||
},
|
||||
"ports_description": {
|
||||
"10050/tcp": "Zabbix Agent port (used by Zabbix Server and/or proxies)"
|
||||
},
|
||||
"map": [
|
||||
"share"
|
||||
],
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Instead of enforcing this requirement, we let the user choose
|
||||
# if he/she wants to access docker: if so, disabling the "protection mode" is mandatory
|
||||
|
||||
exit 0
|
||||
|
||||
#!/usr/bin/with-contenv bashio
|
||||
#bashio::require.unprotected
|
|
@ -0,0 +1,8 @@
|
|||
#!/usr/bin/execlineb -S0
|
||||
# ==============================================================================
|
||||
# Take down the S6 supervision tree when zabbix-agent2 fails
|
||||
# ==============================================================================
|
||||
if { s6-test ${1} -ne 0 }
|
||||
if { s6-test ${1} -ne 256 }
|
||||
|
||||
s6-svscanctl -t /var/run/s6/services
|
|
@ -0,0 +1,41 @@
|
|||
#!/usr/bin/with-contenv bashio
|
||||
# ==============================================================================
|
||||
# Start zabbix-agent2 service if enabled
|
||||
# ==============================================================================
|
||||
|
||||
set -e
|
||||
|
||||
CONFIG_PATH=/data/options.json
|
||||
CUSTOM_CFG_PATH=/share/zabbix-agent2
|
||||
|
||||
SERVER_OLD=$(jq --raw-output ".server" $CONFIG_PATH)
|
||||
SERVER="$(bashio::config 'server' $SERVER_OLD)"
|
||||
HOSTNAME_OLD=$(jq --raw-output ".hostname" $CONFIG_PATH)
|
||||
HOSTNAME="$(bashio::config 'hostname' $HOSTNAME_OLD)"
|
||||
|
||||
if [ ! -d "$CUSTOM_CFG_PATH" ] ; then
|
||||
bashio::log.info "Creating a folder for custom configuration"
|
||||
mkdir -p "$CUSTOM_CFG_PATH"
|
||||
fi
|
||||
|
||||
echo "
|
||||
Server=$SERVER
|
||||
ServerActive=$SERVER
|
||||
Hostname=$HOSTNAME
|
||||
LogType=console
|
||||
PidFile=/var/run/zabbix/zabbix_agent2.pid
|
||||
Include=${CUSTOM_CFG_PATH}/*.conf
|
||||
" > /etc/zabbix/zabbix_agent2.conf
|
||||
|
||||
bashio::log.info "Starting zabbix-agent2"
|
||||
sudo -u zabbix zabbix_agent2 -f &
|
||||
AGENT_PID=$!
|
||||
|
||||
# Register stop
|
||||
function stop_agent() {
|
||||
killall zabbix_agent2
|
||||
exit 0
|
||||
}
|
||||
trap "stop_agent" SIGTERM SIGHUP
|
||||
|
||||
wait "${AGENT_PID}"
|
22
run.sh
22
run.sh
|
@ -1,22 +0,0 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
CONFIG_PATH=/data/options.json
|
||||
CUSTOM_CFG_PATH=/share/zabbix-agent2
|
||||
|
||||
SERVER=$(jq --raw-output ".server" $CONFIG_PATH)
|
||||
HOSTNAME=$(jq --raw-output ".hostname" $CONFIG_PATH)
|
||||
|
||||
if [ ! -d "$CUSTOM_CFG_PATH" ] ; then
|
||||
mkdir -p "$CUSTOM_CFG_PATH"
|
||||
fi
|
||||
|
||||
echo "
|
||||
Server=$SERVER
|
||||
ServerActive=$SERVER
|
||||
Hostname=$HOSTNAME
|
||||
LogType=console
|
||||
Include=${CUSTOM_CFG_PATH}/*.conf
|
||||
" > /etc/zabbix/zabbix_agent2.conf
|
||||
|
||||
sudo -u zabbix zabbix_agent2 -f
|
Loading…
Reference in New Issue