deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sensor: Add support for csv output

Browse Source
This commit is contained in:
eyjhbb@gmail.com 2018-09-22 13:48:50 +02:00 committed by Alexander Amelkin
parent c70665c3d1
commit 9d49a6edfe
1 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
lib/ipmi_sensor.c
View File

@ -169,7 +169,25 @@ ipmi_sensor_print_fc_discrete(struct ipmi_intf *intf,
} }
if (csv_output) { if (csv_output) {
/* NOT IMPLEMENTED */ printf("%s", sr->s_id);
if (sr->s_reading_valid) {
if (sr->s_has_analog_value) {
/* don't show discrete component */
printf(",%s,%s,%s",
sr->s_a_str, sr->s_a_units, "ok");
} else {
printf(",0x%x,%s,0x%02x%02x",
sr->s_reading, "discrete",
sr->s_data2, sr->s_data3);
}
} else {
printf(",%s,%s,%s",
"na", "discrete", "na");
}
printf(",%s,%s,%s,%s,%s,%s",
"na", "na", "na", "na", "na", "na");
printf("\n");
} else { } else {
if (verbose == 0) { if (verbose == 0) {
/* output format /* output format
@ -270,7 +288,35 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
thresh_available = 0; thresh_available = 0;
if (csv_output) { if (csv_output) {
/* NOT IMPLEMENTED */ printf("%s", sr->s_id);
if (sr->s_reading_valid) {
if (sr->s_has_analog_value)
printf(",%.3f,%s,%s",
sr->s_a_val, sr->s_a_units, thresh_status);
else
printf(",0x%x,%s,%s",
sr->s_reading, sr->s_a_units, thresh_status);
} else {
printf(",%s,%s,%s",
"na", sr->s_a_units, "na");
}
if (thresh_available && sr->full) {
#define PTS(bit, dataidx) { \
print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], ",", "%.3f", "0x%x", "%s"); \
}
PTS(LOWER_NON_RECOV_SPECIFIED, 3);
PTS(LOWER_CRIT_SPECIFIED, 2);
PTS(LOWER_NON_CRIT_SPECIFIED, 1);
PTS(UPPER_NON_CRIT_SPECIFIED, 4);
PTS(UPPER_CRIT_SPECIFIED, 5);
PTS(UPPER_NON_RECOV_SPECIFIED, 6);
#undef PTS
} else {
printf(",%s,%s,%s,%s,%s,%s",
"na", "na", "na", "na", "na", "na");
}
printf("\n");
} else { } else {
if (verbose == 0) { if (verbose == 0) {
/* output format /* output format
@ -289,21 +335,20 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
"na", sr->s_a_units, "na"); "na", sr->s_a_units, "na");
} }
if (thresh_available && sr->full) { if (thresh_available && sr->full) {
#define PTS(bit, dataidx) { \ #define PTS(bit, dataidx) { \
print_thresh_setting(sr->full, rsp->data[0] & (bit), \ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], "| ", "%-10.3f", "0x-8x", "%-10s"); \ rsp->data[(dataidx)], "| ", "%-10.3f", "0x%-8x", "%-10s"); \
} }
PTS(LOWER_NON_RECOV_SPECIFIED, 3); PTS(LOWER_NON_RECOV_SPECIFIED, 3);
PTS(LOWER_CRIT_SPECIFIED, 2); PTS(LOWER_CRIT_SPECIFIED, 2);
PTS(LOWER_NON_CRIT_SPECIFIED, 1); PTS(LOWER_NON_CRIT_SPECIFIED, 1);
PTS(UPPER_NON_CRIT_SPECIFIED, 4); PTS(UPPER_NON_CRIT_SPECIFIED, 4);
PTS(UPPER_CRIT_SPECIFIED, 5); PTS(UPPER_CRIT_SPECIFIED, 5);
PTS(UPPER_NON_RECOV_SPECIFIED, 6); PTS(UPPER_NON_RECOV_SPECIFIED, 6);
#undef PTS #undef PTS
} else { } else {
printf printf("| %-10s| %-10s| %-10s| %-10s| %-10s| %-10s",
("| %-10s| %-10s| %-10s| %-10s| %-10s| %-10s", "na", "na", "na", "na", "na", "na");
"na", "na", "na", "na", "na", "na");
} }
printf("\n"); printf("\n");
@ -346,18 +391,18 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
if (thresh_available) { if (thresh_available) {
if (sr->full) { if (sr->full) {
#define PTS(bit, dataidx, str) { \ #define PTS(bit, dataidx, str) { \
print_thresh_setting(sr->full, rsp->data[0] & (bit), \ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], \ rsp->data[(dataidx)], \
(str), "%.3f\n", "0x%x\n", "%s\n"); \ (str), "%.3f\n", "0x%x\n", "%s\n"); \
} }
PTS(LOWER_NON_RECOV_SPECIFIED, 3, " Lower Non-Recoverable : "); PTS(LOWER_NON_RECOV_SPECIFIED, 3, " Lower Non-Recoverable : ");
PTS(LOWER_CRIT_SPECIFIED, 2, " Lower Critical : "); PTS(LOWER_CRIT_SPECIFIED, 2, " Lower Critical : ");
PTS(LOWER_NON_CRIT_SPECIFIED, 1, " Lower Non-Critical : "); PTS(LOWER_NON_CRIT_SPECIFIED, 1, " Lower Non-Critical : ");
PTS(UPPER_NON_CRIT_SPECIFIED, 4, " Upper Non-Critical : "); PTS(UPPER_NON_CRIT_SPECIFIED, 4, " Upper Non-Critical : ");
PTS(UPPER_CRIT_SPECIFIED, 5, " Upper Critical : "); PTS(UPPER_CRIT_SPECIFIED, 5, " Upper Critical : ");
PTS(UPPER_NON_RECOV_SPECIFIED, 6, " Upper Non-Recoverable : "); PTS(UPPER_NON_RECOV_SPECIFIED, 6, " Upper Non-Recoverable : ");
#undef PTS #undef PTS
} }