projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
968a50d
)
Revert "ipmi plugin: Ignore events from ignored sensors"
author
Mariusz Szafranski
<mariuszx.szafranski@intel.com>
Wed, 7 Mar 2018 09:58:43 +0000
(09:58 +0000)
committer
Mariusz Szafranski
<mariuszx.szafranski@intel.com>
Wed, 7 Mar 2018 09:58:43 +0000
(09:58 +0000)
This reverts commit
cd660c5b07b6f09d165435f240ca17d118a1e452
.
src/ipmi.c
patch
|
blob
|
history
diff --git
a/src/ipmi.c
b/src/ipmi.c
index
a880586
..
6a72b2b
100644
(file)
--- a/
src/ipmi.c
+++ b/
src/ipmi.c
@@
-388,12
+388,8
@@
static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) {
ipmi_sensor_get_event_support(sensor));
/* Both `ignorelist' and `sensor_name_ptr' may be NULL. */
ipmi_sensor_get_event_support(sensor));
/* Both `ignorelist' and `sensor_name_ptr' may be NULL. */
- if (ignorelist_match(st->ignorelist, sensor_name_ptr) != 0) {
- INFO("ipmi plugin: sensor_list_add: Ignore sensor `%s` of `%s`, "
- "because it is on ignore list.",
- sensor_name_ptr, st->name);
- return -1;
- }
+ if (ignorelist_match(st->ignorelist, sensor_name_ptr) != 0)
+ return 0;
/* FIXME: Use rate unit or base unit to scale the value */
/* FIXME: Use rate unit or base unit to scale the value */
@@
-782,11
+778,6
@@
entity_sensor_update_handler(enum ipmi_update_e op,
ipmi_entity_t __attribute__((unused)) * entity,
ipmi_sensor_t *sensor, void *user_data) {
c_ipmi_instance_t *st = user_data;
ipmi_entity_t __attribute__((unused)) * entity,
ipmi_sensor_t *sensor, void *user_data) {
c_ipmi_instance_t *st = user_data;
- char sensor_name[DATA_MAX_NAME_LEN] = {0};
-
- sensor_get_name(sensor, sensor_name, sizeof(sensor_name));
- if (ignorelist_match(st->ignorelist, sensor_name) != 0)
- return; /* Ignore - sensor on ignore list */
if ((op == IPMI_ADDED) || (op == IPMI_CHANGED)) {
/* Will check for duplicate entries.. */
if ((op == IPMI_ADDED) || (op == IPMI_CHANGED)) {
/* Will check for duplicate entries.. */
@@
-805,8
+796,9
@@
entity_sensor_update_handler(enum ipmi_update_e op,
sensor, sensor_discrete_event_handler, st);
if (status) {
sensor, sensor_discrete_event_handler, st);
if (status) {
- ERROR("Unable to add sensor %s event handler, status: %d", sensor_name,
- 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);
}
}
} else if (op == IPMI_DELETED) {
}
}
} else if (op == IPMI_DELETED) {