Merge branch 'master' into anvil-daemon-debugging

main
digimer-bot 4 years ago committed by GitHub
commit 5b06cf5570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      scancore-agents/scan-ipmitool/scan-ipmitool
  2. 2
      tools/anvil-update-states

@ -130,6 +130,7 @@ $anvil->data->{'scan-ipmitool'} = {
buffer => 2, buffer => 2,
weight => 1, weight => 1,
}, },
### TODO: Support wild-card sensor names.
# If the user wants to assign manual values for a given sensor, they can do # If the user wants to assign manual values for a given sensor, they can do
# so by creating an entry hear where the key is the IPMI-returned sensor # so by creating an entry hear where the key is the IPMI-returned sensor
# name. # name.
@ -178,6 +179,19 @@ $anvil->data->{'scan-ipmitool'} = {
'RAID Controller' => { 'RAID Controller' => {
jump => 15, jump => 15,
}, },
# On Dells, 'Temp{1..4}' change a lot, so we bump the jump.
'Temp1' => {
jump => 20,
},
'Temp2' => {
jump => 20,
},
'Temp3' => {
jump => 20,
},
'Temp4' => {
jump => 20,
},
}, },
# TODO: Remove this and have Striker pull the list of thermal sensors read in the # TODO: Remove this and have Striker pull the list of thermal sensors read in the
# last $timestamp. # last $timestamp.

@ -883,7 +883,7 @@ ORDER BY
{ {
# Mark it as deleted. # Mark it as deleted.
my $query = "UPDATE network_interfaces SET network_interface_operational = 'DELETED' WHERE network_interface_uuid = ".$anvil->Database->quote($network_interface_uuid).";"; my $query = "UPDATE network_interfaces SET network_interface_operational = 'DELETED' WHERE network_interface_uuid = ".$anvil->Database->quote($network_interface_uuid).";";
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0124", variables => { query => $query }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0124", variables => { query => $query }});
$anvil->Database->write({query => $query, source => $THIS_FILE, line => __LINE__}); $anvil->Database->write({query => $query, source => $THIS_FILE, line => __LINE__});
} }

Loading…
Cancel
Save