Ask user for input for CPU configuration (#4)
* More flexible CPU detection. Ask user to input correct parameters. Examples are presented to guide the user * Amd temps are by default limited to "Tccd" whereas Intel is "Cores" * Rework indexing of all temperature items. CPU temps will be presented in the order presented from lm-sensors * Dynamically add temps and only show temps that are available (CPU, HDD, SSD, NVMe) * Change default backup location to same location as the script * Reworked script output messages * Many code quality improvements * Visual improvements temp display in proxmox gui Resolves #1 , #3, #5 --------- Co-authored-by: Meliox Co-authored-by: rmm
This commit is contained in:
Meliox
GitHub
parent
496b250ca3
commit
b642d4c102
16
.gitignore
vendored
Normal file
16
.gitignore
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
################################################################################
|
||||||
|
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
/.vs/PVE-mods/FileContentIndex/b0cd8cf0-a894-4523-bdd5-7f3d85072f7f.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex/c351d5b4-2706-444a-87b2-a910a8873e48.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex/cd6884c2-daf4-47a9-8bbd-cf8a4f886075.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex/read.lock
|
||||||
|
/.vs/PVE-mods/v17
|
||||||
|
/.vs/PVE-mods/v17/.wsuo
|
||||||
|
/.vs/slnx.sqlite
|
||||||
|
/.vs/VSWorkspaceState.json
|
||||||
|
/.vs/PVE-mods/FileContentIndex/8b60d584-2422-418a-808a-7a62a50425b3.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex/aecfa7d2-4343-412e-a663-cd485991e27d.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex/da25d4cb-f11b-4cdb-b231-55efa7695267.vsidx
|
||||||
|
/.vs/PVE-mods/FileContentIndex
|
||||||
@ -1,34 +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;
|
||||||
|
|
||||||
################### code below #############
|
# Known CPU sensor names. They can be full or partial but should ensure unambiguous identification.
|
||||||
timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
|
# Should new ones be added, also update logic in configure() function.
|
||||||
|
KNOWN_CPU_SENSORS=("coretemp-isa-" "k10temp-pci-")
|
||||||
|
|
||||||
echo ""
|
# This script's working directory
|
||||||
|
SCRIPT_CWD="$(dirname "$(readlink -f "$0")")"
|
||||||
|
|
||||||
|
# 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
|
||||||
@ -41,58 +66,132 @@ 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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Call the 'install_packages' function to check if lm-sensors is installed and install it if necessary
|
function configure {
|
||||||
install_packages
|
local sensorOutput=$(sensors -j)
|
||||||
|
|
||||||
|
# Check if HDD/SSD data is installed
|
||||||
|
msg "\nDetecting support for HDD/SDD temperature sensors..."
|
||||||
|
if (lsmod | grep -wq "drivetemp"); then
|
||||||
|
# Check if SDD/HDD data is available
|
||||||
|
if (echo "$sensorOutput" | grep -q "drivetemp-scsi-" ); then
|
||||||
|
msg "Detected sensors:\n$(echo "$sensorOutput" | grep -o '"drivetemp-scsi[^"]*"' | sed 's/"//g')"
|
||||||
|
enableHddTemp=true
|
||||||
|
else
|
||||||
|
warn "Kernel module \"drivetemp\" is not installed. HDD/SDD temperatures will not be available."
|
||||||
|
enableHddTemp=false
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
enableHddTemp=false
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if NVMe data is available
|
||||||
|
msg "\nDetecting support for NVMe temperature sensors..."
|
||||||
|
if (echo "$sensorOutput" | grep -q "nvme-" ); then
|
||||||
|
msg "Detected sensors:\n$(echo "$sensorOutput" | grep -o '"nvme[^"]*"' | sed 's/"//g')"
|
||||||
|
enableNvmeTemp=true
|
||||||
|
else
|
||||||
|
warn "No NVMe temperature sensors found."
|
||||||
|
enableNvmeTemp=false
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if CPU is part of known list for autoconfiguration
|
||||||
|
msg "\nDetecting support for CPU temperature sensors..."
|
||||||
|
for item in "${KNOWN_CPU_SENSORS[@]}"; do
|
||||||
|
if (echo "$sensorOutput" | grep -q "$item"); then
|
||||||
|
case "$item" in
|
||||||
|
"coretemp-"*)
|
||||||
|
CPU_ADDRESS="$(echo "$sensorOutput" | grep "$item" | sed 's/"//g;s/:{//;s/^\s*//')"
|
||||||
|
CPU_ITEM_PREFIX="Core "
|
||||||
|
CPU_TEMP_CAPTION="Core"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
"k10temp-"*)
|
||||||
|
CPU_ADDRESS="$(echo "$sensorOutput" | grep "$item" | sed 's/"//g;s/:{//;s/^\s*//')"
|
||||||
|
CPU_ITEM_PREFIX="Tccd"
|
||||||
|
CPU_TEMP_CAPTION="Temp"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "$CPU_ADDRESS" ]; then
|
||||||
|
msg "Detected sensor:\n$CPU_ADDRESS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If cpu is not known, ask the user for input
|
||||||
|
if [ -z "$CPU_ADDRESS" ]; then
|
||||||
|
warn "Could not automatically detect the CPU temperature sensor. Please configure it manually."
|
||||||
|
# Ask user for CPU information
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# Print the output to the user
|
||||||
|
msg "Sensor output:\n${sensorOutput}"
|
||||||
|
|
||||||
|
# Prompt the user for adapter name and item name
|
||||||
|
read -p "Enter the CPU sensor address (e.g.: coretemp-isa-0000 or k10temp-pci-00c3): " CPU_ADDRESS
|
||||||
|
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
|
||||||
|
|
||||||
|
if [[ -z "$CPU_ADDRESS" || -z "$CPU_ITEM_PREFIX" ]]; then
|
||||||
|
warn "The CPU configuration is not complete. Temperatures will not be available."
|
||||||
|
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..."
|
||||||
|
|
||||||
|
# Provide sensor configuration
|
||||||
|
configure
|
||||||
|
|
||||||
# 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
|
||||||
# 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;
|
||||||
@ -102,7 +201,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\
|
||||||
@ -110,67 +209,49 @@ function install_mod {
|
|||||||
textField: 'thermalstate',\n\
|
textField: 'thermalstate',\n\
|
||||||
renderer: function(value){\n\
|
renderer: function(value){\n\
|
||||||
// sensors configuration\n\
|
// sensors configuration\n\
|
||||||
const address = \"coretemp-isa-0000\",\n\
|
const cpuAddress = \"$CPU_ADDRESS\";\n\
|
||||||
itemPrefix = \"Core \",\n\
|
const cpuItemPrefix = \"$CPU_ITEM_PREFIX\";\n\
|
||||||
tempInputOffset = $CPUtempInputOffset; // see tempN_input for \"Core 0\"\n\
|
const cpuTempCaption = \"$CPU_TEMP_CAPTION\";\n\
|
||||||
// display configuration\n\
|
// display configuration\n\
|
||||||
const coresPerRow = $CPUPerRow;\n\
|
const itemsPerRow = $CPU_ITEMS_PER_ROW;\n\
|
||||||
\n\
|
// ---\n\
|
||||||
const objValue = JSON.parse(value);\n\
|
const objValue = JSON.parse(value);\n\
|
||||||
if(objValue.hasOwnProperty(address)) \{\n\
|
if(objValue.hasOwnProperty(cpuAddress)) {\n\
|
||||||
const items = objValue[address],\n\
|
const items = objValue[cpuAddress],\n\
|
||||||
coreKeys = Object.keys(items).filter(item => \{ return String(item).startsWith(itemPrefix); \}).sort();\n\
|
itemKeys = Object.keys(items).filter(item => { return String(item).startsWith(cpuItemPrefix); });\n\
|
||||||
\n\
|
|
||||||
let temps = [];\n\
|
let temps = [];\n\
|
||||||
coreKeys.forEach((coreKey, index) => \{\n\
|
itemKeys.forEach((coreKey) => {\n\
|
||||||
try \{\n\
|
try {\n\
|
||||||
let temp = items[itemPrefix + index][\`temp\$\{tempInputOffset + index\}_input\`];\n\
|
Object.keys(items[coreKey]).forEach((secondLevelKey) => {\n\
|
||||||
temps.push(\`Core \$\{index\}: \$\{temp\}°C\`);\n\
|
if (secondLevelKey.includes('_input')) {\n\
|
||||||
\} catch(e) \{ /*_*/ \}\n\
|
let temp = items[coreKey][secondLevelKey];\n\
|
||||||
});\n\
|
let index = coreKey.match(/\\\S+\\\s*(\\\d+)/);\n\
|
||||||
\n\
|
index = (index !== null && index.length > 1) ? index[1] : '?';\n\
|
||||||
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % coresPerRow === 0 ? '<br>' : ' | ') : '')});\n\
|
temps.push(\`\${cpuTempCaption} \${index}: \${temp}°C\`);\n\
|
||||||
return result.length > 0 ? result.join('') : 'N/A';\n\
|
|
||||||
\}\n\
|
|
||||||
}\n\
|
}\n\
|
||||||
},\n\
|
})\n\
|
||||||
{\n\
|
} catch(e) { /*_*/ }\n\
|
||||||
itemId: 'thermal2',\n\
|
});\n\
|
||||||
colspan: 1,\n\
|
const result = temps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? ((index + 1) % itemsPerRow === 0 ? '<br>' : ' | ') : '')});\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\
|
|
||||||
sensorName = \"Composite\",\n\
|
|
||||||
tempInputNo = 1;\n\
|
|
||||||
// display configuration\n\
|
|
||||||
const drivesPerRow = $NVMEPerRow;\n\
|
|
||||||
\n\
|
|
||||||
const objValue = JSON.parse(value),\n\
|
|
||||||
nvmeKeys = Object.keys(objValue).filter(item => \{ return String(item).startsWith(addressPrefix); \}).sort();\n\
|
|
||||||
\n\
|
|
||||||
let temps = [];\n\
|
|
||||||
nvmeKeys.forEach((nvmeKey, index) => \{\n\
|
|
||||||
try \{\n\
|
|
||||||
let temp = objValue[nvmeKey][sensorName][\`temp\$\{tempInputNo\}_input\`];\n\
|
|
||||||
temps.push(\`Drive \$\{index\}: \$\{temp\}°C\`);\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\
|
|
||||||
return result.length > 0 ? result.join('') : 'N/A';\n\
|
return result.length > 0 ? result.join('') : 'N/A';\n\
|
||||||
\}\n\
|
}\n\
|
||||||
},\n\
|
}\n\
|
||||||
|
},
|
||||||
|
}" "$pvemanagerlibjs"
|
||||||
|
|
||||||
|
#
|
||||||
|
# NOTE: The following items will be added in reverse order
|
||||||
|
#
|
||||||
|
if [ $enableHddTemp = true ]; then
|
||||||
|
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
||||||
|
:a;
|
||||||
|
/items:/!{N;ba;}
|
||||||
|
:b;
|
||||||
|
/'thermal.*},/!{N;bb;}
|
||||||
|
a\
|
||||||
|
\\
|
||||||
{\n\
|
{\n\
|
||||||
xtype: 'box',\n\
|
itemId: 'thermalHdd',\n\
|
||||||
colspan: 1,\n\
|
|
||||||
padding: '0 0 20 0',\n\
|
|
||||||
},\n\
|
|
||||||
{\n\
|
|
||||||
itemId: 'thermal3',\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\
|
||||||
@ -178,90 +259,156 @@ function install_mod {
|
|||||||
textField: 'thermalstate',\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\
|
const sensorName = \"temp1\";\n\
|
||||||
tempInputNo = 1;\n\
|
|
||||||
// display configuration\n\
|
// display configuration\n\
|
||||||
const drivesPerRow = $HDDPerRow;\n\
|
const itemsPerRow = ${HDD_ITEMS_PER_ROW};\n\
|
||||||
\n\
|
const objValue = JSON.parse(value);\n\
|
||||||
const objValue = JSON.parse(value),\n\
|
// ---\n\
|
||||||
drvKeys = Object.keys(objValue).filter(item => { return String(item).startsWith(addressPrefix); }).sort();\n\
|
const drvKeys = Object.keys(objValue).filter(item => String(item).startsWith(addressPrefix)).sort();\n\
|
||||||
\n\
|
|
||||||
let temps = [];\n\
|
let temps = [];\n\
|
||||||
drvKeys.forEach((drvKey, index) => {\n\
|
drvKeys.forEach((drvKey, index) => {\n\
|
||||||
try {\n\
|
try {\n\
|
||||||
let temp = objValue[drvKey][sensorName][\`temp\${tempInputNo}_input\`];\n\
|
Object.keys(objValue[drvKey][sensorName]).forEach((secondLevelKey) => {\n\
|
||||||
temps.push(\`Drive \${index}: \${temp}°C\`);\n\
|
if (secondLevelKey.includes('_input')) {\n\
|
||||||
|
let temp = objValue[drvKey][sensorName][secondLevelKey];\n\
|
||||||
|
temps.push(\`Drive \${index + 1}: \${temp}°C\`);\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) % itemsPerRow === 0 ? '<br>' : ' | ') : ''); });\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\
|
return result.length > 0 ? result.join('') : 'N/A';\n\
|
||||||
}\n\
|
}\n\
|
||||||
},
|
},
|
||||||
}" $pvemanagerlib
|
}" "$pvemanagerlibjs"
|
||||||
echo "Added new item to the items array in $pvemanagerlib"
|
|
||||||
else
|
|
||||||
echo "New item already added to items array $pvemanagerlib"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Restart pveproxy
|
if [ $enableNvmeTemp = true ]; then
|
||||||
systemctl restart pveproxy
|
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 + 1}: \${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
|
||||||
|
|
||||||
|
if [ $enableNvmeTemp = true -a $enableHddTemp = true ]; then
|
||||||
|
sed -i "/^Ext.define('PVE.node.StatusView',/ {
|
||||||
|
:a;
|
||||||
|
/^.*{.*'thermalNvme'.*},/!{N;ba;}
|
||||||
|
a\
|
||||||
|
\\
|
||||||
|
{\n\
|
||||||
|
xtype: 'box',\n\
|
||||||
|
colspan: 1,\n\
|
||||||
|
padding: '0 0 20 0',\n\
|
||||||
|
},
|
||||||
|
}" "$pvemanagerlibjs"
|
||||||
|
fi
|
||||||
|
|
||||||
|
msg "New temperature display items added to the summary panel in \"$pvemanagerlibjs\"."
|
||||||
|
|
||||||
|
restart_proxy
|
||||||
|
|
||||||
|
msg "Installation completed"
|
||||||
|
else
|
||||||
|
warn "New temperature display items already added to the summary panel in \"$pvemanagerlibjs\"."
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# 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 [ -n "$latest_nodes_pm" ]; then
|
||||||
echo "No Nodes.pm files found"
|
# Remove the latest Nodes.pm file
|
||||||
exit 1
|
cp "$latest_nodes_pm" "$nodespm"
|
||||||
|
msg "Copied latest backup to $nodespm."
|
||||||
|
else
|
||||||
|
warn "No Nodes.pm files found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the latest Nodes.pm file
|
# Find the latest pvemanagerlib.js file using the find command
|
||||||
cp "$latest_Nodes_pm" "$nodespm"
|
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}')
|
||||||
echo "Copied latest backup to $nodespm"
|
|
||||||
|
|
||||||
# Find the latest pvemanagerlib file using the find command
|
if [ -n "$latest_pvemanagerlibjs" ]; then
|
||||||
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}')
|
# Remove the latest pvemanagerlib.js file
|
||||||
|
cp "$latest_pvemanagerlibjs" "$pvemanagerlibjs"
|
||||||
if [ -z "$latest_pvemanagerlib_js" ]; then
|
msg "Copied latest backup to \"$pvemanagerlibjs\"."
|
||||||
echo "No latest_pvemanagerlib_js files found"
|
else
|
||||||
exit 1
|
warn "No pvemanagerlib.js files found."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the latest Nodes.pm file
|
if [ -n "$latest_nodes_pm" ] || [ -n "$latest_pvemanagerlibjs" ]; then
|
||||||
cp "$latest_pvemanagerlib_js" "$pvemanagerlib"
|
# At least one of the variables is not empty, restart the proxy
|
||||||
echo "Copied latest backup to $pvemanagerlib"
|
restart_proxy
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
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 mod..."
|
executed=$(($executed + 1))
|
||||||
|
msgb "\nInstalling the Proxmox VE temperatures display mod..."
|
||||||
install_packages
|
install_packages
|
||||||
install_mod
|
install_mod
|
||||||
|
echo # add a new line
|
||||||
;;
|
;;
|
||||||
uninstall)
|
uninstall)
|
||||||
echo "Uninstalling the 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