Fixed configuration of agent2; moved user parameters into a separate config file for convenience

Makefile

@@ -23,9 +23,10 @@ agent: zabbix-agent-service zabbix-agent-config
 	sed -e 's|^ServerActive=.*|# ServerActive=|' -i /etc/zabbix_agentd.conf
 	sed -e 's|^Hostname=.*|# Hostname=|' -i /etc/zabbix_agentd.conf
 	sed -e 's|.*HostMetadataItem=.*|HostMetadataItem=system.sw.os[name]|' -i /etc/zabbix_agentd.conf
+	sed -e 's|^# Include=/usr/local/etc/zabbix_agentd\.userparams\.conf|Include=/etc/zabbix_agentd.userparams.conf|' -i /etc/zabbix_agentd.conf
 	sed -e 's|^# Include=/usr/local/etc/zabbix_agentd\.conf\.d/\*\.conf|Include=/etc/zabbix_agentd.conf.d/*.conf|' -i /etc/zabbix_agentd.conf
-	sed -e 's|^# UserParameter=.*|UserParameter=device.id,/usr/sbin/deviceid|' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=device\.id.*/a UserParameter=device.product,/usr/sbin/deviceproduct' -i /etc/zabbix_agentd.conf
+	echo 'UserParameter=device.id,/usr/sbin/deviceid' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=device.product,/usr/sbin/deviceproduct' >> /etc/zabbix_agentd.userparams.conf
 	@echo "d /run/zabbix 755 zabbix zabbix -" > /usr/lib/tmpfiles.d/zabbix.conf
 	@echo "$$ZABBIX_AGENT_SERVICE" > /lib/systemd/system/zabbix-agent.service
 	systemctl enable zabbix-agent.service
@@ -67,6 +68,18 @@ agent2:
 	cd zabbix-5.4.2 && PATH=$$PATH:$(CURDIR)/../go/go/bin ./configure --prefix=/usr --sysconfdir=/etc --disable-agent --enable-agent2 --with-openssl
 	$(MAKE) -C zabbix-5.4.2 PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go
 	$(MAKE) -C zabbix-5.4.2 install PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go
+	install -v -Dm755 zabbix_agentd-configure /usr/sbin/zabbix_agentd-configure
+	sed -e 's|.*PidFile=.*|PidFile=/run/zabbix/zabbix_agent2.pid|' -i /etc/zabbix_agent2.conf
+	sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^LogFile=.*|# LogFile=|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^Server=.*|# Server=|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^ServerActive=.*|# ServerActive=|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^Hostname=.*|# Hostname=|' -i /etc/zabbix_agent2.conf
+	sed -e 's|.*HostMetadataItem=.*|HostMetadataItem=system.sw.os[name]|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^# Include=/usr/local/etc/zabbix_agentd\.userparams\.conf|Include=/etc/zabbix_agentd.userparams.conf|' -i /etc/zabbix_agent2.conf
+	sed -e 's|^# Include=/usr/local/etc/zabbix_agentd\.conf\.d/\*\.conf|Include=/etc/zabbix_agentd.conf.d/*.conf|' -i /etc/zabbix_agent2.conf
+	echo 'UserParameter=device.id,/usr/sbin/deviceid' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=device.product,/usr/sbin/deviceproduct' >> /etc/zabbix_agentd.userparams.conf
 	@echo "$$ZABBIX_AGENT2_SERVICE" > /lib/systemd/system/zabbix-agent2.service
 	systemctl enable zabbix-agent2.service
 	@echo "$$ZABBIX_AGENT2_CONFIG" >> /etc/config/zabbix
@@ -82,9 +95,9 @@ After=syslog.target network.target
 [Service]
 Type=forking
 ExecStartPre=/usr/sbin/zabbix_agentd-configure
-ExecStart=/usr/sbin/zabbix_agentd
+ExecStart=/usr/sbin/zabbix_agent2
 ExecStartPost=sleep 3
-PIDFile=/run/zabbix/zabbix_agentd.pid
+PIDFile=/run/zabbix/zabbix_agent2.pid
 Restart=always
 RestartSec=100
 
@@ -103,47 +116,47 @@ endef
 export ZABBIX_AGENT2_CONFIG
 
 opi:
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone0/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/scaling_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
+	echo 'UserParameter=system.hw.temp,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone0/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/scaling_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
 
 odroid:
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp0,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone0/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp1,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone1/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp2,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone2/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp3,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone3/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp4,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone4/temp`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu0.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu0.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu0.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu1.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu1.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu1.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu2.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu2.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu2.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu3.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu3.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu3.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu4.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu4.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu4.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu5.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu5.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu5.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu6.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu6.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu6.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu7.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu7.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu7.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
+	echo 'UserParameter=system.hw.temp0,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone0/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.hw.temp1,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone1/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.hw.temp2,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone2/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.hw.temp3,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone3/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.hw.temp4,bc <<< "scale=3; `cat /sys/devices/virtual/thermal/thermal_zone4/temp`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu0.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu0.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu0.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu1.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu1.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu1.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu2.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu2.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu2.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu3.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu3.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu3.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu4.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu4.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu4.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu5.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu5.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu5.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu6.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu6.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu6.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu7.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu7.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu7.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
 
 amlogic:
-	sed -e '/^UserParameter=device\.product.*/a UserParameter=system.hw.temp,bc <<< "scale=3; `cat /sys/devices/platform/scpi/scpi:sensors/hwmon/hwmon0/temp1_input`/1000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/scaling_cur_freq`000"' -i /etc/zabbix_agentd.conf
-	sed -e '/^UserParameter=system\.hw\.temp.*/a UserParameter=system.cpu.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq`000"' -i /etc/zabbix_agentd.conf
+	echo 'UserParameter=system.hw.temp,bc <<< "scale=3; `cat /sys/devices/platform/scpi/scpi:sensors/hwmon/hwmon0/temp1_input`/1000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.cur,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/scaling_cur_freq`000"' >> /etc/zabbix_agentd.userparams.conf
+	echo 'UserParameter=system.cpu.freq.max,echo "`cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq`000"' >> /etc/zabbix_agentd.userparams.conf
 
 server: zabbix-server-service zabbix-server-config httpd-conf
 	tar xf zabbix-5.4.2.tar.gz