Fix cputemp rrd

[awilkin87]

This PR addresses Issue #8023, where the CPU temperature graphs stop working after the the recent refactoring.

[AdSchellevis]

@awilkin87 can you dump the output of both commands?

/sbin/sysctl -n dev.cpu.0.temperature hw.acpi.thermal.tz0.temperature hw.temperature.CPU

/sbin/sysctl -ni dev.cpu.0.temperature hw.acpi.thermal.tz0.temperature hw.temperature.CPU

[awilkin87]

Sure, here are outputs and exit codes for my system:

root@opnsense:~ $ /sbin/sysctl -n dev.cpu.0.temperature hw.acpi.thermal.tz0.temperature hw.temperature.CPU
54.0C
sysctl: unknown oid 'hw.acpi.thermal.tz0.temperature'
sysctl: unknown oid 'hw.temperature.CPU'
root@opnsense:~ $ echo $?
2
root@opnsense:~ $ /sbin/sysctl -ni dev.cpu.0.temperature hw.acpi.thermal.tz0.temperature hw.temperature.CPU
49.0C
root@opnsense:~ $ echo $?
0

[AdSchellevis]

@awilkin87 can you revert the changes to Stats/Temperature.php and try again with only the filename shellCmd() should take care of the output.

[awilkin87]

I will test it later tonight, but I believe the -i flag is needed since shellCmd() requires a zero exit code in order to return the output.

[AdSchellevis]

@awilkin87 looks like you're right, only strip the sed in that case and we should be good. thanks!

[awilkin87]

@AdSchellevis I believe the sed is required as well. After removing it, the table/graph view of cputemp is reporting zero for temperature readings. Using rrdtool dump /var/db/rrd/system-cputemp.rrd, those readings are stored as NaN.

Just to be sure, I reset the rrd. While the file was recreated, it did not contain any temperature readings; only NaN.

[AdSchellevis]

@awilkin87 can you try 8e3b4b7 ? the data needs to be cleansed indeed, but better keep it in php to prevent changing multiple shell commands.

[awilkin87]

@AdSchellevis I tested with preg_replace instead of sed. It works as expected.

[AdSchellevis]

@awilkin87 thanks for confirming, I'll ask @fichtner to slip the change into the next release.