update

proxmenu-scripts.sh

@@ -7,6 +7,7 @@ source /opt/idssys/defaults/default.inc
 source /opt/idssys/ta-proxmenu/defaults.inc
 source /opt/idssys/ta-proxmenu/inc/git-update.inc
 source /opt/idssys/ta-proxmenu/inc/deploy-iso-nfs-lxc.sh
+source /opt/idssys/ta-proxmenu/inc/deploy-pulse-lxc.sh
 source /opt/idssys/ta-proxmenu/inc/virtio-helpers.inc
 
 ACTION_REQUESTED=0
@@ -234,30 +235,12 @@ print(package.get("version", "") if package else "")
 }
 
 INSTALL_PULSE() {
-	local installer
-	local temp_dir
-
-	echo
-	if ! TAPM_CREATE_TEMP_DIR pulse; then
-		FINISH_FAILED_ACTION
-		return
-	fi
-	temp_dir="$TAPM_TEMP_DIR"
-	installer="${temp_dir}/install.sh"
-
-	if ! TAPM_DOWNLOAD_HTTPS \
-		'https://github.com/rcourtman/Pulse/releases/latest/download/install.sh' \
-		"$installer" 'Pulse installer' ||
-		! bash "$installer"; then
-		TAPM_CLEAN_TEMP_DIR "$temp_dir"
-		echo -e "${idsCL[LightRed]}Pulse installation failed.${idsCL[Default]}"
+	if ! TAPM_DEPLOY_PULSE_LXC; then
+		echo -e "${idsCL[LightRed]}Pulse deployment failed.${idsCL[Default]}"
 		FINISH_FAILED_ACTION
 		return
 	fi
 
-	TAPM_CLEAN_TEMP_DIR "$temp_dir"
-	echo
-	echo -e "\n${idsCL[Green]}Pulse installer completed successfully.${idsCL[Default]}"
 	FINISH_ACTION
 }
 
@@ -1874,8 +1857,8 @@ MONITORING_MENU() {
 	local cluster_resources
 
 	while true; do
-		cluster_resources="$(pvesh get /cluster/resources 2>/dev/null)"
-		grep -qi pulse <<< "$cluster_resources" &&
+		cluster_resources="$(pvesh get /cluster/resources --type vm --output-format json 2>/dev/null)"
+		TAPM_PULSE_RESOURCE_INSTALLED "$cluster_resources" &&
 			labels=("Pulse monitoring (installed)") ||
 			labels=("Install Pulse monitoring")