X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fipmi.c;h=db0e775fe91752beead1076abee09752f40e4a9e;hp=a206521a615465629a303dd578bd1383c6cad2d7;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=a1b19a64325554b0410daaefed3ce229b34958b7 diff --git a/src/ipmi.c b/src/ipmi.c index a206521a..db0e775f 100644 --- a/src/ipmi.c +++ b/src/ipmi.c @@ -26,9 +26,9 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_ignorelist.h" +#include "utils/common/common.h" +#include "utils/ignorelist/ignorelist.h" #include #include @@ -49,12 +49,13 @@ typedef struct c_ipmi_sensor_list_s c_ipmi_sensor_list_t; struct c_ipmi_instance_s { char *name; ignorelist_t *ignorelist; - _Bool notify_add; - _Bool notify_remove; - _Bool notify_notpresent; - _Bool notify_conn; - _Bool sel_enabled; - _Bool sel_clear_event; + ignorelist_t *sel_ignorelist; + bool notify_add; + bool notify_remove; + bool notify_notpresent; + bool notify_conn; + bool sel_enabled; + bool sel_clear_event; char *host; char *connaddr; @@ -62,12 +63,12 @@ struct c_ipmi_instance_s { char *password; unsigned int authtype; - _Bool connected; + bool connected; ipmi_con_t *connection; pthread_mutex_t sensor_list_lock; c_ipmi_sensor_list_t *sensor_list; - _Bool active; + bool active; pthread_t thread_id; int init_in_progress; @@ -79,17 +80,24 @@ struct c_ipmi_sensor_list_s { ipmi_sensor_id_t sensor_id; char sensor_name[DATA_MAX_NAME_LEN]; char sensor_type[DATA_MAX_NAME_LEN]; + char type_instance[DATA_MAX_NAME_LEN]; int sensor_not_present; c_ipmi_sensor_list_t *next; c_ipmi_instance_t *instance; unsigned int use; }; +struct c_ipmi_db_type_map_s { + enum ipmi_unit_type_e type; + const char *type_name; +}; +typedef struct c_ipmi_db_type_map_s c_ipmi_db_type_map_t; + /* * Module global variables */ -static os_handler_t *os_handler = NULL; -static c_ipmi_instance_t *instances = NULL; +static os_handler_t *os_handler; +static c_ipmi_instance_t *instances; /* * Misc private functions @@ -103,9 +111,9 @@ static void c_ipmi_error(c_ipmi_instance_t *st, const char *func, int status) { } if (errbuf[0] == 0) { - snprintf(errbuf, sizeof(errbuf), "Unknown error %#x", status); + ssnprintf(errbuf, sizeof(errbuf), "Unknown error %#x", status); } - errbuf[sizeof(errbuf) - 1] = 0; + errbuf[sizeof(errbuf) - 1] = '\0'; ERROR("ipmi plugin: %s failed for `%s`: %s", func, st->name, errbuf); } /* void c_ipmi_error */ @@ -190,11 +198,11 @@ static void sensor_read_handler(ipmi_sensor_t *sensor, int err, if (st->notify_notpresent) { notification_t n = c_ipmi_notification_init(st, NOTIF_WARNING); - sstrncpy(n.type_instance, list_item->sensor_name, + sstrncpy(n.type_instance, list_item->type_instance, sizeof(n.type_instance)); sstrncpy(n.type, list_item->sensor_type, sizeof(n.type)); - snprintf(n.message, sizeof(n.message), "sensor %s not present", - list_item->sensor_name); + ssnprintf(n.message, sizeof(n.message), "sensor %s not present", + list_item->sensor_name); plugin_dispatch_notification(&n); } @@ -243,11 +251,11 @@ static void sensor_read_handler(ipmi_sensor_t *sensor, int err, if (st->notify_notpresent) { notification_t n = c_ipmi_notification_init(st, NOTIF_OKAY); - sstrncpy(n.type_instance, list_item->sensor_name, + sstrncpy(n.type_instance, list_item->type_instance, sizeof(n.type_instance)); sstrncpy(n.type, list_item->sensor_type, sizeof(n.type)); - snprintf(n.message, sizeof(n.message), "sensor %s present", - list_item->sensor_name); + ssnprintf(n.message, sizeof(n.message), "sensor %s present", + list_item->sensor_name); plugin_dispatch_notification(&n); } @@ -285,7 +293,8 @@ static void sensor_read_handler(ipmi_sensor_t *sensor, int err, sstrncpy(vl.host, st->host, sizeof(vl.host)); sstrncpy(vl.plugin, "ipmi", sizeof(vl.plugin)); sstrncpy(vl.type, list_item->sensor_type, sizeof(vl.type)); - sstrncpy(vl.type_instance, list_item->sensor_name, sizeof(vl.type_instance)); + sstrncpy(vl.type_instance, list_item->type_instance, + sizeof(vl.type_instance)); plugin_dispatch_values(&vl); } /* void sensor_read_handler */ @@ -301,10 +310,11 @@ static void sensor_get_name(ipmi_sensor_t *sensor, char *buffer, int buf_len) { return; ipmi_sensor_get_name(sensor, temp, sizeof(temp)); - temp[sizeof(temp) - 1] = 0; + temp[sizeof(temp) - 1] = '\0'; if (entity_id_string != NULL && strlen(temp)) - snprintf(sensor_name, sizeof(sensor_name), "%s %s", temp, entity_id_string); + ssnprintf(sensor_name, sizeof(sensor_name), "%s %s", temp, + entity_id_string); else if (entity_id_string != NULL) sstrncpy(sensor_name, entity_id_string, sizeof(sensor_name)); else @@ -329,8 +339,8 @@ static void sensor_get_name(ipmi_sensor_t *sensor, char *buffer, int buf_len) { sensor_id_ptr = strstr(temp, "("); if (sensor_id_ptr != NULL) { /* `sensor_id_ptr' now points to "(123)". */ - snprintf(sensor_name, sizeof(sensor_name), "%s %s", sensor_name_ptr, - sensor_id_ptr); + ssnprintf(sensor_name, sizeof(sensor_name), "%s %s", sensor_name_ptr, + sensor_id_ptr); } /* else: don't touch sensor_name. */ } @@ -338,6 +348,24 @@ static void sensor_get_name(ipmi_sensor_t *sensor, char *buffer, int buf_len) { sstrncpy(buffer, sensor_name, buf_len); } +static const char *sensor_unit_to_type(ipmi_sensor_t *sensor) { + static const c_ipmi_db_type_map_t ipmi_db_type_map[] = { + {IPMI_UNIT_TYPE_WATTS, "power"}, {IPMI_UNIT_TYPE_CFM, "flow"}}; + + /* check the modifier and rate of the sensor value */ + if ((ipmi_sensor_get_modifier_unit_use(sensor) != IPMI_MODIFIER_UNIT_NONE) || + (ipmi_sensor_get_rate_unit(sensor) != IPMI_RATE_UNIT_NONE)) + return NULL; + + /* find the db type by using sensor base unit type */ + enum ipmi_unit_type_e ipmi_type = ipmi_sensor_get_base_unit(sensor); + for (size_t i = 0; i < STATIC_ARRAY_SIZE(ipmi_db_type_map); i++) + if (ipmi_db_type_map[i].type == ipmi_type) + return ipmi_db_type_map[i].type_name; + + return NULL; +} /* const char* sensor_unit_to_type */ + static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { ipmi_sensor_id_t sensor_id; c_ipmi_sensor_list_t *list_item; @@ -377,10 +405,10 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { * * ipmi_sensor_id_get_reading() supports only 'Threshold' sensors. * See lib/sensor.c:4842, stand_ipmi_sensor_get_reading() for details. - */ + */ if (!ipmi_sensor_get_is_readable(sensor)) { INFO("ipmi plugin: sensor_list_add: Ignore sensor `%s` of `%s`, " - "because it don't readable! Its type: (%#x, %s). ", + "because it isn't readable! Its type: (%#x, %s). ", sensor_name_ptr, st->name, sensor_type, ipmi_sensor_get_sensor_type_string(sensor)); return -1; @@ -413,11 +441,22 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { type = "fanspeed"; break; + case IPMI_SENSOR_TYPE_MEMORY: + type = "memory"; + break; + default: { + /* try to get collectd DB type based on sensor base unit type */ + if ((type = sensor_unit_to_type(sensor)) != NULL) + break; + INFO("ipmi plugin: sensor_list_add: Ignore sensor `%s` of `%s`, " - "because I don't know how to handle its type (%#x, %s). " - "If you need this sensor, please file a bug report.", - sensor_name_ptr, st->name, sensor_type, + "because I don't know how to handle its units (%#x, %#x, %#x). " + "Sensor type: (%#x, %s). If you need this sensor, please file " + "a bug report at http://collectd.org/.", + sensor_name_ptr, st->name, ipmi_sensor_get_base_unit(sensor), + ipmi_sensor_get_modifier_unit(sensor), + ipmi_sensor_get_rate_unit(sensor), sensor_type, ipmi_sensor_get_sensor_type_string(sensor)); return -1; } @@ -438,7 +477,7 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { return 0; } - list_item = (c_ipmi_sensor_list_t *)calloc(1, sizeof(c_ipmi_sensor_list_t)); + list_item = calloc(1, sizeof(*list_item)); if (list_item == NULL) { pthread_mutex_unlock(&st->sensor_list_lock); return -1; @@ -452,6 +491,18 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { else st->sensor_list = list_item; + /* if sensor provides the percentage value, use "percent" collectd type + and add the `percent` to the type instance of the reported value */ + if (ipmi_sensor_get_percentage(sensor)) { + ssnprintf(list_item->type_instance, sizeof(list_item->type_instance), + "percent-%s", sensor_name_ptr); + type = "percent"; + } else { + /* use type instance as a name of the sensor */ + sstrncpy(list_item->type_instance, sensor_name_ptr, + sizeof(list_item->type_instance)); + } + sstrncpy(list_item->sensor_name, sensor_name_ptr, sizeof(list_item->sensor_name)); sstrncpy(list_item->sensor_type, type, sizeof(list_item->sensor_type)); @@ -461,10 +512,11 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { if (st->notify_add && (st->init_in_progress == 0)) { notification_t n = c_ipmi_notification_init(st, NOTIF_OKAY); - sstrncpy(n.type_instance, list_item->sensor_name, sizeof(n.type_instance)); + sstrncpy(n.type_instance, list_item->type_instance, + sizeof(n.type_instance)); sstrncpy(n.type, list_item->sensor_type, sizeof(n.type)); - snprintf(n.message, sizeof(n.message), "sensor %s added", - list_item->sensor_name); + ssnprintf(n.message, sizeof(n.message), "sensor %s added", + list_item->sensor_name); plugin_dispatch_notification(&n); } @@ -507,10 +559,11 @@ static int sensor_list_remove(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { if (st->notify_remove && st->active) { notification_t n = c_ipmi_notification_init(st, NOTIF_WARNING); - sstrncpy(n.type_instance, list_item->sensor_name, sizeof(n.type_instance)); + sstrncpy(n.type_instance, list_item->type_instance, + sizeof(n.type_instance)); sstrncpy(n.type, list_item->sensor_type, sizeof(n.type)); - snprintf(n.message, sizeof(n.message), "sensor %s removed", - list_item->sensor_name); + ssnprintf(n.message, sizeof(n.message), "sensor %s removed", + list_item->sensor_name); plugin_dispatch_notification(&n); } @@ -622,13 +675,13 @@ static int sensor_threshold_event_handler( ipmi_get_reading_name(event_type, sensor_type, offset); sensor_get_name(sensor, n.type_instance, sizeof(n.type_instance)); if (value_present != IPMI_NO_VALUES_PRESENT) - snprintf(n.message, sizeof(n.message), - "sensor %s received event: %s, value is %f", n.type_instance, - event_state, value); + ssnprintf(n.message, sizeof(n.message), + "sensor %s received event: %s, value is %f", n.type_instance, + event_state, value); else - snprintf(n.message, sizeof(n.message), - "sensor %s received event: %s, value not provided", - n.type_instance, event_state); + ssnprintf(n.message, sizeof(n.message), + "sensor %s received event: %s, value not provided", + n.type_instance, event_state); DEBUG("Threshold event received for sensor %s", n.type_instance); @@ -647,7 +700,7 @@ static int sensor_threshold_event_handler( /* both values present, so fall-through to add raw value too */ case IPMI_RAW_VALUE_PRESENT: { char buf[DATA_MAX_NAME_LEN] = {0}; - snprintf(buf, sizeof(buf), "0x%2.2x", raw_value); + ssnprintf(buf, sizeof(buf), "0x%2.2x", raw_value); plugin_notification_meta_add_string(&n, "raw", buf); } break; default: @@ -689,8 +742,8 @@ static int sensor_discrete_event_handler(ipmi_sensor_t *sensor, const char *event_state = ipmi_get_reading_name(event_type, sensor_type, offset); sensor_get_name(sensor, n.type_instance, sizeof(n.type_instance)); - snprintf(n.message, sizeof(n.message), "sensor %s received event: %s", - n.type_instance, event_state); + ssnprintf(n.message, sizeof(n.message), "sensor %s received event: %s", + n.type_instance, event_state); DEBUG("Discrete event received for sensor %s", n.type_instance); @@ -719,6 +772,40 @@ static int sensor_discrete_event_handler(ipmi_sensor_t *sensor, return IPMI_EVENT_NOT_HANDLED; } /* int sensor_discrete_event_handler */ +static int sel_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { + char sensor_name[DATA_MAX_NAME_LEN] = {0}; + int status = 0; + + /* Check if sensor on sel_ignorelist */ + sensor_get_name(sensor, sensor_name, sizeof(sensor_name)); + if (ignorelist_match(st->sel_ignorelist, sensor_name) != 0) + return 0; + + /* register threshold event if threshold sensor support events */ + if (ipmi_sensor_get_event_reading_type(sensor) == + IPMI_EVENT_READING_TYPE_THRESHOLD) + status = ipmi_sensor_add_threshold_event_handler( + sensor, sensor_threshold_event_handler, st); + /* register discrete handler if discrete/specific sensor support events */ + else if (ipmi_sensor_get_event_support(sensor) != IPMI_EVENT_SUPPORT_NONE) + status = ipmi_sensor_add_discrete_event_handler( + sensor, sensor_discrete_event_handler, st); + + if (status) + ERROR("Unable to add sensor %s event handler, status: %d", sensor_name, + status); + return status; +} + +static void sel_list_remove(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { + if (ipmi_sensor_get_event_reading_type(sensor) == + IPMI_EVENT_READING_TYPE_THRESHOLD) + ipmi_sensor_remove_threshold_event_handler( + sensor, sensor_threshold_event_handler, st); + else + ipmi_sensor_remove_discrete_event_handler( + sensor, sensor_discrete_event_handler, st); +} /* * Entity handlers */ @@ -731,39 +818,12 @@ entity_sensor_update_handler(enum ipmi_update_e op, if ((op == IPMI_ADDED) || (op == IPMI_CHANGED)) { /* Will check for duplicate entries.. */ sensor_list_add(st, sensor); - - if (st->sel_enabled) { - int status = 0; - /* register threshold event if threshold sensor support events */ - if ((ipmi_sensor_get_event_reading_type(sensor) == - IPMI_EVENT_READING_TYPE_THRESHOLD) && - (ipmi_sensor_get_threshold_access(sensor) != - IPMI_THRESHOLD_ACCESS_SUPPORT_NONE)) - status = ipmi_sensor_add_threshold_event_handler( - sensor, sensor_threshold_event_handler, st); - /* register discrete handler if discrete/specific sensor support events */ - else if (ipmi_sensor_get_event_support(sensor) != IPMI_EVENT_SUPPORT_NONE) - status = ipmi_sensor_add_discrete_event_handler( - sensor, sensor_discrete_event_handler, st); - - if (status) { - char buf[DATA_MAX_NAME_LEN] = {0}; - sensor_get_name(sensor, buf, sizeof(buf)); - ERROR("Unable to add sensor %s event handler, status: %d", buf, status); - } - } + if (st->sel_enabled) + sel_list_add(st, sensor); } else if (op == IPMI_DELETED) { sensor_list_remove(st, sensor); - - if (st->sel_enabled) { - if (ipmi_sensor_get_event_reading_type(sensor) == - IPMI_EVENT_READING_TYPE_THRESHOLD) - ipmi_sensor_remove_threshold_event_handler( - sensor, sensor_threshold_event_handler, st); - else - ipmi_sensor_remove_discrete_event_handler( - sensor, sensor_discrete_event_handler, st); - } + if (st->sel_enabled) + sel_list_remove(st, sensor); } } /* void entity_sensor_update_handler */ @@ -835,7 +895,7 @@ static void domain_connection_change_handler(ipmi_domain_t *domain, int err, plugin_dispatch_notification(&n); } - st->connected = 0; + st->connected = false; return; } @@ -847,7 +907,7 @@ static void domain_connection_change_handler(ipmi_domain_t *domain, int err, plugin_dispatch_notification(&n); } - st->connected = 1; + st->connected = true; int status = ipmi_domain_add_entity_update_handler( domain, domain_entity_update_handler, /* user data = */ st); @@ -916,11 +976,11 @@ static void *c_ipmi_thread_main(void *user_data) { int status = c_ipmi_thread_init(st); if (status != 0) { ERROR("ipmi plugin: c_ipmi_thread_init failed."); - st->active = 0; + st->active = false; return (void *)-1; } - while (st->active != 0) { + while (st->active) { struct timeval tv = {1, 0}; os_handler->perform_one_op(os_handler, &tv); } @@ -951,6 +1011,15 @@ static c_ipmi_instance_t *c_ipmi_init_instance() { return NULL; } + st->sel_ignorelist = ignorelist_create(/* invert = */ 1); + if (st->sel_ignorelist == NULL) { + ignorelist_free(st->ignorelist); + sfree(st->name); + sfree(st); + ERROR("ipmi plugin: SEL ignorelist_create() failed."); + return NULL; + } + st->sensor_list = NULL; pthread_mutex_init(&st->sensor_list_lock, /* attr = */ NULL); @@ -977,6 +1046,7 @@ static void c_ipmi_free_instance(c_ipmi_instance_t *st) { sfree(st->username); sfree(st->password); + ignorelist_free(st->sel_ignorelist); ignorelist_free(st->ignorelist); pthread_mutex_destroy(&st->sensor_list_lock); sfree(st); @@ -1013,10 +1083,15 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp("Sensor", child->key) == 0) - ignorelist_add(st->ignorelist, ci->values[0].value.string); - else if (strcasecmp("IgnoreSelected", child->key) == 0) { - _Bool t; + if (strcasecmp("Sensor", child->key) == 0) { + char *value = NULL; + status = cf_util_get_string(child, &value); + if (status != 0) + break; + ignorelist_add(st->ignorelist, value); + sfree(value); + } else if (strcasecmp("IgnoreSelected", child->key) == 0) { + bool t; status = cf_util_get_boolean(child, &t); if (status != 0) break; @@ -1029,6 +1104,19 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { status = cf_util_get_boolean(child, &st->notify_remove); } else if (strcasecmp("NotifySensorNotPresent", child->key) == 0) { status = cf_util_get_boolean(child, &st->notify_notpresent); + } else if (strcasecmp("SELSensor", child->key) == 0) { + char *value = NULL; + status = cf_util_get_string(child, &value); + if (status != 0) + break; + ignorelist_add(st->sel_ignorelist, value); + sfree(value); + } else if (strcasecmp("SELIgnoreSelected", child->key) == 0) { + bool t; + status = cf_util_get_boolean(child, &t); + if (status != 0) + break; + ignorelist_set_invert(st->sel_ignorelist, /* invert = */ !t); } else if (strcasecmp("SELEnabled", child->key) == 0) { status = cf_util_get_boolean(child, &st->sel_enabled); } else if (strcasecmp("SELClearEvent", child->key) == 0) { @@ -1075,7 +1163,7 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { } /* int c_ipmi_config_add_instance */ static int c_ipmi_config(oconfig_item_t *ci) { - _Bool have_instance_block = 0; + bool have_instance_block = 0; for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -1109,12 +1197,12 @@ static int c_ipmi_config(oconfig_item_t *ci) { static int c_ipmi_read(user_data_t *user_data) { c_ipmi_instance_t *st = user_data->data; - if (st->active == 0) { + if (st->active == false) { INFO("ipmi plugin: c_ipmi_read: I'm not active, returning false."); return -1; } - if (st->connected == 0) + if (st->connected == false) return 0; sensor_list_read_all(st); @@ -1159,14 +1247,14 @@ static int c_ipmi_init(void) { } /* Don't send `ADD' notifications during startup (~ 1 minute) */ - int cycles = 1 + (60 / CDTIME_T_TO_TIME_T(plugin_get_interval())); + int cycles = 1 + (int)(TIME_T_TO_CDTIME_T(60) / plugin_get_interval()); st = instances; while (NULL != st) { /* The `st->name` is used as "domain name" for ipmi_open_domain(). * That value should be unique, so we do plugin_register_complex_read() * at first as it checks the uniqueness. */ - snprintf(callback_name, sizeof(callback_name), "ipmi/%s", st->name); + ssnprintf(callback_name, sizeof(callback_name), "ipmi/%s", st->name); user_data_t ud = { .data = st, @@ -1185,14 +1273,14 @@ static int c_ipmi_init(void) { } st->init_in_progress = cycles; - st->active = 1; + st->active = true; status = plugin_thread_create(&st->thread_id, /* attr = */ NULL, c_ipmi_thread_main, /* user data = */ (void *)st, "ipmi"); if (status != 0) { - st->active = 0; + st->active = false; st->thread_id = (pthread_t){0}; plugin_unregister_read(callback_name); @@ -1214,7 +1302,7 @@ static int c_ipmi_shutdown(void) { c_ipmi_instance_t *next = st->next; st->next = NULL; - st->active = 0; + st->active = false; if (!pthread_equal(st->thread_id, (pthread_t){0})) { pthread_join(st->thread_id, NULL);