Merge branch 'main' into integration-eremem

pve-mod-gui-temp.sh

@@ -157,6 +157,16 @@ function configure {
 		warn "The CPU configuration is not complete. Temperatures will not be available."
 	fi
 
+	# Look for fan speeds
+	msg "\nDetecting support for Fan speeds..."
+	if (echo "$sensorOutput" | grep -q "fan[0-9]*_input" ); then
+		msg "Fan speeds detected:\n$(echo "$sensorOutput" | grep -o 'fan[0-9]*_input[^"]*')"
+		enableFanSpeed=true
+	else
+		warn "No Fan speeds found."
+		enableFanSpeed=false
+	fi	
+
 	echo # add a new line
 }
 
@@ -354,11 +364,64 @@ function install_mod {
 		}" "$pvemanagerlibjs"
 		fi
 
+		if [ $enableFanSpeed = true ]; then
+			# Add fan speeds display
+			sed -i "/^Ext.define('PVE.node.StatusView',/ {
+				:a;
+				/items:/!{N;ba;}
+				:b;
+				/'thermal.*},/!{N;bb;}
+				a\
+				\\
+			{
+				xtype: 'box',
+				colspan: 2,
+				html: gettext('Fan Speed(s)'),
+			},	
+			{
+				itemId: 'FanSpeed',
+				colspan: 2,
+				printBar: false,
+				title: gettext(' '),
+				iconCls: 'fa fa-fw fa-solid fa-fan',
+				textField: 'thermalstate',
+				renderer: function(value){
+					const objValue = JSON.parse(value);
+
+					let speeds = [];
+
+					// Loop through the parent keys
+					Object.keys(objValue).forEach(parentKey => {
+						const parentObj = objValue[parentKey];
+						
+						// Filter and sort fan keys for each parent object
+						const fanKeys = Object.keys(parentObj).filter(item => /^fan[0-9]+$/.test(item)).sort();
+
+						fanKeys.forEach((fanKey) => {
+							try {
+								const fanSpeed = parentObj[fanKey][`${fanKey}_input`];
+								const fanNumber = fanKey.replace('fan', '');  // Extract fan number from the key
+								if (fanSpeed !== undefined) {
+									speeds.push(`Fan ${fanNumber}: ${fanSpeed} RPM`);
+								}
+							} catch(e) {
+								console.error(`Error retrieving fan speed for ${fanKey} in ${parentKey}:`, e);  // Debug: Log specific error
+							}
+						});
+					});
+
+					return '<div style="text-align: left; margin-left: 28px;">' + (speeds.length > 0 ? speeds.join(' | ') : 'N/A') + '</div>';
+				}
+			},
+			}" "$pvemanagerlibjs"
+		fi
 
 		# Add an empty line to separate modified items as a visual group
 		# NOTE: Check for the presence of items in the reverse order of display
 		local lastItemId=""
-		if [ $enableHddTemp = true ]; then
+		if [ $enableFanSpeed = true ]; then
+			lastItemId="FanSpeed"
+		elif [ $enableHddTemp = true ]; then
 			lastItemId="thermalHdd"			
 		elif [ $enableNvmeTemp = true ]; then
 			lastItemId="thermalNvme"

readme.md

@@ -6,7 +6,7 @@ If you find this helpful, a small donation is appreciated, [![Donate](https://ww
 ## Node temperature view
 (Tested compatibility: 7.x, 8.0.x, 8.1.x, 8.2.x)
 
-This bash script installs a modification to the Proxmox Virtual Environment (PVE) web user interface (UI) to display temperature information in a flexible manner for CPU, NVME and HDDs/SSDs.
+This bash script installs a modification to the Proxmox Virtual Environment (PVE) web user interface (UI) to display temperature information in a flexible manner for CPU, NVME and HDDs/SSDs. Fanspeeds are also displayed, if available.
 
 The modification includes three main steps: