author | Florian Forster <octo@collectd.org> | |
Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100) |
1 | 2 | |||
---|---|---|---|---|
src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
src/smart.c | patch | | diff1 | | diff2 | | blob | history |
src/write_kafka.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/smart.c
index 373839e13fb7ea565cdcf68685c7b0b5d985cc0a,93bfcbec8aff9cc9314b254a0e821fa585a899c9..9395945b5bccdec64edee835d225631a50ac87ed
--- 1/src/smart.c
--- 2/src/smart.c
+++ b/src/smart.c
plugin_dispatch_values(&vl);
}
- static void smart_handle_disk_attribute(SkDisk *d,
- const SkSmartAttributeParsedData *a,
- void *userdata) {
- const char *dev = userdata;
+ static void handle_attribute(SkDisk *d, const SkSmartAttributeParsedData *a,
+ void *userdata) {
+ char const *name = userdata;
- value_t values[4];
- value_list_t vl = VALUE_LIST_INIT;
if (!a->current_value_valid || !a->worst_value_valid)
return;
- values[0].gauge = a->current_value;
- values[1].gauge = a->worst_value;
- values[2].gauge = a->threshold_valid ? a->threshold : 0;
- values[3].gauge = a->pretty_value;
+
+ value_list_t vl = VALUE_LIST_INIT;
+ value_t values[] = {
+ {.gauge = a->current_value},
+ {.gauge = a->worst_value},
+ {.gauge = a->threshold_valid ? a->threshold : 0},
+ {.gauge = a->pretty_value},
+ };
vl.values = values;
- vl.values_len = 4;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
+ vl.values_len = STATIC_ARRAY_SIZE(values);
sstrncpy(vl.plugin, "smart", sizeof(vl.plugin));
- sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance));
+ sstrncpy(vl.plugin_instance, name, sizeof(vl.plugin_instance));
sstrncpy(vl.type, "smart_attribute", sizeof(vl.type));
sstrncpy(vl.type_instance, a->name, sizeof(vl.type_instance));
diff --cc src/write_kafka.c
Simple merge