xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Sync usage, man and code for ipmi rvitals

Browse Source
This commit is contained in:
Mark Gurevich 2017-06-05 10:56:59 -04:00
parent 89356b69a2
commit d861f68995
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst
View File

@ -46,7 +46,7 @@ The xCAT ``rcons`` command relies on conserver (http://www.conserver.com/). The
OpenBMC Specific
```````````````
````````````````
#. For OpenBMC managed servers, the root user must be able to ssh passwordless to the BMC for the ``rcons`` function to work.

8
docs/source/guides/admin-guides/references/man1/rvitals.1.rst
View File

@ -60,7 +60,7 @@ OpenPOWER (IPMI) specific:
==========================
\ **rvitals**\ \ *noderange*\ [\ **temp | voltage | wattage | fanspeed | power | leds | all**\ ]
\ **rvitals**\ \ *noderange*\ [\ **temp | voltage | wattage | fanspeed | power | leds | chassis | all**\ ]
OpenPOWER (OpenBMC) specific:
@ -140,6 +140,12 @@ Processor for a single or range of nodes and groups.
\ **chassis**\
Retrieves chassis status.
\ **altitude**\
Retrieves altitude related attributes.

2
perl-xCAT/xCAT/Usage.pm
View File

@ -82,7 +82,7 @@ my %usage = (
BMC specific:
rvitals noderange {temp|voltage|wattage|fanspeed|power|leds|all}
OpenPOWER (IPMI) specific:
rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|all]
rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|chassis|all]
OpenPOWER (OpenBMC) specific:
rvitals noderange [temp|voltage|wattage|fanspeed|power|altitude|all]
MIC specific:

6
xCAT-client/pods/man1/rvitals.1.pod
View File

@ -28,7 +28,7 @@ B<rvitals> I<noderange> {B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<le
=head2 OpenPOWER (IPMI) specific:
B<rvitals> I<noderange> [B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<all>]
B<rvitals> I<noderange> [B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<chassis>|B<all>]
=head2 OpenPOWER (OpenBMC) specific:
@ -79,6 +79,10 @@ Retrieves rack environmentals.
Retrieves LEDs status.
=item B<chassis>
Retrieves chassis status.
=item B<altitude>
Retrieves altitude related attributes.

16
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@ -6506,30 +6506,30 @@ sub vitals {
$sensor_filters{leds} = 1;
$doall = 1;
}
if (grep /temp/, @textfilters) {
if (grep /^temp$/, @textfilters) {
$sensor_filters{0x01} = 1;
}
if (grep /volt/, @textfilters) {
if (grep /^voltage$/, @textfilters) {
$sensor_filters{0x02} = 1;
}
if (grep /watt/, @textfilters) {
if (grep /^wattage$/, @textfilters) {
$sensor_filters{watt} = 1;
}
if (grep /fan/, @textfilters) {
if (grep /^fanspeed$/, @textfilters) {
$sensor_filters{0x04} = 1;
}
if (grep /power/, @textfilters) { #power does not really include energy, but most people use 'power' to mean both
if (grep /^power$/, @textfilters) { #power does not really include energy, but most people use 'power' to mean both
$sensor_filters{0x03} = 1;
$sensor_filters{powerstate} = 1;
$sensor_filters{energy} = 1;
}
if (grep /energy/, @textfilters) {
if (grep /^energy$/, @textfilters) {
$sensor_filters{energy} = 1;
}
if (grep /led/, @textfilters) {
if (grep /^leds$/, @textfilters) {
$sensor_filters{leds} = 1;
}
if (grep /chassis/, @textfilters) {
if (grep /^chassis$/, @textfilters) {
$sensor_filters{chassis} = 1;
}
unless (keys %sensor_filters) {