OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move sensor config to beginning of script.

Browse Source 
Warn user if drivetemp kernal module is not installed
Save sensor -j reading into a single variable that all temps are read from
This commit is contained in:
Meliox 2023-06-27 19:59:01 +02:00
parent e850bc187c
commit 55bf6d9ab4
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pve-mod-gui-temp.sh
View File

@ -7,6 +7,14 @@ nodespm="/usr/share/perl5/PVE/API2/Nodes.pm"
backuplocation="/root/backup" backuplocation="/root/backup"
timestamp=$(date '+%Y-%m-%d_%H-%M-%S') timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
# Sensor configuration
# CPU. See tempN_in put for "Core 0" using sensor -j
CPUtempInputOffset="2";
# Display configuration for HDD, NVME, CPU
CPUPerRow="4";
HDDPerRow="4";
NVMEPerRow="4";
################### code below ############# ################### code below #############
echo "" echo ""
@ -44,12 +52,18 @@ install_packages () {
;; ;;
esac esac
fi fi
# Check if kernal module drivetemp is installed
if (lsmod | grep -wq "drivetemp"); then
echo "The drivetemp kernel module is installed."
else
echo "Warning: The drivetemp kernel module is not installed. HDD temps will not be available"
fi
} }
# Call the 'install_packages' function to check if lm-sensors is installed and install it if necessary # Call the 'install_packages' function to check if lm-sensors is installed and install it if necessary
install_packages install_packages
# Function to install the modification # Function to install the modification
function install_mod { function install_mod {
# Create backup of original files # Create backup of original files
@ -61,7 +75,7 @@ function install_mod {
cp "$nodespm" "$backuplocation/Nodes.pm.$timestamp" cp "$nodespm" "$backuplocation/Nodes.pm.$timestamp"
echo "Backup of $nodespm saved to $backuplocation/Nodes.pm.$timestamp" echo "Backup of $nodespm saved to $backuplocation/Nodes.pm.$timestamp"
sed -i '/my $dinfo = df('\''\/'\'', 1);/i\'$'\t''$res->{thermalstate} = `sensors -j`;\n'$'\t''$res->{thermalstate2} = `sensors -j`;\n' "$nodespm" sed -i '/my $dinfo = df('\''\/'\'', 1);/i\'$'\t''$res->{thermalstate} = `sensors -j`;\n' "$nodespm"
echo "Added thermalstate to $nodespm" echo "Added thermalstate to $nodespm"
else else
echo "Thermalstate already added to $nodespm" echo "Thermalstate already added to $nodespm"
@ -99,9 +113,9 @@ function install_mod {
// sensors configuration\n\ // sensors configuration\n\
const address = \"coretemp-isa-0000\",\n\ const address = \"coretemp-isa-0000\",\n\
itemPrefix = \"Core \",\n\ itemPrefix = \"Core \",\n\
tempInputOffset = 2; // see tempN_input for \"Core 0\"\n\ tempInputOffset = $CPUtempInputOffset; // see tempN_input for \"Core 0\"\n\
// display configuration\n\ // display configuration\n\
const coresPerRow = 4;\n\ const coresPerRow = $CPUPerRow;\n\
\n\ \n\
const objValue = JSON.parse(value);\n\ const objValue = JSON.parse(value);\n\
if(objValue.hasOwnProperty(address)) \{\n\ if(objValue.hasOwnProperty(address)) \{\n\
@ -127,14 +141,14 @@ function install_mod {
printBar: false,\n\ printBar: false,\n\
title: gettext('NVME Thermal State'),\n\ title: gettext('NVME Thermal State'),\n\
iconCls: 'fa fa-fw fa-thermometer-half',\n\ iconCls: 'fa fa-fw fa-thermometer-half',\n\
textField: 'thermalstate2',\n\ textField: 'thermalstate',\n\
renderer: function(value){\n\ renderer: function(value){\n\
// sensors configuration\n\ // sensors configuration\n\
const addressPrefix = \"nvme-pci-\",\n\ const addressPrefix = \"nvme-pci-\",\n\
sensorName = \"Composite\",\n\ sensorName = \"Composite\",\n\
tempInputNo = 1;\n\ tempInputNo = 1;\n\
// display configuration\n\ // display configuration\n\
const drivesPerRow = 4;\n\ const drivesPerRow = $NVMEPerRow;\n\
\n\ \n\
const objValue = JSON.parse(value),\n\ const objValue = JSON.parse(value),\n\
nvmeKeys = Object.keys(objValue).filter(item => \{ return String(item).startsWith(addressPrefix); \}).sort();\n\ nvmeKeys = Object.keys(objValue).filter(item => \{ return String(item).startsWith(addressPrefix); \}).sort();\n\
@ -162,14 +176,14 @@ function install_mod {
printBar: false,\n\ printBar: false,\n\
title: gettext('HDD/SSD Thermal State'),\n\ title: gettext('HDD/SSD Thermal State'),\n\
iconCls: 'fa fa-fw fa-thermometer-half',\n\ iconCls: 'fa fa-fw fa-thermometer-half',\n\
textField: 'thermalstate2',\n\ textField: 'thermalstate',\n\
renderer: function(value){\n\ renderer: function(value){\n\
// sensors configuration\n\ // sensors configuration\n\
const addressPrefix = \"drivetemp-scsi-\",\n\ const addressPrefix = \"drivetemp-scsi-\",\n\
sensorName = \"temp1\",\n\ sensorName = \"temp1\",\n\
tempInputNo = 1;\n\ tempInputNo = 1;\n\
// display configuration\n\ // display configuration\n\
const drivesPerRow = 4;\n\ const drivesPerRow = $HDDPerRow;\n\
\n\ \n\
const objValue = JSON.parse(value),\n\ const objValue = JSON.parse(value),\n\
drvKeys = Object.keys(objValue).filter(item => { return String(item).startsWith(addressPrefix); }).sort();\n\ drvKeys = Object.keys(objValue).filter(item => { return String(item).startsWith(addressPrefix); }).sort();\n\