From 38d9d66501bcec443c965b908f464b8127b27bfd Mon Sep 17 00:00:00 2001
From: Paolo Asperti <paolo@asperti.com>
Date: Mon, 13 Sep 2021 12:04:31 +0200
Subject: [PATCH] zabbix agent & agent2

---
 .drone.yml                |  59 +++++++++++++++++++++++++++++++++++++-
 zabbix-agent/Dockerfile   |   2 +-
 zabbix-agent/config.json  |   3 +-
 zabbix-agent2/Dockerfile  |  12 ++++++++
 zabbix-agent2/config.json |  32 +++++++++++++++++++++
 zabbix-agent2/icon.png    | Bin 0 -> 632 bytes
 zabbix-agent2/logo.png    | Bin 0 -> 3766 bytes
 zabbix-agent2/run.sh      |  22 ++++++++++++++
 8 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 zabbix-agent2/Dockerfile
 create mode 100644 zabbix-agent2/config.json
 create mode 100644 zabbix-agent2/icon.png
 create mode 100644 zabbix-agent2/logo.png
 create mode 100644 zabbix-agent2/run.sh

diff --git a/.drone.yml b/.drone.yml
index 0aba42e..12e0436 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -50,4 +50,61 @@ steps:
 trigger:
   event:
     - tag
-    - push
\ No newline at end of file
+    - push
+
+---
+
+kind: pipeline
+type: docker
+name: zabbix-agent
+
+steps:
+
+  - name: build_and_publish_zabbix-agent
+    image: plugins/docker:linux-amd64
+    settings:
+      dockerfile: zabbix-agent/Dockerfile
+      context: zabbix-agent
+      password:
+        from_secret: docker_password
+      registry: docker.asperti.com
+      repo: docker.asperti.com/paspo/hassio-zabbix-agent
+      tags:
+        - latest
+        - 0.1.4
+      username:
+        from_secret: docker_username
+
+trigger:
+  event:
+    - tag
+    - push
+
+
+---
+
+kind: pipeline
+type: docker
+name: zabbix-agent2
+
+steps:
+
+  - name: build_and_publish_zabbix-agent2
+    image: plugins/docker:linux-amd64
+    settings:
+      dockerfile: zabbix-agent2/Dockerfile
+      context: zabbix-agent2
+      password:
+        from_secret: docker_password
+      registry: docker.asperti.com
+      repo: docker.asperti.com/paspo/hassio-zabbix-agent2
+      tags:
+        - latest
+        - 0.1.1
+      username:
+        from_secret: docker_username
+
+trigger:
+  event:
+    - tag
+    - push    
\ No newline at end of file
diff --git a/zabbix-agent/Dockerfile b/zabbix-agent/Dockerfile
index ea351b1..f54220c 100644
--- a/zabbix-agent/Dockerfile
+++ b/zabbix-agent/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:8.0.1
+ARG BUILD_FROM=hassioaddons/base:8.0.6
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
diff --git a/zabbix-agent/config.json b/zabbix-agent/config.json
index ce60f8b..5b77de6 100644
--- a/zabbix-agent/config.json
+++ b/zabbix-agent/config.json
@@ -1,7 +1,8 @@
 {
     "name": "Zabbix Agent",
     "url": "https://git.asperti.com/paspo/hassio-addons",
-    "version": "0.1.3",
+    "image": "docker.asperti.com/paspo/hassio-zabbix-agent",
+    "version": "0.1.4",
     "slug": "zabbix-agent",
     "description": "Zabbix Agent for hass.io",
     "startup": "services",
diff --git a/zabbix-agent2/Dockerfile b/zabbix-agent2/Dockerfile
new file mode 100644
index 0000000..859c079
--- /dev/null
+++ b/zabbix-agent2/Dockerfile
@@ -0,0 +1,12 @@
+ARG BUILD_FROM=hassioaddons/base:8.0.6
+FROM $BUILD_FROM
+
+ENV LANG C.UTF-8
+
+# Copy scripts for add-on
+COPY run.sh /
+
+RUN apk add -U jq zabbix-agent2=5.0.14-r1 sudo && \
+  chmod a+x /run.sh
+
+CMD [ "/run.sh" ]
diff --git a/zabbix-agent2/config.json b/zabbix-agent2/config.json
new file mode 100644
index 0000000..2aa5b6f
--- /dev/null
+++ b/zabbix-agent2/config.json
@@ -0,0 +1,32 @@
+{
+    "name": "Zabbix Agent 2",
+    "url": "https://git.asperti.com/paspo/hassio-addons",
+    "image": "docker.asperti.com/paspo/hassio-zabbix-agent2",
+    "version": "0.1.1",
+    "slug": "zabbix-agent2",
+    "description": "Zabbix Agent 2 for hass.io",
+    "startup": "services",
+    "boot": "auto",
+    "audio": false,
+    "gpio": false,
+    "arch": [
+        "aarch64",
+        "amd64",
+        "armhf",
+        "i386"
+    ],
+    "ports": {
+        "10050/tcp": 10050
+    },
+    "map": [
+        "share"
+    ],
+    "options": {
+        "server": "zabbix-server",
+        "hostname": "hassio"
+    },
+    "schema": {
+        "server": "str",
+        "hostname": "str"
+    }
+}
diff --git a/zabbix-agent2/icon.png b/zabbix-agent2/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d145010b49a0a5dfb987813c65c280c3edc5a80
GIT binary patch
literal 632
zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD8Ax&oe*=;XEa{HEjtmUzPnffIy#(?Vl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{KICC&cv%1H+sC{xAFY
z|NsC0`}y;K-oL+NVDP-4;9)?(eFum4^XFd|5csry{i}wCCkY9^?%%(upzxk+_Y<IY
z#w2fd7iK{opHDyzdx@v7EBhlR0ZwHDErpCJK<Oo(E{-7;x8C0IoYd^V;}V#hZ1bS;
z_xx?)drybuw}g29DQ}9|p=B6UV8sYD00@4ZF1Z(9_2P4CeT$mOLQdZdC*fHaS{FY5
za$%=`rPk+CPyV^DmO0(u9eh+y>+@Rc(43uJXU@M1*;pFZUhuY0w0fnpMa8r2za07N
z3Tr~1`IoPnVbc;^zUsy=(V3s)WuFx7v6$EPR+oQaa`k?o8D_V3x8=MC8q@P_UE)uU
zw>R#+>VH%Ip}YCpx{WeR_r~8{nKTWk`r);?T57j{U!1E|wtTPmiEroXx#xC+b>!Z-
zr~Nke@W#DQf1KL5S2BL-<@OEMSM5Wp`|bA4%6KodX|KC{yyQ0X$E%h4-k$yB$$R=+
zS&Uua+p|Bk=0E+^dCKP3kFIa)4!+9Zo#x+VvCaInx~b0X+l4<}Vr6>Pf3nn@zriZ%
zvBlfHrOUf4p|Z1|PL}F>`*ugop;sA#$Day^xo68P16c!6AOqIE?R%=+@5jYOZF`!p
vTo9dqQxP7PE&oD4Rz8fiGvt8;xXe-h7x4}c{ufMq4ifNm^>bP0l+XkK@Mt3E

literal 0
HcmV?d00001

diff --git a/zabbix-agent2/logo.png b/zabbix-agent2/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f2bc497012e103846a86c0fa2a89b3e5d883e4a
GIT binary patch
literal 3766
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

literal 0
HcmV?d00001

diff --git a/zabbix-agent2/run.sh b/zabbix-agent2/run.sh
new file mode 100644
index 0000000..fc67ef0
--- /dev/null
+++ b/zabbix-agent2/run.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+CONFIG_PATH=/data/options.json
+CUSTOM_CFG_PATH=/share/zabbix-agent
+
+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_agentd.conf
+
+sudo -u zabbix zabbix_agentd -f