feat: use emissary 2023.10.22-stable.750.fbf818e

Makefile

@@ -28,7 +28,7 @@ EMISSARY_ARCH ?= armv6
 EMISSARY_RECONCILIATION_INTERVAL ?=
 EMISSARY_SERVER_URL ?=
 
-BASE_INSTALL ?= install-emissary-files
+BASE_INSTALL ?= install-emissary-files install-common-uci-defaults install-common-additional-agent-collectors
 ADDITIONAL_INSTALL ?=
 ADDITIONAL_OPENWRT_PACKAGES ?=
 
@@ -100,6 +100,7 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 		\( 	-name '*.img.gz' \
 			-or -name '*.bin' \
 			-or -name '*.img' \
+			-or -name '*.itb' \
 		\) -exec cp {} .gitea-release/ \;
 
 	GITEA_RELEASE_PROJECT="emissary-firmware" \

emissary_release.txt

@@ -1 +1 @@
-2023.10.3-stable.410.a84fa05
+2023.10.22-stable.750.fbf818e

install/bananapi.mk

@@ -1,3 +1,3 @@
 install-bpi-r3-network-config:
 	mkdir -p files/etc/config
-	cp misc/bpi-r3/uci/network files/etc/config/network
+	cp misc/bpi-r3/uci/network files/etc/config/network

install/common.mk

@@ -0,0 +1,6 @@
+install-common-uci-defaults:
+	mkdir -p files/etc/uci-defaults
+	cp misc/common/uci-defaults/* files/etc/uci-defaults/
+
+install-common-additional-agent-collectors: tools/yq/bin/yq
+	tools/yq/bin/yq -i '.agent.collectors += load("misc/common/agent/collectors.yml")' files/etc/emissary/agent.yml

install/emissary-files.mk

@@ -31,6 +31,8 @@ install-emissary-files: tools/yq/bin/yq tools/upx/bin/upx
 	tools/yq/bin/yq -i '.agent.controllers.sysupgrade.firmwareVersionCommand = ["sh", "-c", "source /etc/emissary_firmware && echo \"$$FIRMWARE_VERSION\""]' files/etc/emissary/agent.yml
 	tools/yq/bin/yq -i '.agent.controllers.app.dataDir = "/data/emissary/apps/data"' files/etc/emissary/agent.yml
 	tools/yq/bin/yq -i '.agent.controllers.app.downloadDir = "/data/emissary/apps/bundles"' files/etc/emissary/agent.yml
+	tools/yq/bin/yq -i '.sentry.dsn = "$${EMISSARY_SENTRY_DSN}"' files/etc/emissary/agent.yml
+	tools/yq/bin/yq -i '.sentry.environment = "$${EMISSARY_SENTRY_ENVIRONMENT}"' files/etc/emissary/agent.yml
 
 	# Copy emissary binary
 	mkdir -p files/usr/local/bin

install/raspberrypi.mk

@@ -1,7 +1,3 @@
 install-rpi-network-config:
 	mkdir -p files/etc/config
-	cp misc/rpi/uci/network files/etc/config/network
-
-install-rpi-uci-defaults:
-	mkdir -p files/etc/uci-defaults
-	cp misc/rpi/uci-defaults/* files/etc/uci-defaults/
+	cp misc/rpi/uci/network files/etc/config/network

misc/common/agent/collectors.yml

@@ -0,0 +1,9 @@
+- name: network-interfaces
+  command: ip
+  args:
+    - addr
+    - show
+- name: emissary-firmware
+  command: cat
+  args:
+    - /etc/emissary_firmware

misc/emissary/config/emissary

@@ -2,4 +2,6 @@ package emissary
 
 config main 'agent'
     option reconciliation_interval '60'
-    option server_url 'https://emissary.cadol.es'
+    option server_url 'https://emissary.cadol.es'
+    option sentry_dsn ''
+    option sentry_environment ''

misc/emissary/init.d/emissary-agent

@@ -12,10 +12,12 @@ start_service() {
 
   config_get emissary_reconciliation_interval agent 'reconciliation_interval' "60"
   config_get emissary_server_url agent 'server_url' "https://emissary.cadol.es"
+  config_get emissary_sentry_dsn agent 'sentry_dsn' ""
+  config_get emissary_sentry_environment agent 'sentry_environment' ""
 
   local config_file="/etc/emissary/agent.yml"
   procd_open_instance emissary-agent
-  procd_set_param env EMISSARY_SERVER_URL="$emissary_server_url" EMISSARY_RECONCILIATION_INTERVAL="$emissary_reconciliation_interval"
+  procd_set_param env EMISSARY_SERVER_URL="$emissary_server_url" EMISSARY_RECONCILIATION_INTERVAL="$emissary_reconciliation_interval" EMISSARY_SENTRY_DSN="$emissary_sentry_dsn" EMISSARY_SENTRY_ENVIRONMENT="$emissary_sentry_environment"
   procd_set_param command /usr/local/bin/emissary
   procd_append_param command --workdir /usr/share/emissary
   procd_append_param command --config "$config_file"

misc/emissary/uci-defaults/99-emissary.sh

@@ -17,6 +17,12 @@ main() {
     if [ ! -z "${EMISSARY_SERVER_URL}" ]; then
         uci set "emissary.agent.server_url=${EMISSARY_SERVER_URL}"
     fi
+    if [ ! -z "${EMISSARY_SENTRY_DSN}" ]; then
+        uci set "emissary.agent.sentry_dsn=${EMISSARY_SENTRY_DSN}"
+    fi
+    if [ ! -z "${EMISSARY_SENTRY_ENVIRONMENT}" ]; then
+        uci set "emissary.agent.sentry_environment=${EMISSARY_SENTRY_ENVIRONMENT}"
+    fi
 
     # Commit modifications
     uci commit

misc/turris/omnia/uci-defaults/98-turris-omnia-uci-custom.sh

@@ -1,37 +0,0 @@
-#/bin/sh
-
-set -e
-
-main() {
-    # Update default firewall ruleset
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow SSH on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='22'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow HTTP on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='80'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow HTTPS on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='443'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci commit firewall
-    
-    # Disable DNS-rebind protection
-    uci set dhcp.@dnsmasq[0].rebind_protection='0'
-    uci commit dhcp
-
-    reload_config
-}
-
-main

misc/x86/uci-defaults/99-x86-uci-custom.sh

@@ -1,37 +0,0 @@
-#/bin/sh
-
-set -e
-
-main() {
-    # Update default firewall ruleset
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow SSH on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='22'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow HTTP on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='80'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci add firewall rule
-    uci set firewall.@rule[-1].name='Allow HTTPS on WAN'
-    uci set firewall.@rule[-1].src='wan'
-    uci set firewall.@rule[-1].proto='tcp'
-    uci set firewall.@rule[-1].dest_port='443'
-    uci set firewall.@rule[-1].target='ACCEPT'
-
-    uci commit firewall
-    
-    # Disable DNS-rebind protection
-    uci set dhcp.@dnsmasq[0].rebind_protection='0'
-    uci commit dhcp
-
-    reload_config
-}
-
-main

targets/bananapi.mk

@@ -2,8 +2,8 @@ all: bpi-r3
 
 bpi-r3:
 	$(MAKE) \
-		OPENWRT_VERSION="23.05.0-rc3" \
-		IMAGEBUILDER_URL=https://downloads.openwrt.org/releases/23.05.0-rc3/targets/mediatek/filogic/openwrt-imagebuilder-23.05.0-rc3-mediatek-filogic.Linux-x86_64.tar.xz \
+		OPENWRT_VERSION="23.05.0-rc4" \
+		IMAGEBUILDER_URL=https://downloads.openwrt.org/releases/23.05.0-rc4/targets/mediatek/filogic/openwrt-imagebuilder-23.05.0-rc4-mediatek-filogic.Linux-x86_64.tar.xz \
 		ADDITIONAL_INSTALL="install-bpi-r3-network-config" \
 		ADDITIONAL_OPENWRT_PACKAGES="block-mount kmod-fs-ext4 kmod-usb-storage kmod-usb2" \
 		OPENWRT_TARGET="mediatek/filogic" \

targets/generic.mk

@@ -2,7 +2,7 @@ all: x86-generic
 
 x86-generic:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="install-x86-network-config install-x86-uci-defaults" \
+		ADDITIONAL_INSTALL="install-x86-network-config" \
 		ADDITIONAL_OPENWRT_PACKAGES="dmidecode" \
 		OPENWRT_TARGET="x86/generic" \
 		EMISSARY_ARCH="386" \

targets/raspberrypi.mk

@@ -2,7 +2,7 @@ all: rpi-4 rpi-3
 
 rpi-4:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="install-rpi-network-config install-rpi-uci-defaults" \
+		ADDITIONAL_INSTALL="install-rpi-network-config" \
 		OPENWRT_TARGET="bcm27xx/bcm2711" \
 		EMISSARY_ARCH="arm64" \
 		OPENWRT_PROFILE="rpi-4" \
@@ -10,7 +10,7 @@ rpi-4:
 
 rpi-3:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="install-rpi-network-config install-rpi-uci-defaults" \
+		ADDITIONAL_INSTALL="install-rpi-network-config" \
 		OPENWRT_TARGET="bcm27xx/bcm2710" \
 		EMISSARY_ARCH="arm64" \
 		OPENWRT_PROFILE="rpi-3" \