Update Zabbix to 7.0.20 and ui libs and adapt letsencrypt

Author: mrmarkuz

build-images.sh

@@ -44,7 +44,8 @@ buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=node:fwadm traefik@any:routeadm" \
     --label="org.nethserver.tcp-ports-demand=1" \
     --label="org.nethserver.rootfull=0" \
-    --label="org.nethserver.images=docker.io/postgres:15.14-alpine docker.io/zabbix/zabbix-server-pgsql:7.0.19-alpine docker.io/zabbix/zabbix-agent2:7.0.19-alpine docker.io/zabbix/zabbix-web-nginx-pgsql:7.0.19-alpine" \
+	--label="org.nethserver.min-core=3.12.4-0" \
+    --label="org.nethserver.images=docker.io/postgres:15.14-alpine docker.io/zabbix/zabbix-server-pgsql:7.0.20-alpine docker.io/zabbix/zabbix-agent2:7.0.20-alpine docker.io/zabbix/zabbix-web-nginx-pgsql:7.0.20-alpine" \
     "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"

imageroot/actions/configure-module/01Hostname_validation

@@ -19,7 +19,7 @@ agent.set_weight(os.path.basename(__file__), 0) # Validation step, no task progr
 data = json.load(sys.stdin)
 
 # Setup default values
-host = data.get("host")
+host = data["host"]
 # do not test if it is the same host
 oldHost = os.environ.get('TRAEFIK_HOST','')
 

imageroot/actions/configure-module/05configure_traefik

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (C) 2022 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+import json
+import sys
+import agent
+import os
+
+# Try to parse the stdin as JSON.
+# If parsing fails, output everything to stderr
+data = json.load(sys.stdin)
+
+# Setup default values
+host = data["host"]
+h2hs = data.get("http2https", True)
+
+# Configure Traefik route for API
+set_route_data = {
+    'instance': os.environ['MODULE_ID'],
+    'url':  'http://127.0.0.1:' + os.environ["TCP_PORT"],
+    'host': host,
+    'http2https': h2hs,
+    'lets_encrypt_check': True,
+    'lets_encrypt_cleanup': True,
+}
+if 'lets_encrypt' in data:
+    set_route_data['lets_encrypt'] = data['lets_encrypt']
+
+agent.set_route(set_route_data)

imageroot/actions/configure-module/10configure_environment_vars

@@ -13,6 +13,13 @@ import agent
 # If parsing fails, output everything to stderr
 data = json.load(sys.stdin)
 
+# Setup default values
+host = data.get("host")
+h2hs = data.get("http2https", True)
+
+agent.set_env("TRAEFIK_HOST", host)
+agent.set_env("TRAEFIK_HTTP2HTTPS", h2hs)
+
 #This is specific to you module, so you need to change it accordingly.
 # we read a json stdin {"vars1":true, "var2":"foo", "vars3": 3} and we writ it to .config/state/environment
 # Upper case to set environment variable and minor case to read from stdin

imageroot/actions/configure-module/20configure_traefik

@@ -1,51 +1 @@
-#!/usr/bin/env python3
-
-#
-# Copyright (C) 2022 Nethesis S.r.l.
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-
-import json
-import sys
-import agent
-import agent.tasks
-import os
-
-# Try to parse the stdin as JSON.
-# If parsing fails, output everything to stderr
-data = json.load(sys.stdin)
-
-# Setup default values
-host = data.get("host")
-h2hs = data.get("http2https", True)
-le = data.get("lets_encrypt", False)
-
-# Talk with agent using file descriptor.
-# Setup configuration from user input.
-agent.set_env("TRAEFIK_HOST", host)
-agent.set_env("TRAEFIK_HTTP2HTTPS", h2hs)
-agent.set_env("TRAEFIK_LETS_ENCRYPT", le)
-
-# Make sure everything is saved inside the environment file
-# just before starting systemd unit
-agent.dump_env()
-
-# Find default traefik instance for current node
-default_traefik_id = agent.resolve_agent_id('traefik@node')
-if default_traefik_id is None:
-    sys.exit(2)
-
-response = agent.tasks.run(
-    agent_id=agent.resolve_agent_id('traefik@node'),
-    action='set-route',
-    data={
-        'instance': os.environ['MODULE_ID'],
-        'url':  'http://127.0.0.1:' + os.environ["TCP_PORT"],
-        'host': host,
-        'http2https': h2hs,
-        'lets_encrypt': le
-    },
-)
-
-# Check if traefik configuration has been successfull
-agent.assert_exp(response['exit_code'] == 0)
+# Placeholder, see bug NethServer/dev#7058

imageroot/actions/configure-module/validate-input.json

@@ -12,9 +12,7 @@
     ],
     "type": "object",
     "required": [
-        "host",
-        "http2https",
-        "lets_encrypt"
+        "host"
     ],
     "properties": {
         "host": {

imageroot/actions/destroy-module/20destroy

@@ -1,35 +1 @@
-#!/usr/bin/env python3
-
-#
-# Copyright (C) 2023 Nethesis S.r.l.
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-
-# Remove traefik route
-
-import os
-import sys
-import json
-import agent
-import agent.tasks
-
-# Try to parse the stdin as JSON.
-# If parsing fails, output everything to stderr
-data = json.load(sys.stdin)
-
-# Find default traefik instance for current node
-default_traefik_id = agent.resolve_agent_id('traefik@node')
-if default_traefik_id is None:
-    sys.exit(2)
-
-# Remove traefik route
-response = agent.tasks.run(
-    agent_id=default_traefik_id,
-    action='delete-route',
-    data={
-        'instance': os.environ['MODULE_ID']
-    },
-)
-
-# Check if traefik configuration has been successfull
-agent.assert_exp(response['exit_code'] == 0)
+# Placeholder, see bug NethServer/dev#7058

imageroot/actions/get-configuration/20read

@@ -20,7 +20,7 @@ config = {}
 # Read current configuration from the environment file
 config["host"] = os.getenv("TRAEFIK_HOST","")
 config["http2https"] = os.getenv("TRAEFIK_HTTP2HTTPS") == "True"
-config["lets_encrypt"] = os.getenv("TRAEFIK_LETS_ENCRYPT") == "True"
+config["lets_encrypt"] = agent.get_route(os.environ['MODULE_ID']).get('lets_encrypt', False)
 config["servername"] = os.getenv("ZBX_SERVER_NAME")
 config["timezone"] = os.getenv("PHP_TZ")
 

imageroot/actions/restore-module/06copyenv

@@ -16,7 +16,6 @@ original_environment = request['environment']
 for evar in [
         "TRAEFIK_HOST",
         "TRAEFIK_HTTP2HTTPS",
-        "TRAEFIK_LETS_ENCRYPT",
         "ZBX_SERVER_NAME",
         "PHP_TZ",
     ]:

imageroot/actions/restore-module/50traefik

@@ -8,11 +8,13 @@
 import agent
 import os
 
+request = json.load(sys.stdin)
+renv = request['environment']
+
 configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={
-    "lets_encrypt": os.environ.get("TRAEFIK_LETS_ENCRYPT",False) == "True",
-    "host": os.environ.get("TRAEFIK_HOST","zabbix.test.com"),
-    "http2https": os.environ.get("TRAEFIK_HTTP2HTTPS",False) == "True",
-    "servername": os.environ.get("ZBX_SERVER_NAME",""),
-    "timezone": os.environ.get("PHP_TZ","Europe/Riga")
+    "host": renv["TRAEFIK_HOST"],
+    "http2https": renv["TRAEFIK_HTTP2HTTPS"] == "True",
+    "servername": renv["ZBX_SERVER_NAME"],
+    "timezone": renv["PHP_TZ"]
 })
 agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed! You can run just one instance on a node.")