Multiple adjustments
- removed cpuTempInputOffset - reworked configuration - changed default backup location to the script's directory - adjusted the CPU sensor detection to be more flexible - removed redundant JS code escaping - adjusted the injected JS code to the modified configuration - repaired script execution with multiple parameters - showing usgage information only if none of the parameters valid - added output formatting, reworked output messages - adjusted indentation - further minor fixes
This commit is contained in:
rmm
parent
578fdf66d8
commit
04cfbe6962
@ -1,37 +1,59 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
# This bash script installs a modification to the Proxmox Virtual Environment (PVE) web user interface (UI) to display temperature information.
|
# This bash script installs a modification to the Proxmox Virtual Environment (PVE) web user interface (UI) to display temperature information.
|
||||||
|
#
|
||||||
|
|
||||||
# Filepaths
|
################### Configuration #############
|
||||||
pvemanagerlib="/usr/share/pve-manager/js/pvemanagerlib.js"
|
|
||||||
nodespm="/usr/share/perl5/PVE/API2/Nodes.pm"
|
|
||||||
backupLocation="/root/backup"
|
|
||||||
|
|
||||||
# Sensor configuration
|
|
||||||
# CPU. See tempN_in put for "Core 0" using sensor -j
|
|
||||||
cpuTempInputOffset="2";
|
|
||||||
|
|
||||||
# Display configuration for HDD, NVME, CPU
|
# Display configuration for HDD, NVME, CPU
|
||||||
cpuPerRow="4";
|
CPU_ITEMS_PER_ROW=4;
|
||||||
hddPerRow="4";
|
NVME_ITEMS_PER_ROW=4;
|
||||||
nvmePerRow="4";
|
HDD_ITEMS_PER_ROW=4;
|
||||||
|
|
||||||
# Known CPU sensor names. If new are added, also update logic in configure section
|
# Known CPU sensor names. They can be full or partial but should ensure unambiguous identification.
|
||||||
knownCpuSensors=("coretemp-isa-0000" "k10temp-pci-00c3")
|
# Should new ones be added, also update logic in configure() function.
|
||||||
|
KNOWN_CPU_SENSORS=("coretemp-isa-" "k10temp-pci-")
|
||||||
|
|
||||||
################### code below #############
|
# This script's working directory
|
||||||
timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
|
SCRIPT_CWD="$(dirname "$(readlink -f "$0")")"
|
||||||
|
|
||||||
echo ""
|
# Files backup location
|
||||||
|
BACKUP_DIR="$SCRIPT_CWD/backup"
|
||||||
|
|
||||||
|
# File paths
|
||||||
|
pvemanagerlibjs="/usr/share/pve-manager/js/pvemanagerlib.js"
|
||||||
|
nodespm="/usr/share/perl5/PVE/API2/Nodes.pm"
|
||||||
|
|
||||||
|
###############################################
|
||||||
|
|
||||||
|
# Helper functions
|
||||||
|
function msg {
|
||||||
|
echo -e "\e[0m$1\e[0m"
|
||||||
|
}
|
||||||
|
|
||||||
|
#echo message in bold
|
||||||
|
function msgb {
|
||||||
|
echo -e "\e[1m$1\e[0m"
|
||||||
|
}
|
||||||
|
|
||||||
|
function warn {
|
||||||
|
echo -e "\e[0;33m[warning] $1\e[0m"
|
||||||
|
}
|
||||||
|
|
||||||
|
function err {
|
||||||
|
echo -e "\e[0;31m[error] $1\e[0m"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
# End of helper functions
|
||||||
|
|
||||||
# Function to display usage information
|
# Function to display usage information
|
||||||
function usage {
|
function usage {
|
||||||
echo "Usage: $0 [install | uninstall]"
|
msgb "\nUsage:\n$0 [install | uninstall]\n"
|
||||||
echo ""
|
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Define a function to install packages
|
# Define a function to install packages
|
||||||
install_packages () {
|
function install_packages {
|
||||||
# Check if the 'sensors' command is available on the system
|
# Check if the 'sensors' command is available on the system
|
||||||
if (! command -v sensors &> /dev/null); then
|
if (! command -v sensors &> /dev/null); then
|
||||||
# If the 'sensors' command is not available, prompt the user to install lm-sensors
|
# If the 'sensors' command is not available, prompt the user to install lm-sensors
|
||||||
@ -44,124 +66,130 @@ install_packages () {
|
|||||||
;;
|
;;
|
||||||
n|N )
|
n|N )
|
||||||
# If the user chooses not to install lm-sensors, exit the script with a zero status code
|
# If the user chooses not to install lm-sensors, exit the script with a zero status code
|
||||||
echo "Decided to not install lm-sensors. The mod cannot run without"
|
msg "Decided to not install lm-sensors. The mod cannot run without it. Exiting..."
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
# If the user enters an invalid input, print an error message and exit the script with a non-zero status code
|
# If the user enters an invalid input, print an error message and exit the script with a non-zero status code
|
||||||
echo "Invalid input. Exiting..."
|
err "Invalid input. Exiting..."
|
||||||
exit 1
|
|
||||||
;;
|
;;
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function configure {
|
function configure {
|
||||||
|
local sensorOutput=$(sensors -j)
|
||||||
|
|
||||||
sensorOutput=$(sensors -j)
|
# Check if HDD/SSD data is installed
|
||||||
|
msg "\nDetecting support for HDD/SDD temperature sensors..."
|
||||||
# Check if kernal module drivetemp is installed
|
|
||||||
if (lsmod | grep -wq "drivetemp"); then
|
if (lsmod | grep -wq "drivetemp"); then
|
||||||
# Check if SDD/HDD data is available
|
# Check if SDD/HDD data is available
|
||||||
if (echo "$sensorOutput" | grep -q "drivetemp-scsi-" ); then
|
if (echo "$sensorOutput" | grep -q "drivetemp-scsi-" ); then
|
||||||
echo "Found SSD/HDD temp sensor: $(echo "$sensorOutput" | grep -o '"drivetemp-scsi[^"]*"'| sed 's/"//g')"
|
msg "Detected sensors:\n$(echo "$sensorOutput" | grep -o '"drivetemp-scsi[^"]*"' | sed 's/"//g')"
|
||||||
enableHddSsdTemp=true
|
enableHddTemp=true
|
||||||
else
|
else
|
||||||
enableHddSsdTemp=false
|
warn "Kernel module \"drivetemp\" is not installed. HDD/SDD temperatures will not be available."
|
||||||
|
enableHddTemp=false
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
enableHddSsdTemp=false
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if NVME data is available
|
# Check if NVME data is available
|
||||||
|
msg "\nDetecting support for NVMe temperature sensors..."
|
||||||
if (echo "$sensorOutput" | grep -q "nvme-" ); then
|
if (echo "$sensorOutput" | grep -q "nvme-" ); then
|
||||||
echo "Found nvme temp sensor: $(echo "$sensorOutput" | grep -o '"nvme[^"]*"'| sed 's/"//g')"
|
msg "Detected sensors:\n$(echo "$sensorOutput" | grep -o '"nvme[^"]*"' | sed 's/"//g')"
|
||||||
enableNvmeTemp=true
|
enableNvmeTemp=true
|
||||||
else
|
else
|
||||||
|
warn "No NVMe temperature sensors found."
|
||||||
enableNvmeTemp=false
|
enableNvmeTemp=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if CPU is part of known list for autoconfiguration
|
# Check if CPU is part of known list for autoconfiguration
|
||||||
for item in "${knownCpuSensors[@]}"; do
|
msg "\nDetecting support for CPU temperature sensors..."
|
||||||
case "$sensorOutput" in
|
for item in "${KNOWN_CPU_SENSORS[@]}"; do
|
||||||
*"coretemp-isa-0000"*)
|
if (echo "$sensorOutput" | grep -q "$item"); then
|
||||||
echo "Found known cpu sensor: coretemp-isa-0000"
|
case "$item" in
|
||||||
cpuAddress="coretemp-isa-0000"
|
"coretemp-"*)
|
||||||
cpuItemPrefix="Core"
|
CPU_ADDRESS="$(echo "$sensorOutput" | grep "$item" | sed 's/"//g;s/:{//;s/^\s*//')"
|
||||||
|
CPU_ITEM_PREFIX="Core "
|
||||||
|
CPU_TEMP_CAPTION="Core"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
*"k10temp-pci-00c3"*)
|
"k10temp-"*)
|
||||||
echo "Found known cpu sensor: k10temp-pci-00c3"
|
CPU_ADDRESS="$(echo "$sensorOutput" | grep "$item" | sed 's/"//g;s/:{//;s/^\s*//')"
|
||||||
cpuAddress="k10temp-pci-00c3"
|
CPU_ITEM_PREFIX="Tc"
|
||||||
cpuItemPrefix="Tccd"
|
CPU_TEMP_CAPTION="Temp"
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ -n "$CPU_ADDRESS" ]; then
|
||||||
|
msg "Detected sensor:\n$CPU_ADDRESS"
|
||||||
|
fi
|
||||||
|
|
||||||
# If cpu is not known, ask the user for input
|
# If cpu is not known, ask the user for input
|
||||||
if [ -z "$cpuItemPrefix" ]; then
|
if [ -z "$CPU_ADDRESS" ]; then
|
||||||
echo "Warning: Could not automatically determine CPU sensor. Please configure it manually."
|
warn "Could not automatically detect the CPU temperature sensor. Please configure it manually."
|
||||||
# Ask user for CPU information
|
# Ask user for CPU information
|
||||||
# Inform the user and prompt them to press any key to continue
|
# Inform the user and prompt them to press any key to continue
|
||||||
read -rsp $'Sensor output will be presented. Press any key to continue...\n' -n1 key
|
read -rsp $'Sensor output will be presented. Press any key to continue...\n' -n1 key
|
||||||
|
|
||||||
# Print the output to the user
|
# Print the output to the user
|
||||||
echo "Sensor Output:"
|
msg "Sensor output:\n${sensorOutput}"
|
||||||
echo "$sensorOutput"
|
|
||||||
|
|
||||||
echo "Example: cpu address: coretemp-isa-0000 and cpuItemPrefix Core."
|
|
||||||
|
|
||||||
# Prompt the user for adapter name and item name
|
# Prompt the user for adapter name and item name
|
||||||
read -p "Enter the cpu address: " cpuAddress
|
read -p "Enter the CPU sensor address (e.g.: coretemp-isa-0000 or k10temp-pci-00c3): " CPU_ADDRESS
|
||||||
read -p "Enter the cpu item prefix: " cpuItemPrefix
|
read -p "Enter the CPU sensor input prefix (e.g.: Core or Tc): " CPU_ITEM_PREFIX
|
||||||
|
read -p "Enter the CPU temperature caption (e.g.: Core or Temp): " CPU_TEMP_CAPTION
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$cpuItemPrefix" || -z "$cpuItemPrefix" ]]; then
|
if [[ -z "$CPU_ADDRESS" || -z "$CPU_ITEM_PREFIX" ]]; then
|
||||||
echo "Warning: The cpu configuration is not set. Temps will not be available"
|
warn "The CPU configuration is not complete. Temperatures will not be available."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo # add a new line
|
||||||
}
|
}
|
||||||
|
|
||||||
# Function to install the modification
|
# Function to install the modification
|
||||||
function install_mod {
|
function install_mod {
|
||||||
|
msg "\nPreparing mod installation..."
|
||||||
|
|
||||||
# Create backup of original files
|
# Create backup of original files
|
||||||
mkdir -p "$backupLocation"
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
|
||||||
|
local timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
|
||||||
|
|
||||||
# Add new line to Nodes.pm file
|
# Add new line to Nodes.pm file
|
||||||
if [[ -z $(cat $nodespm | grep -e "$res->{thermalstate}") ]]; then
|
if [[ -z $(cat $nodespm | grep -e "$res->{thermalstate}") ]]; then
|
||||||
# Create backup of original file
|
# Create backup of original file
|
||||||
cp "$nodespm" "$backupLocation/Nodes.pm.$timestamp"
|
cp "$nodespm" "$BACKUP_DIR/Nodes.pm.$timestamp"
|
||||||
echo "Backup of \"$nodespm\" saved to \"$backupLocation/Nodes.pm.$timestamp\""
|
msg "Backup of \"$nodespm\" saved to \"$BACKUP_DIR/Nodes.pm.$timestamp\"."
|
||||||
|
|
||||||
sed -i '/my $dinfo = df('\''\/'\'', 1);/i\'$'\t''$res->{thermalstate} = `sensors -j`;\n' "$nodespm"
|
sed -i '/my $dinfo = df('\''\/'\'', 1);/i\'$'\t''$res->{thermalstate} = `sensors -j`;\n' "$nodespm"
|
||||||
echo "Added thermalstate to $nodespm"
|
msg "Added thermalstate to $nodespm."
|
||||||
else
|
else
|
||||||
echo "Thermalstate already added to $nodespm"
|
warn "Thermalstate already added to $nodespm."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add new item to the items array in PVE.node.StatusView
|
# Add new item to the items array in PVE.node.StatusView
|
||||||
if [[ -z $(cat "$pvemanagerlib" | grep -e "itemId: 'thermal'") ]]; then
|
if [[ -z $(cat "$pvemanagerlibjs" | grep -e "itemId: 'thermal[[:alnum:]]*'") ]]; then
|
||||||
|
# Provide sensor configuration
|
||||||
|
configure
|
||||||
|
|
||||||
# Create backup of original file
|
# Create backup of original file
|
||||||
cp "$pvemanagerlib" "$backupLocation/pvemanagerlib.js.$timestamp"
|
cp "$pvemanagerlibjs" "$BACKUP_DIR/pvemanagerlib.js.$timestamp"
|
||||||
echo "Backup of \"$pvemanagerlib\" saved to \"$backupLocation/pvemanagerlib.js.$timestamp\""
|
msg "Backup of \"$pvemanagerlibjs\" saved to \"$BACKUP_DIR/pvemanagerlib.js.$timestamp\"."
|
||||||
|
|
||||||
# Expand space in StatusView
|
# Expand space in StatusView
|
||||||
sed -i "/Ext.define('PVE\.node\.StatusView'/,/\},/ {
|
sed -i "/Ext.define('PVE\.node\.StatusView'/,/\},/ {
|
||||||
s/\(bodyPadding:\) '[^']*'/\1 '20 15 20 15'/
|
s/\(bodyPadding:\) '[^']*'/\1 '20 15 20 15'/
|
||||||
s/height: [0-9]\+/minHeight: 360,\n\tflex: 1/
|
s/height: [0-9]\+/minHeight: 360,\n\tflex: 1/
|
||||||
s/\(tableAttrs:.*$\)/trAttrs: \{ valign: 'top' \},\n\t\1/}" "$pvemanagerlib"
|
s/\(tableAttrs:.*$\)/trAttrs: \{ valign: 'top' \},\n\t\1/}" "$pvemanagerlibjs"
|
||||||
|
msg "Expanded space in \"$pvemanagerlibjs\"."
|
||||||
echo "Expanded space in \"$pvemanagerlib\""
|
|
||||||
|
|
||||||
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
||||||
:a;
|
:a;
|
||||||
@ -171,7 +199,7 @@ function install_mod {
|
|||||||
a\
|
a\
|
||||||
\\
|
\\
|
||||||
{\n\
|
{\n\
|
||||||
itemId: 'thermal',\n\
|
itemId: 'thermalCpu',\n\
|
||||||
colspan: 1,\n\
|
colspan: 1,\n\
|
||||||
printBar: false,\n\
|
printBar: false,\n\
|
||||||
title: gettext('CPU Thermal State'),\n\
|
title: gettext('CPU Thermal State'),\n\
|
||||||
@ -179,33 +207,38 @@ function install_mod {
|
|||||||
textField: 'thermalstate',\n\
|
textField: 'thermalstate',\n\
|
||||||
renderer: function(value){\n\
|
renderer: function(value){\n\
|
||||||
// sensors configuration\n\
|
// sensors configuration\n\
|
||||||
const cpuAddress = \"$cpu_address\";\n\
|
const cpuAddress = \"$CPU_ADDRESS\";\n\
|
||||||
const cpuItemPrefix = \"$cpu_item_prefix\";\n\
|
const cpuItemPrefix = \"$CPU_ITEM_PREFIX\";\n\
|
||||||
|
const cpuTempCaption = \"$CPU_TEMP_CAPTION\";\n\
|
||||||
// display configuration\n\
|
// display configuration\n\
|
||||||
const coresPerRow = $cpuPerRow;\n\\n\
|
const itemsPerRow = $CPU_ITEMS_PER_ROW;\n\
|
||||||
|
// ---\n\
|
||||||
const objValue = JSON.parse(value);\n\
|
const objValue = JSON.parse(value);\n\
|
||||||
if(objValue.hasOwnProperty(cpuAddress)) \{\n\
|
if(objValue.hasOwnProperty(cpuAddress)) {\n\
|
||||||
items = objValue[cpuAddress],\n\
|
const items = objValue[cpuAddress],\n\
|
||||||
coreKeys = Object.keys(items).filter(item => \{ return String(item).includes(cpuItemPrefix); \}).sort();\n\\n\
|
itemKeys = Object.keys(items).filter(item => { return String(item).startsWith(cpuItemPrefix); }).sort();\n\
|
||||||
let temps = [];\n\
|
let temps = [];\n\
|
||||||
coreKeys.forEach((coreKey, index) => \{\n\
|
itemKeys.forEach((coreKey, index) => {\n\
|
||||||
try \{\n\
|
try {\n\
|
||||||
Object.keys(items[coreKey]).forEach((secondLevelKey) => {\n\
|
Object.keys(items[coreKey]).forEach((secondLevelKey) => {\n\
|
||||||
if (secondLevelKey.includes('_input')) {\n\
|
if (secondLevelKey.includes('_input')) {\n\
|
||||||
let temp = items[coreKey][secondLevelKey];\n\
|
let temp = items[coreKey][secondLevelKey];\n\
|
||||||
temps.push(\`Core \$\{index\}: \$\{temp\}°C\`);\n\
|
temps.push(\`\${cpuTempCaption} \${index}: \${temp}°C\`);\n\
|
||||||
}\n\
|
}\n\
|
||||||
})\n\
|
})\n\
|
||||||
\} catch(e) \{ /*_*/ \}\n\
|
} catch(e) { /*_*/ }\n\
|
||||||
});\n\\n\
|
});\n\
|
||||||
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % coresPerRow === 0 ? '<br>' : ' | ') : '')});\n\
|
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % itemsPerRow === 0 ? '<br>' : ' | ') : '')});\n\
|
||||||
return result.length > 0 ? result.join('') : 'N/A';\n\
|
return result.length > 0 ? result.join('') : 'N/A';\n\
|
||||||
\}\n\
|
}\n\
|
||||||
}\n\
|
}\n\
|
||||||
},
|
},
|
||||||
}" "$pvemanagerlib"
|
}" "$pvemanagerlibjs"
|
||||||
|
|
||||||
if [ $enableNvmeTemp = true ]; then
|
#
|
||||||
|
# NOTE: The following items will be added in reverse order
|
||||||
|
#
|
||||||
|
if [ $enableHddTemp = true ]; then
|
||||||
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
||||||
:a;
|
:a;
|
||||||
/items:/!{N;ba;}
|
/items:/!{N;ba;}
|
||||||
@ -213,54 +246,13 @@ function install_mod {
|
|||||||
/thermal.*},/!{N;bb;}
|
/thermal.*},/!{N;bb;}
|
||||||
a\
|
a\
|
||||||
\\
|
\\
|
||||||
{\n\
|
|
||||||
itemId: 'thermal2',\n\
|
|
||||||
colspan: 1,\n\
|
|
||||||
printBar: false,\n\
|
|
||||||
title: gettext('NVME Thermal State'),\n\
|
|
||||||
iconCls: 'fa fa-fw fa-thermometer-half',\n\
|
|
||||||
textField: 'thermalstate',\n\
|
|
||||||
renderer: function(value) {\n\
|
|
||||||
// sensors configuration\n\
|
|
||||||
const addressPrefix = \"nvme-pci-\";\n\
|
|
||||||
const sensorName = \"Composite\";\n\
|
|
||||||
// display configuration\n\
|
|
||||||
const drivesPerRow = ${nvmePerRow};\n\
|
|
||||||
const objValue = JSON.parse(value);\n\
|
|
||||||
nvmeKeys = Object.keys(objValue).filter(item => String(item).startsWith(addressPrefix)).sort();\n\
|
|
||||||
let temps = [];\n\
|
|
||||||
nvmeKeys.forEach((nvmeKey, index) => {\n\
|
|
||||||
try {\n\
|
|
||||||
Object.keys(objValue[nvmeKey][sensorName]).forEach((secondLevelKey) => {\n\
|
|
||||||
if (secondLevelKey.includes('_input')) {\n\
|
|
||||||
let temp = objValue[nvmeKey][sensorName][secondLevelKey];\n\
|
|
||||||
temps.push(\`Drive \$\{index\}: \$\{temp\}°C\`);\n\
|
|
||||||
}\n\
|
|
||||||
})\n\
|
|
||||||
} catch(e) { /*_*/ }\n\
|
|
||||||
});\n\
|
|
||||||
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % drivesPerRow === 0 ? '<br>' : ' | ') : ''); });\n\
|
|
||||||
return result.length > 0 ? result.join('') : 'N/A';\n\
|
|
||||||
\}\n\
|
|
||||||
},
|
|
||||||
}" "$pvemanagerlib"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $enableHddSsdTemp = true ]; then
|
|
||||||
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
|
||||||
:a;
|
|
||||||
/items:/!{N;ba;}
|
|
||||||
:b;
|
|
||||||
/thermal2.*},/!{N;bb;}
|
|
||||||
a\
|
|
||||||
\\
|
|
||||||
{\n\
|
{\n\
|
||||||
xtype: 'box',\n\
|
xtype: 'box',\n\
|
||||||
colspan: 1,\n\
|
colspan: 1,\n\
|
||||||
padding: '0 0 20 0',\n\
|
padding: '0 0 20 0',\n\
|
||||||
},\n\
|
},\n\
|
||||||
{\n\
|
{\n\
|
||||||
itemId: 'thermal3',\n\
|
itemId: 'thermalHdd',\n\
|
||||||
colspan: 1,\n\
|
colspan: 1,\n\
|
||||||
printBar: false,\n\
|
printBar: false,\n\
|
||||||
title: gettext('HDD/SSD Thermal State'),\n\
|
title: gettext('HDD/SSD Thermal State'),\n\
|
||||||
@ -271,90 +263,136 @@ function install_mod {
|
|||||||
const addressPrefix = \"drivetemp-scsi-\";\n\
|
const addressPrefix = \"drivetemp-scsi-\";\n\
|
||||||
const sensorName = \"temp1\";\n\
|
const sensorName = \"temp1\";\n\
|
||||||
// display configuration\n\
|
// display configuration\n\
|
||||||
const drivesPerRow = ${hddPerRow};\n\
|
const itemsPerRow = ${HDD_ITEMS_PER_ROW};\n\
|
||||||
const objValue = JSON.parse(value);\n\
|
const objValue = JSON.parse(value);\n\
|
||||||
drvKeys = Object.keys(objValue).filter(item => String(item).startsWith(addressPrefix)).sort();\n\
|
// ---\n\
|
||||||
|
const drvKeys = Object.keys(objValue).filter(item => String(item).startsWith(addressPrefix)).sort();\n\
|
||||||
let temps = [];\n\
|
let temps = [];\n\
|
||||||
drvKeys.forEach((drvKey, index) => {\n\
|
drvKeys.forEach((drvKey, index) => {\n\
|
||||||
try {\n\
|
try {\n\
|
||||||
Object.keys(objValue[drvKey][sensorName]).forEach((secondLevelKey) => {\n\
|
Object.keys(objValue[drvKey][sensorName]).forEach((secondLevelKey) => {\n\
|
||||||
if (secondLevelKey.includes('_input')) {\n\
|
if (secondLevelKey.includes('_input')) {\n\
|
||||||
let temp = objValue[drvKey][sensorName][secondLevelKey];\n\
|
let temp = objValue[drvKey][sensorName][secondLevelKey];\n\
|
||||||
temps.push(\`Drive \$\{index\}: \$\{temp\}°C\`);\n\
|
temps.push(\`Drive \${index}: \${temp}°C\`);\n\
|
||||||
}\n\
|
}\n\
|
||||||
})\n\
|
})\n\
|
||||||
} catch(e) { /*_*/ }\n\
|
} catch(e) { /*_*/ }\n\
|
||||||
});\n\
|
});\n\
|
||||||
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % drivesPerRow === 0 ? '<br>' : ' | ') : ''); });\n\
|
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % itemsPerRow === 0 ? '<br>' : ' | ') : ''); });\n\
|
||||||
return result.length > 0 ? result.join('') : 'N/A';\n\
|
return result.length > 0 ? result.join('') : 'N/A';\n\
|
||||||
\}\n\
|
}\n\
|
||||||
},
|
},
|
||||||
}" "$pvemanagerlib"
|
}" "$pvemanagerlibjs"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Added new item to the items array in \"$pvemanagerlib\""
|
if [ $enableNvmeTemp = true ]; then
|
||||||
|
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
||||||
|
:a;
|
||||||
|
/items:/!{N;ba;}
|
||||||
|
:b;
|
||||||
|
/thermal.*},/!{N;bb;}
|
||||||
|
a\
|
||||||
|
\\
|
||||||
|
{\n\
|
||||||
|
itemId: 'thermalNvme',\n\
|
||||||
|
colspan: 1,\n\
|
||||||
|
printBar: false,\n\
|
||||||
|
title: gettext('NVME Thermal State'),\n\
|
||||||
|
iconCls: 'fa fa-fw fa-thermometer-half',\n\
|
||||||
|
textField: 'thermalstate',\n\
|
||||||
|
renderer: function(value) {\n\
|
||||||
|
// sensors configuration\n\
|
||||||
|
const addressPrefix = \"nvme-pci-\";\n\
|
||||||
|
const sensorName = \"Composite\";\n\
|
||||||
|
// display configuration\n\
|
||||||
|
const itemsPerRow = ${NVME_ITEMS_PER_ROW};\n\
|
||||||
|
// ---\n\
|
||||||
|
const objValue = JSON.parse(value);\n\
|
||||||
|
const nvmeKeys = Object.keys(objValue).filter(item => String(item).startsWith(addressPrefix)).sort();\n\
|
||||||
|
let temps = [];\n\
|
||||||
|
nvmeKeys.forEach((nvmeKey, index) => {\n\
|
||||||
|
try {\n\
|
||||||
|
Object.keys(objValue[nvmeKey][sensorName]).forEach((secondLevelKey) => {\n\
|
||||||
|
if (secondLevelKey.includes('_input')) {\n\
|
||||||
|
let temp = objValue[nvmeKey][sensorName][secondLevelKey];\n\
|
||||||
|
temps.push(\`Drive \${index}: \${temp}°C\`);\n\
|
||||||
|
}\n\
|
||||||
|
})\n\
|
||||||
|
} catch(e) { /*_*/ }\n\
|
||||||
|
});\n\
|
||||||
|
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % itemsPerRow === 0 ? '<br>' : ' | ') : ''); });\n\
|
||||||
|
return result.length > 0 ? result.join('') : 'N/A';\n\
|
||||||
|
}\n\
|
||||||
|
},
|
||||||
|
}" "$pvemanagerlibjs"
|
||||||
|
fi
|
||||||
|
|
||||||
|
msg "New temperature display items added to the summary panel in \"$pvemanagerlibjs\"."
|
||||||
|
|
||||||
|
restart_proxy
|
||||||
else
|
else
|
||||||
echo "New item already added to items array \"$pvemanagerlib\""
|
warn "New temperature display items already added to the summary panel in \"$pvemanagerlibjs\"."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Restart pveproxy
|
|
||||||
systemctl restart pveproxy
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Function to uninstall the modification
|
# Function to uninstall the modification
|
||||||
function uninstall_mod {
|
function uninstall_mod {
|
||||||
|
msg "\nRestoring modified files..."
|
||||||
# Find the latest Nodes.pm file using the find command
|
# Find the latest Nodes.pm file using the find command
|
||||||
latest_Nodes_pm=$(find "$backupLocation" -name "Nodes.pm.*" -type f -printf '%T+ %p\n' 2>/dev/null | sort -r | head -n 1 | awk '{print $2}')
|
local latest_nodes_pm=$(find "$BACKUP_DIR" -name "Nodes.pm.*" -type f -printf '%T+ %p\n' 2>/dev/null | sort -r | head -n 1 | awk '{print $2}')
|
||||||
|
|
||||||
if [ -z "$latest_Nodes_pm" ]; then
|
if [ -z "$latest_nodes_pm" ]; then
|
||||||
echo "No Nodes.pm files found"
|
warn "No Nodes.pm files found."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the latest Nodes.pm file
|
# Remove the latest Nodes.pm file
|
||||||
cp "$latest_Nodes_pm" "$nodespm"
|
cp "$latest_nodes_pm" "$nodespm"
|
||||||
echo "Copied latest backup to $nodespm"
|
msg "Copied latest backup to $nodespm."
|
||||||
|
|
||||||
# Find the latest pvemanagerlib file using the find command
|
# Find the latest pvemanagerlib.js file using the find command
|
||||||
latest_pvemanagerlib_js=$(find "$backupLocation" -name "pvemanagerlib.js.*" -type f -printf '%T+ %p\n' 2>/dev/null | sort -r | head -n 1 | awk '{print $2}')
|
local latest_pvemanagerlibjs=$(find "$BACKUP_DIR" -name "pvemanagerlib.js.*" -type f -printf '%T+ %p\n' 2>/dev/null | sort -r | head -n 1 | awk '{print $2}')
|
||||||
|
|
||||||
if [ -z "$latest_pvemanagerlib_js" ]; then
|
if [ -z "$latest_pvemanagerlibjs" ]; then
|
||||||
echo "No pvemanagerlib.js files found"
|
warn "No pvemanagerlib.js files found."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the latest Nodes.pm file
|
# Remove the latest Nodes.pm file
|
||||||
cp "$latest_pvemanagerlib_js" "$pvemanagerlib"
|
cp "$latest_pvemanagerlibjs" "$pvemanagerlibjs"
|
||||||
echo "Copied latest backup to \"$pvemanagerlib\""
|
msg "Copied latest backup to \"$pvemanagerlibjs\"."
|
||||||
|
|
||||||
|
restart_proxy
|
||||||
|
}
|
||||||
|
|
||||||
|
function restart_proxy {
|
||||||
# Restart pveproxy
|
# Restart pveproxy
|
||||||
|
msg "\nRestarting PVE proxy..."
|
||||||
systemctl restart pveproxy
|
systemctl restart pveproxy
|
||||||
}
|
}
|
||||||
|
|
||||||
# If no arguments were provided or all arguments have been processed, print the usage message
|
|
||||||
if [[ $# -eq 0 ]]; then
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Process the arguments using a while loop and a case statement
|
# Process the arguments using a while loop and a case statement
|
||||||
|
executed=0
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
install)
|
install)
|
||||||
echo "Installing the proxmox temp mod..."
|
executed=$(($executed + 1))
|
||||||
|
msgb "\nInstalling the Proxmox VE temperatures display mod..."
|
||||||
install_packages
|
install_packages
|
||||||
configure
|
|
||||||
install_mod
|
install_mod
|
||||||
|
echo # add a new line
|
||||||
;;
|
;;
|
||||||
uninstall)
|
uninstall)
|
||||||
echo "Uninstalling the proxmox temp mod..."
|
executed=$(($executed + 1))
|
||||||
|
msgb "\nUninstalling the Proxmox VE temperatures display mod..."
|
||||||
uninstall_mod
|
uninstall_mod
|
||||||
;;
|
echo # add a new line
|
||||||
*)
|
|
||||||
usage
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
echo ""
|
# If no arguments were provided or all arguments have been processed, print the usage message
|
||||||
exit 0
|
if [[ $executed -eq 0 ]]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user