diff --git a/Dockerfile b/Dockerfile index dcbcf92..97d53c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "/a ENV IDRAC_HOST local # ENV IDRAC_USERNAME root # ENV IDRAC_PASSWORD calvin -ENV DELL_14_GEN false +ENV DELL_POWEREDGE_GEN_14_OR_NEWER false ENV FAN_SPEED 5 ENV CPU_TEMPERATURE_THRESHOLD 50 ENV CHECK_INTERVAL 60 diff --git a/README.md b/README.md index 2d4b385..6b7f871 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,7 @@ All parameters are optional as they have default values (including default iDRAC - `CHECK_INTERVAL` parameter is the time (in seconds) between each temperature check and potential profile change. **Default** value is 60(s). - `DISABLE_THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE` parameter is a boolean that allows to disable third-party PCIe card Dell default cooling response. **Default** value is false. - `KEEP_THIRD_PARTY_PCIE_CARD_COOLING_RESPONSE_STATE_ON_EXIT` parameter is a boolean that allows to keep the third-party PCIe card Dell default cooling response state upon exit. **Default** value is false, so that it resets the third-party PCIe card Dell default cooling response to Dell default. -- `DELL_14_GEN` parameter that disabled 3rd party PCI calls and outputs CPU temperatures correctly for 14th Gen Dell servers, ex Dell r640, 740 series. Must have idrac 3.30.30.30 or older. **Default** value is false. +- `DELL_POWEREDGE_GEN_14_OR_NEWER` parameter that disabled 3rd party PCI calls and outputs CPU temperatures correctly for 14th Gen Dell servers, ex Dell r640, 740 series. Must have idrac 3.30.30.30 or older. **Default** value is false.
diff --git a/functions.sh b/functions.sh index 78306d1..7d5922e 100644 --- a/functions.sh +++ b/functions.sh @@ -38,7 +38,7 @@ function retrieve_temperatures () { # Parse CPU data local CPU_DATA=$(echo "$DATA" | grep "3\." | grep -Po '\d{2}') - if $DELL_14_GEN + if $DELL_POWEREDGE_GEN_14_OR_NEWER then # 14 Gen server or newer CPU1_TEMPERATURE=$(echo $CPU_DATA | awk '{print $2;}') @@ -48,7 +48,7 @@ function retrieve_temperatures () { fi if $IS_CPU2_TEMPERATURE_SENSOR_PRESENT then - if $DELL_14_GEN + if $DELL_POWEREDGE_GEN_14_OR_NEWER then # 14 Gen server or newer CPU2_TEMPERATURE=$(echo $CPU_DATA | awk '{print $4;}') @@ -74,7 +74,7 @@ function retrieve_temperatures () { function enable_third_party_PCIe_card_Dell_default_cooling_response () { # We could check the current cooling response before applying but it's not very useful so let's skip the test and apply directly - if ! $DELL_14_GEN + if ! $DELL_POWEREDGE_GEN_14_OR_NEWER then # 13 Gen server or older ipmitool -I $IDRAC_LOGIN_STRING raw 0x30 0xce 0x00 0x16 0x05 0x00 0x00 0x00 0x05 0x00 0x00 0x00 0x00 > /dev/null @@ -83,7 +83,7 @@ function enable_third_party_PCIe_card_Dell_default_cooling_response () { function disable_third_party_PCIe_card_Dell_default_cooling_response () { # We could check the current cooling response before applying but it's not very useful so let's skip the test and apply directly - if ! $DELL_14_GEN + if ! $DELL_POWEREDGE_GEN_14_OR_NEWER then # 13 Gen server or older ipmitool -I $IDRAC_LOGIN_STRING raw 0x30 0xce 0x00 0x16 0x05 0x00 0x00 0x00 0x05 0x00 0x01 0x00 0x00 > /dev/null