bool is_active;
} virt_notif_thread_t;
-static const char *config_keys[] = {"Connection",
-
- "RefreshInterval",
-
- "Domain",
- "BlockDevice",
- "BlockDeviceFormat",
- "BlockDeviceFormatBasename",
- "InterfaceDevice",
- "IgnoreSelected",
-
- "HostnameFormat",
- "HostnameMetadataNS",
- "HostnameMetadataXPath",
- "InterfaceFormat",
-
- "PluginInstanceFormat",
-
- "Instances",
- "ExtraStats",
- "PersistentNotification",
-
- "ReportBlockDevices",
- "ReportNetworkInterfaces",
- NULL};
-
/* PersistentNotification is false by default */
static bool persistent_notification = false;
};
#endif /* HAVE_DOM_REASON */
-#define NR_CONFIG_KEYS ((sizeof config_keys / sizeof config_keys[0]) - 1)
#define NANOSEC_IN_SEC 1e9
#define GET_STATS(_f, _name, ...) \
struct block_device {
virDomainPtr dom; /* domain */
char *path; /* name of block device */
+ bool has_source; /* information whether source is defined or not */
};
/* Actual list of network interfaces found on last refresh. */
static void free_block_devices(struct lv_read_state *state);
static int add_block_device(struct lv_read_state *state, virDomainPtr dom,
- const char *path);
+ const char *path, bool has_source);
static void free_interface_devices(struct lv_read_state *state);
static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
ex_stats_job_stats_completed = 1 << 8,
ex_stats_job_stats_background = 1 << 9,
#endif
+ ex_stats_disk_allocation = 1 << 10,
+ ex_stats_disk_capacity = 1 << 11,
+ ex_stats_disk_physical = 1 << 12
};
static unsigned int extra_stats = ex_stats_none;
{"job_stats_completed", ex_stats_job_stats_completed},
{"job_stats_background", ex_stats_job_stats_background},
#endif
+ {"disk_allocation", ex_stats_disk_allocation},
+ {"disk_capacity", ex_stats_disk_capacity},
+ {"disk_physical", ex_stats_disk_physical},
{NULL, ex_stats_none},
};
static int refresh_lists(struct lv_read_instance *inst);
-struct lv_block_info {
+struct lv_block_stats {
virDomainBlockStatsStruct bi;
long long rd_total_times;
long long fl_total_times;
};
-static void init_block_info(struct lv_block_info *binfo) {
- if (binfo == NULL)
+static void init_block_stats(struct lv_block_stats *bstats) {
+ if (bstats == NULL)
return;
- binfo->bi.rd_req = -1;
- binfo->bi.wr_req = -1;
- binfo->bi.rd_bytes = -1;
- binfo->bi.wr_bytes = -1;
+ bstats->bi.rd_req = -1;
+ bstats->bi.wr_req = -1;
+ bstats->bi.rd_bytes = -1;
+ bstats->bi.wr_bytes = -1;
- binfo->rd_total_times = -1;
- binfo->wr_total_times = -1;
- binfo->fl_req = -1;
- binfo->fl_total_times = -1;
+ bstats->rd_total_times = -1;
+ bstats->wr_total_times = -1;
+ bstats->fl_req = -1;
+ bstats->fl_total_times = -1;
+}
+
+static void init_block_info(virDomainBlockInfoPtr binfo) {
+ binfo->allocation = -1;
+ binfo->capacity = -1;
+ binfo->physical = -1;
}
#ifdef HAVE_BLOCK_STATS_FLAGS
-#define GET_BLOCK_INFO_VALUE(NAME, FIELD) \
+#define GET_BLOCK_STATS_VALUE(NAME, FIELD) \
if (!strcmp(param[i].field, NAME)) { \
- binfo->FIELD = param[i].value.l; \
+ bstats->FIELD = param[i].value.l; \
continue; \
}
-static int get_block_info(struct lv_block_info *binfo,
- virTypedParameterPtr param, int nparams) {
- if (binfo == NULL || param == NULL)
+static int get_block_stats(struct lv_block_stats *bstats,
+ virTypedParameterPtr param, int nparams) {
+ if (bstats == NULL || param == NULL)
return -1;
for (int i = 0; i < nparams; ++i) {
/* ignore type. Everything must be LLONG anyway. */
- GET_BLOCK_INFO_VALUE("rd_operations", bi.rd_req);
- GET_BLOCK_INFO_VALUE("wr_operations", bi.wr_req);
- GET_BLOCK_INFO_VALUE("rd_bytes", bi.rd_bytes);
- GET_BLOCK_INFO_VALUE("wr_bytes", bi.wr_bytes);
- GET_BLOCK_INFO_VALUE("rd_total_times", rd_total_times);
- GET_BLOCK_INFO_VALUE("wr_total_times", wr_total_times);
- GET_BLOCK_INFO_VALUE("flush_operations", fl_req);
- GET_BLOCK_INFO_VALUE("flush_total_times", fl_total_times);
+ GET_BLOCK_STATS_VALUE("rd_operations", bi.rd_req);
+ GET_BLOCK_STATS_VALUE("wr_operations", bi.wr_req);
+ GET_BLOCK_STATS_VALUE("rd_bytes", bi.rd_bytes);
+ GET_BLOCK_STATS_VALUE("wr_bytes", bi.wr_bytes);
+ GET_BLOCK_STATS_VALUE("rd_total_times", rd_total_times);
+ GET_BLOCK_STATS_VALUE("wr_total_times", wr_total_times);
+ GET_BLOCK_STATS_VALUE("flush_operations", fl_req);
+ GET_BLOCK_STATS_VALUE("flush_total_times", fl_total_times);
}
return 0;
}
-#undef GET_BLOCK_INFO_VALUE
+#undef GET_BLOCK_STATS_VALUE
#endif /* HAVE_BLOCK_STATS_FLAGS */
submit(dom, type, type_instance, &(value_t){.derive = value}, 1);
}
-static void disk_submit(struct lv_block_info *binfo, virDomainPtr dom,
- const char *dev) {
+static void disk_block_stats_submit(struct lv_block_stats *bstats,
+ virDomainPtr dom, const char *dev,
+ virDomainBlockInfoPtr binfo) {
char *dev_copy = strdup(dev);
const char *type_instance = dev_copy;
snprintf(flush_type_instance, sizeof(flush_type_instance), "flush-%s",
type_instance);
- if ((binfo->bi.rd_req != -1) && (binfo->bi.wr_req != -1))
- submit_derive2("disk_ops", (derive_t)binfo->bi.rd_req,
- (derive_t)binfo->bi.wr_req, dom, type_instance);
+ if ((bstats->bi.rd_req != -1) && (bstats->bi.wr_req != -1))
+ submit_derive2("disk_ops", (derive_t)bstats->bi.rd_req,
+ (derive_t)bstats->bi.wr_req, dom, type_instance);
- if ((binfo->bi.rd_bytes != -1) && (binfo->bi.wr_bytes != -1))
- submit_derive2("disk_octets", (derive_t)binfo->bi.rd_bytes,
- (derive_t)binfo->bi.wr_bytes, dom, type_instance);
+ if ((bstats->bi.rd_bytes != -1) && (bstats->bi.wr_bytes != -1))
+ submit_derive2("disk_octets", (derive_t)bstats->bi.rd_bytes,
+ (derive_t)bstats->bi.wr_bytes, dom, type_instance);
if (extra_stats & ex_stats_disk) {
- if ((binfo->rd_total_times != -1) && (binfo->wr_total_times != -1))
- submit_derive2("disk_time", (derive_t)binfo->rd_total_times,
- (derive_t)binfo->wr_total_times, dom, type_instance);
+ if ((bstats->rd_total_times != -1) && (bstats->wr_total_times != -1))
+ submit_derive2("disk_time", (derive_t)bstats->rd_total_times,
+ (derive_t)bstats->wr_total_times, dom, type_instance);
- if (binfo->fl_req != -1)
+ if (bstats->fl_req != -1)
submit(dom, "total_requests", flush_type_instance,
- &(value_t){.derive = (derive_t)binfo->fl_req}, 1);
- if (binfo->fl_total_times != -1) {
- derive_t value = binfo->fl_total_times / 1000; // ns -> ms
+ &(value_t){.derive = (derive_t)bstats->fl_req}, 1);
+ if (bstats->fl_total_times != -1) {
+ derive_t value = bstats->fl_total_times / 1000; // ns -> ms
submit(dom, "total_time_in_ms", flush_type_instance,
&(value_t){.derive = value}, 1);
}
}
+ /* disk_allocation, disk_capacity and disk_physical are stored only
+ * if corresponding extrastats are set in collectd configuration file */
+ if ((extra_stats & ex_stats_disk_allocation) && binfo->allocation != -1)
+ submit(dom, "disk_allocation", type_instance,
+ &(value_t){.gauge = (gauge_t)binfo->allocation}, 1);
+
+ if ((extra_stats & ex_stats_disk_capacity) && binfo->capacity != -1)
+ submit(dom, "disk_capacity", type_instance,
+ &(value_t){.gauge = (gauge_t)binfo->capacity}, 1);
+
+ if ((extra_stats & ex_stats_disk_physical) && binfo->physical != -1)
+ submit(dom, "disk_physical", type_instance,
+ &(value_t){.gauge = (gauge_t)binfo->physical}, 1);
+
sfree(dev_copy);
}
-static unsigned int parse_ex_stats_flags(char **exstats, int numexstats) {
+/**
+ * Function for parsing ExtraStats configuration options.
+ * Result of parsing is stored under 'out_parsed_flags' pointer.
+ *
+ * Returns 0 in case of success and 1 in case of parsing error
+ */
+static int parse_ex_stats_flags(unsigned int *out_parsed_flags, char **exstats,
+ int numexstats) {
unsigned int ex_stats_flags = ex_stats_none;
+
+ assert(out_parsed_flags != NULL);
+
for (int i = 0; i < numexstats; i++) {
for (int j = 0; ex_stats_table[j].name != NULL; j++) {
if (strcasecmp(exstats[i], ex_stats_table[j].name) == 0) {
if (ex_stats_table[j + 1].name == NULL) {
ERROR(PLUGIN_NAME " plugin: Unmatched ExtraStats option: %s",
exstats[i]);
+ return 1;
}
}
}
- return ex_stats_flags;
+
+ *out_parsed_flags = ex_stats_flags;
+ return 0;
}
static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
return 0;
}
-static int lv_config(const char *key, const char *value) {
- if (virInitialize() != 0)
- return 1;
-
- if (lv_init_ignorelists() != 0)
- return 1;
-
- if (strcasecmp(key, "Connection") == 0) {
- char *tmp = strdup(value);
- if (tmp == NULL) {
- ERROR(PLUGIN_NAME " plugin: Connection strdup failed.");
- return 1;
- }
- sfree(conn_string);
- conn_string = tmp;
- return 0;
- }
-
- if (strcasecmp(key, "RefreshInterval") == 0) {
- char *eptr = NULL;
- interval = strtol(value, &eptr, 10);
- if (eptr == NULL || *eptr != '\0')
- return 1;
- return 0;
+/* Validates config option that may take multiple strings arguments.
+ * Returns 0 on success, -1 otherwise */
+static int check_config_multiple_string_entry(const oconfig_item_t *ci) {
+ if (ci == NULL) {
+ ERROR(PLUGIN_NAME " plugin: ci oconfig_item can't be NULL");
+ return -1;
}
- if (strcasecmp(key, "Domain") == 0) {
- if (ignorelist_add(il_domains, value))
- return 1;
- return 0;
- }
- if (strcasecmp(key, "BlockDevice") == 0) {
- if (ignorelist_add(il_block_devices, value))
- return 1;
- return 0;
+ if (ci->values_num < 1) {
+ ERROR(PLUGIN_NAME
+ " plugin: the '%s' option requires at least one string argument",
+ ci->key);
+ return -1;
}
- if (strcasecmp(key, "BlockDeviceFormat") == 0) {
- if (strcasecmp(value, "target") == 0)
- blockdevice_format = target;
- else if (strcasecmp(value, "source") == 0)
- blockdevice_format = source;
- else {
- ERROR(PLUGIN_NAME " plugin: unknown BlockDeviceFormat: %s", value);
+ for (int i = 0; i < ci->values_num; ++i) {
+ if (ci->values[i].type != OCONFIG_TYPE_STRING) {
+ ERROR(PLUGIN_NAME
+ " plugin: one of the '%s' options is not a valid string",
+ ci->key);
return -1;
}
- return 0;
- }
- if (strcasecmp(key, "BlockDeviceFormatBasename") == 0) {
- blockdevice_format_basename = IS_TRUE(value) ? true : false;
- return 0;
- }
- if (strcasecmp(key, "InterfaceDevice") == 0) {
- if (ignorelist_add(il_interface_devices, value))
- return 1;
- return 0;
}
- if (strcasecmp(key, "IgnoreSelected") == 0) {
- if (IS_TRUE(value)) {
- ignorelist_set_invert(il_domains, 0);
- ignorelist_set_invert(il_block_devices, 0);
- ignorelist_set_invert(il_interface_devices, 0);
- } else {
- ignorelist_set_invert(il_domains, 1);
- ignorelist_set_invert(il_block_devices, 1);
- ignorelist_set_invert(il_interface_devices, 1);
- }
- return 0;
- }
+ return 0;
+}
- if (strcasecmp(key, "HostnameMetadataNS") == 0) {
- char *tmp = strdup(value);
- if (tmp == NULL) {
- ERROR(PLUGIN_NAME " plugin: HostnameMetadataNS strdup failed.");
- return 1;
- }
- sfree(hm_ns);
- hm_ns = tmp;
- return 0;
+static int lv_config(oconfig_item_t *ci) {
+ if (lv_init_ignorelists() != 0) {
+ ERROR(PLUGIN_NAME " plugin: lv_init_ignorelist failed.");
+ return -1;
}
- if (strcasecmp(key, "HostnameMetadataXPath") == 0) {
- char *tmp = strdup(value);
- if (tmp == NULL) {
- ERROR(PLUGIN_NAME " plugin: HostnameMetadataXPath strdup failed.");
- return 1;
- }
- sfree(hm_xpath);
- hm_xpath = tmp;
- return 0;
- }
+ for (int i = 0; i < ci->children_num; ++i) {
+ oconfig_item_t *c = ci->children + i;
- if (strcasecmp(key, "HostnameFormat") == 0) {
- char *value_copy = strdup(value);
- if (value_copy == NULL) {
- ERROR(PLUGIN_NAME " plugin: strdup failed.");
- return -1;
- }
+ if (strcasecmp(c->key, "Connection") == 0) {
+ if (cf_util_get_string(c, &conn_string) != 0 || conn_string == NULL)
+ return -1;
- char *fields[HF_MAX_FIELDS];
- int n = strsplit(value_copy, fields, HF_MAX_FIELDS);
- if (n < 1) {
- sfree(value_copy);
- ERROR(PLUGIN_NAME " plugin: HostnameFormat: no fields");
- return -1;
- }
+ continue;
+ } else if (strcasecmp(c->key, "RefreshInterval") == 0) {
+ if (cf_util_get_int(c, &interval) != 0)
+ return -1;
- for (int i = 0; i < n; ++i) {
- if (strcasecmp(fields[i], "hostname") == 0)
- hostname_format[i] = hf_hostname;
- else if (strcasecmp(fields[i], "name") == 0)
- hostname_format[i] = hf_name;
- else if (strcasecmp(fields[i], "uuid") == 0)
- hostname_format[i] = hf_uuid;
- else if (strcasecmp(fields[i], "metadata") == 0)
- hostname_format[i] = hf_metadata;
+ continue;
+ } else if (strcasecmp(c->key, "Domain") == 0) {
+ char *domain_name = NULL;
+ if (cf_util_get_string(c, &domain_name) != 0)
+ return -1;
+
+ if (ignorelist_add(il_domains, domain_name)) {
+ ERROR(PLUGIN_NAME " plugin: Adding '%s' to domain-ignorelist failed",
+ domain_name);
+ sfree(domain_name);
+ return -1;
+ }
+
+ sfree(domain_name);
+ continue;
+ } else if (strcasecmp(c->key, "BlockDevice") == 0) {
+ char *device_name = NULL;
+ if (cf_util_get_string(c, &device_name) != 0)
+ return -1;
+
+ if (ignorelist_add(il_block_devices, device_name) != 0) {
+ ERROR(PLUGIN_NAME
+ " plugin: Adding '%s' to block-device-ignorelist failed",
+ device_name);
+ sfree(device_name);
+ return -1;
+ }
+
+ sfree(device_name);
+ continue;
+ } else if (strcasecmp(c->key, "BlockDeviceFormat") == 0) {
+ char *device_format = NULL;
+ if (cf_util_get_string(c, &device_format) != 0)
+ return -1;
+
+ if (strcasecmp(device_format, "target") == 0)
+ blockdevice_format = target;
+ else if (strcasecmp(device_format, "source") == 0)
+ blockdevice_format = source;
else {
- ERROR(PLUGIN_NAME " plugin: unknown HostnameFormat field: %s",
- fields[i]);
- sfree(value_copy);
+ ERROR(PLUGIN_NAME " plugin: unknown BlockDeviceFormat: %s",
+ device_format);
+ sfree(device_format);
return -1;
}
- }
- sfree(value_copy);
- for (int i = n; i < HF_MAX_FIELDS; ++i)
- hostname_format[i] = hf_none;
+ sfree(device_format);
+ continue;
+ } else if (strcasecmp(c->key, "BlockDeviceFormatBasename") == 0) {
+ if (cf_util_get_boolean(c, &blockdevice_format_basename) != 0)
+ return -1;
+
+ continue;
+ } else if (strcasecmp(c->key, "InterfaceDevice") == 0) {
+ char *interface_name = NULL;
+ if (cf_util_get_string(c, &interface_name) != 0)
+ return -1;
- return 0;
- }
+ if (ignorelist_add(il_interface_devices, interface_name)) {
+ ERROR(PLUGIN_NAME " plugin: Adding '%s' to interface-ignorelist failed",
+ interface_name);
+ sfree(interface_name);
+ return -1;
+ }
- if (strcasecmp(key, "PluginInstanceFormat") == 0) {
- char *value_copy = strdup(value);
- if (value_copy == NULL) {
- ERROR(PLUGIN_NAME " plugin: strdup failed.");
- return -1;
- }
+ sfree(interface_name);
+ continue;
+ } else if (strcasecmp(c->key, "IgnoreSelected") == 0) {
+ bool ignore_selected = false;
+ if (cf_util_get_boolean(c, &ignore_selected) != 0)
+ return -1;
- char *fields[PLGINST_MAX_FIELDS];
- int n = strsplit(value_copy, fields, PLGINST_MAX_FIELDS);
- if (n < 1) {
- sfree(value_copy);
- ERROR(PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
- return -1;
- }
+ if (ignore_selected) {
+ ignorelist_set_invert(il_domains, 0);
+ ignorelist_set_invert(il_block_devices, 0);
+ ignorelist_set_invert(il_interface_devices, 0);
+ } else {
+ ignorelist_set_invert(il_domains, 1);
+ ignorelist_set_invert(il_block_devices, 1);
+ ignorelist_set_invert(il_interface_devices, 1);
+ }
- for (int i = 0; i < n; ++i) {
- if (strcasecmp(fields[i], "none") == 0) {
- plugin_instance_format[i] = plginst_none;
- break;
- } else if (strcasecmp(fields[i], "name") == 0)
- plugin_instance_format[i] = plginst_name;
- else if (strcasecmp(fields[i], "uuid") == 0)
- plugin_instance_format[i] = plginst_uuid;
- else if (strcasecmp(fields[i], "metadata") == 0)
- plugin_instance_format[i] = plginst_metadata;
- else {
- ERROR(PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s",
- fields[i]);
- sfree(value_copy);
+ continue;
+ } else if (strcasecmp(c->key, "HostnameMetadataNS") == 0) {
+ if (cf_util_get_string(c, &hm_ns) != 0)
+ return -1;
+
+ continue;
+ } else if (strcasecmp(c->key, "HostnameMetadataXPath") == 0) {
+ if (cf_util_get_string(c, &hm_xpath) != 0)
+ return -1;
+
+ continue;
+ } else if (strcasecmp(c->key, "HostnameFormat") == 0) {
+ /* this option can take multiple strings arguments in one config line*/
+ if (check_config_multiple_string_entry(c) != 0) {
+ ERROR(PLUGIN_NAME " plugin: Could not get 'HostnameFormat' parameter");
return -1;
}
- }
- sfree(value_copy);
- for (int i = n; i < PLGINST_MAX_FIELDS; ++i)
- plugin_instance_format[i] = plginst_none;
+ const int params_num = c->values_num;
+ for (int i = 0; i < params_num; ++i) {
+ const char *param_name = c->values[i].value.string;
+ if (strcasecmp(param_name, "hostname") == 0)
+ hostname_format[i] = hf_hostname;
+ else if (strcasecmp(param_name, "name") == 0)
+ hostname_format[i] = hf_name;
+ else if (strcasecmp(param_name, "uuid") == 0)
+ hostname_format[i] = hf_uuid;
+ else if (strcasecmp(param_name, "metadata") == 0)
+ hostname_format[i] = hf_metadata;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown HostnameFormat field: %s",
+ param_name);
+ return -1;
+ }
+ }
- return 0;
- }
+ for (int i = params_num; i < HF_MAX_FIELDS; ++i)
+ hostname_format[i] = hf_none;
- if (strcasecmp(key, "InterfaceFormat") == 0) {
- if (strcasecmp(value, "name") == 0)
- interface_format = if_name;
- else if (strcasecmp(value, "address") == 0)
- interface_format = if_address;
- else if (strcasecmp(value, "number") == 0)
- interface_format = if_number;
- else {
- ERROR(PLUGIN_NAME " plugin: unknown InterfaceFormat: %s", value);
- return -1;
- }
- return 0;
- }
+ continue;
+ } else if (strcasecmp(c->key, "PluginInstanceFormat") == 0) {
+ /* this option can handle list of string parameters in one line*/
+ if (check_config_multiple_string_entry(c) != 0) {
+ ERROR(PLUGIN_NAME
+ " plugin: Could not get 'PluginInstanceFormat' parameter");
+ return -1;
+ }
- if (strcasecmp(key, "Instances") == 0) {
- char *eptr = NULL;
- double val = strtod(value, &eptr);
+ const int params_num = c->values_num;
+ for (int i = 0; i < params_num; ++i) {
+ const char *param_name = c->values[i].value.string;
+ if (strcasecmp(param_name, "none") == 0) {
+ plugin_instance_format[i] = plginst_none;
+ break;
+ } else if (strcasecmp(param_name, "name") == 0)
+ plugin_instance_format[i] = plginst_name;
+ else if (strcasecmp(param_name, "uuid") == 0)
+ plugin_instance_format[i] = plginst_uuid;
+ else if (strcasecmp(param_name, "metadata") == 0)
+ plugin_instance_format[i] = plginst_metadata;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s",
+ param_name);
+
+ return -1;
+ }
+ }
- if (*eptr != '\0') {
- ERROR(PLUGIN_NAME " plugin: Invalid value for Instances = '%s'", value);
- return 1;
- }
- if (val <= 0) {
- ERROR(PLUGIN_NAME " plugin: Instances <= 0 makes no sense.");
- return 1;
- }
- if (val > NR_INSTANCES_MAX) {
- ERROR(PLUGIN_NAME " plugin: Instances=%f > NR_INSTANCES_MAX=%i"
- " use a lower setting or recompile the plugin.",
- val, NR_INSTANCES_MAX);
- return 1;
- }
+ for (int i = params_num; i < PLGINST_MAX_FIELDS; ++i)
+ plugin_instance_format[i] = plginst_none;
- nr_instances = (int)val;
- DEBUG(PLUGIN_NAME " plugin: configured %i instances", nr_instances);
- return 0;
- }
+ continue;
+ } else if (strcasecmp(c->key, "InterfaceFormat") == 0) {
+ char *format = NULL;
+ if (cf_util_get_string(c, &format) != 0)
+ return -1;
+
+ if (strcasecmp(format, "name") == 0)
+ interface_format = if_name;
+ else if (strcasecmp(format, "address") == 0)
+ interface_format = if_address;
+ else if (strcasecmp(format, "number") == 0)
+ interface_format = if_number;
+ else {
+ ERROR(PLUGIN_NAME " plugin: unknown InterfaceFormat: %s", format);
+ sfree(format);
+ return -1;
+ }
+
+ sfree(format);
+ continue;
+ } else if (strcasecmp(c->key, "Instances") == 0) {
+ if (cf_util_get_int(c, &nr_instances) != 0)
+ return -1;
+
+ if (nr_instances <= 0) {
+ ERROR(PLUGIN_NAME " plugin: Instances <= 0 makes no sense.");
+ return -1;
+ }
+ if (nr_instances > NR_INSTANCES_MAX) {
+ ERROR(PLUGIN_NAME " plugin: Instances=%i > NR_INSTANCES_MAX=%i"
+ " use a lower setting or recompile the plugin.",
+ nr_instances, NR_INSTANCES_MAX);
+ return -1;
+ }
+
+ DEBUG(PLUGIN_NAME " plugin: configured %i instances", nr_instances);
+ continue;
+ } else if (strcasecmp(c->key, "ExtraStats") == 0) {
+ char *ex_str = NULL;
+
+ if (cf_util_get_string(c, &ex_str) != 0)
+ return -1;
- if (strcasecmp(key, "ExtraStats") == 0) {
- char *localvalue = strdup(value);
- if (localvalue != NULL) {
char *exstats[EX_STATS_MAX_FIELDS];
- int numexstats =
- strsplit(localvalue, exstats, STATIC_ARRAY_SIZE(exstats));
- extra_stats = parse_ex_stats_flags(exstats, numexstats);
- sfree(localvalue);
+ int numexstats = strsplit(ex_str, exstats, STATIC_ARRAY_SIZE(exstats));
+ int status = parse_ex_stats_flags(&extra_stats, exstats, numexstats);
+ sfree(ex_str);
+ if (status != 0) {
+ ERROR(PLUGIN_NAME " plugin: parsing 'ExtraStats' option failed");
+ return status;
+ }
#ifdef HAVE_JOB_STATS
if ((extra_stats & ex_stats_job_stats_completed) &&
ERROR(PLUGIN_NAME " plugin: Invalid job stats configuration. Only one "
"type of job statistics can be collected at the same "
"time");
- return 1;
+ return -1;
}
#endif
- }
- }
- if (strcasecmp(key, "PersistentNotification") == 0) {
- persistent_notification = IS_TRUE(value);
- return 0;
- }
+ /* ExtraStats parsed successfully */
+ continue;
+ } else if (strcasecmp(c->key, "PersistentNotification") == 0) {
+ if (cf_util_get_boolean(c, &persistent_notification) != 0)
+ return -1;
- if (strcasecmp(key, "ReportBlockDevices") == 0) {
- report_block_devices = IS_TRUE(value);
- return 0;
- }
+ continue;
+ } else if (strcasecmp(c->key, "ReportBlockDevices") == 0) {
+ if (cf_util_get_boolean(c, &report_block_devices) != 0)
+ return -1;
- if (strcasecmp(key, "ReportNetworkInterfaces") == 0) {
- report_network_interfaces = IS_TRUE(value);
- return 0;
+ continue;
+ } else if (strcasecmp(c->key, "ReportNetworkInterfaces") == 0) {
+ if (cf_util_get_boolean(c, &report_network_interfaces) != 0)
+ return -1;
+
+ continue;
+ } else {
+ /* Unrecognised option. */
+ ERROR(PLUGIN_NAME " plugin: Unrecognized option: '%s'", c->key);
+ return -1;
+ }
}
- /* Unrecognised option. */
- return -1;
+ return 0;
}
static int lv_connect(void) {
WARNING(PLUGIN_NAME " plugin: closed connection to libvirt");
}
-static int lv_domain_block_info(virDomainPtr dom, const char *path,
- struct lv_block_info *binfo) {
+static int lv_domain_block_stats(virDomainPtr dom, const char *path,
+ struct lv_block_stats *bstats) {
#ifdef HAVE_BLOCK_STATS_FLAGS
int nparams = 0;
if (virDomainBlockStatsFlags(dom, path, NULL, &nparams, 0) < 0 ||
if (virDomainBlockStatsFlags(dom, path, params, &nparams, 0) < 0) {
VIRT_ERROR(conn, "getting the disk params values");
} else {
- rc = get_block_info(binfo, params, nparams);
+ rc = get_block_stats(bstats, params, nparams);
}
virTypedParamsClear(params, nparams);
sfree(params);
return rc;
#else
- return virDomainBlockStats(dom, path, &(binfo->bi), sizeof(binfo->bi));
+ return virDomainBlockStats(dom, path, &(bstats->bi), sizeof(bstats->bi));
#endif /* HAVE_BLOCK_STATS_FLAGS */
}
}
#endif /* HAVE_DISK_ERR */
-static int get_block_stats(struct block_device *block_dev) {
-
+static int get_block_device_stats(struct block_device *block_dev) {
if (!block_dev) {
ERROR(PLUGIN_NAME " plugin: get_block_stats NULL pointer");
return -1;
}
- struct lv_block_info binfo;
+ virDomainBlockInfo binfo;
init_block_info(&binfo);
- if (lv_domain_block_info(block_dev->dom, block_dev->path, &binfo) < 0) {
- ERROR(PLUGIN_NAME " plugin: lv_domain_block_info failed");
+ /* Fetching block info stats only if needed*/
+ if (extra_stats & (ex_stats_disk_allocation | ex_stats_disk_capacity |
+ ex_stats_disk_physical)) {
+ /* Block info statistics can be only fetched from devices with 'source'
+ * defined */
+ if (block_dev->has_source) {
+ if (virDomainGetBlockInfo(block_dev->dom, block_dev->path, &binfo, 0) <
+ 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetBlockInfo failed for path: %s",
+ block_dev->path);
+ return -1;
+ }
+ }
+ }
+
+ struct lv_block_stats bstats;
+ init_block_stats(&bstats);
+
+ if (lv_domain_block_stats(block_dev->dom, block_dev->path, &bstats) < 0) {
+ ERROR(PLUGIN_NAME " plugin: lv_domain_block_stats failed");
return -1;
}
- disk_submit(&binfo, block_dev->dom, block_dev->path);
+ disk_block_stats_submit(&bstats, block_dev->dom, block_dev->path, &binfo);
return 0;
}
return -1;
}
+ DEBUG(PLUGIN_NAME " plugin: starting event loop");
+
virt_notif_thread_set_active(thread_data, 1);
if (pthread_create(&thread_data->event_loop_tid, NULL, event_loop_worker,
thread_data)) {
ERROR(PLUGIN_NAME " plugin: failed event loop thread creation");
+ virt_notif_thread_set_active(thread_data, 0);
virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
+ thread_data->domain_event_cb_id = -1;
return -1;
}
/* stop event loop thread and deregister callback */
static void stop_event_loop(virt_notif_thread_t *thread_data) {
- /* stopping loop and de-registering event handler*/
- virt_notif_thread_set_active(thread_data, 0);
- if (conn != NULL && thread_data->domain_event_cb_id != -1)
- virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
- if (pthread_join(notif_thread.event_loop_tid, NULL) != 0)
- ERROR(PLUGIN_NAME " plugin: stopping notification thread failed");
+ DEBUG(PLUGIN_NAME " plugin: stopping event loop");
+
+ /* Stopping loop */
+ if (virt_notif_thread_is_active(thread_data)) {
+ virt_notif_thread_set_active(thread_data, 0);
+ if (pthread_join(notif_thread.event_loop_tid, NULL) != 0)
+ ERROR(PLUGIN_NAME " plugin: stopping notification thread failed");
+ }
+
+ /* ... and de-registering event handler */
+ if (conn != NULL && thread_data->domain_event_cb_id != -1) {
+ virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
+ thread_data->domain_event_cb_id = -1;
+ }
}
static int persistent_domains_state_notification(void) {
/* Get block device stats for each domain. */
for (int i = 0; i < state->nr_block_devices; ++i) {
- int status = get_block_stats(&state->block_devices[i]);
+ int status = get_block_device_stats(&state->block_devices[i]);
if (status != 0)
ERROR(PLUGIN_NAME
" plugin: failed to get stats for block device (%s) in domain %s",
if (lv_connect() != 0)
return -1;
- DEBUG(PLUGIN_NAME " plugin: starting event loop");
-
if (!persistent_notification) {
virt_notif_thread_init(¬if_thread);
if (start_event_loop(¬if_thread) != 0)
static void lv_add_block_devices(struct lv_read_state *state, virDomainPtr dom,
const char *domname,
xmlXPathContextPtr xpath_ctx) {
- const char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
- if (blockdevice_format == source)
- bd_xmlpath = "/domain/devices/disk/source[@dev]";
-
xmlXPathObjectPtr xpath_obj =
- xmlXPathEval((const xmlChar *)bd_xmlpath, xpath_ctx);
+ xmlXPathEval((const xmlChar *)"/domain/devices/disk", xpath_ctx);
- if (xpath_obj == NULL)
+ if (xpath_obj == NULL) {
+ DEBUG(PLUGIN_NAME " plugin: no disk xpath-object found for domain %s",
+ domname);
return;
+ }
if (xpath_obj->type != XPATH_NODESET || xpath_obj->nodesetval == NULL) {
- xmlXPathFreeObject(xpath_obj);
- return;
+ DEBUG(PLUGIN_NAME " plugin: no disk node found for domain %s", domname);
+ goto cleanup;
}
- for (int j = 0; j < xpath_obj->nodesetval->nodeNr; ++j) {
- xmlNodePtr node = xpath_obj->nodesetval->nodeTab[j];
- if (!node)
- continue;
+ xmlNodeSetPtr xml_block_devices = xpath_obj->nodesetval;
+ for (int i = 0; i < xml_block_devices->nodeNr; ++i) {
+ xmlNodePtr xml_device = xpath_obj->nodesetval->nodeTab[i];
+ char *path_str = NULL;
+ char *source_str = NULL;
- char *path = (char *)xmlGetProp(node, (xmlChar *)"dev");
- if (!path)
+ if (!xml_device)
continue;
- if (ignore_device_match(il_block_devices, domname, path) == 0)
- add_block_device(state, dom, path);
+ /* Fetching path and source for block device */
+ for (xmlNodePtr child = xml_device->children; child; child = child->next) {
+ if (child->type != XML_ELEMENT_NODE)
+ continue;
+
+ /* we are interested only in either "target" or "source" elements */
+ if (xmlStrEqual(child->name, (const xmlChar *)"target"))
+ path_str = (char *)xmlGetProp(child, (const xmlChar *)"dev");
+ else if (xmlStrEqual(child->name, (const xmlChar *)"source")) {
+ /* name of the source is located in "dev" or "file" element (it depends
+ * on type of source). Trying "dev" at first*/
+ source_str = (char *)xmlGetProp(child, (const xmlChar *)"dev");
+ if (!source_str)
+ source_str = (char *)xmlGetProp(child, (const xmlChar *)"file");
+ }
+ /* ignoring any other element*/
+ }
+
+ /* source_str will be interpreted as a device path if blockdevice_format
+ * param is set to 'source'. */
+ const char *device_path =
+ (blockdevice_format == source) ? source_str : path_str;
+
+ if (!device_path) {
+ /* no path found and we can't add block_device without it */
+ WARNING(PLUGIN_NAME " plugin: could not generate device path for disk in "
+ "domain %s - disk device will be ignored in reports",
+ domname);
+ goto cont;
+ }
+
+ if (ignore_device_match(il_block_devices, domname, device_path) == 0) {
+ /* we only have to store information whether 'source' exists or not */
+ bool has_source = (source_str != NULL) ? true : false;
+
+ add_block_device(state, dom, device_path, has_source);
+ }
- xmlFree(path);
+ cont:
+ if (path_str)
+ xmlFree(path_str);
+
+ if (source_str)
+ xmlFree(source_str);
}
+
+cleanup:
xmlXPathFreeObject(xpath_obj);
}
for (int j = 0; j < xml_interfaces->nodeNr; ++j) {
char *path = NULL;
char *address = NULL;
+ const int itf_number = j + 1;
xmlNodePtr xml_interface = xml_interfaces->nodeTab[j];
if (!xml_interface)
}
}
- if ((ignore_device_match(il_interface_devices, domname, path) == 0 &&
- ignore_device_match(il_interface_devices, domname, address) == 0)) {
- add_interface_device(state, dom, path, address, j + 1);
+ bool device_ignored = false;
+ switch (interface_format) {
+ case if_name:
+ if (ignore_device_match(il_interface_devices, domname, path) != 0)
+ device_ignored = true;
+ break;
+ case if_address:
+ if (ignore_device_match(il_interface_devices, domname, address) != 0)
+ device_ignored = true;
+ break;
+ case if_number: {
+ char number_string[4];
+ snprintf(number_string, sizeof(number_string), "%d", itf_number);
+ if (ignore_device_match(il_interface_devices, domname, number_string) !=
+ 0)
+ device_ignored = true;
+ } break;
+ default:
+ ERROR(PLUGIN_NAME " plugin: Unknown interface_format option: %d",
+ interface_format);
}
+ if (!device_ignored)
+ add_interface_device(state, dom, path, address, itf_number);
+
if (path)
xmlFree(path);
if (address)
xmlXPathFreeObject(xpath_obj);
}
+static bool is_domain_ignored(virDomainPtr dom) {
+ const char *domname = virDomainGetName(dom);
+
+ if (domname == NULL) {
+ VIRT_ERROR(conn, "virDomainGetName failed, ignoring domain");
+ return true;
+ }
+
+ if (ignorelist_match(il_domains, domname) != 0) {
+ DEBUG(PLUGIN_NAME
+ " plugin: ignoring domain '%s' because of ignorelist option",
+ domname);
+ return true;
+ }
+
+ return false;
+}
+
static int refresh_lists(struct lv_read_instance *inst) {
struct lv_read_state *state = &inst->read_state;
int n;
#ifdef HAVE_LIST_ALL_DOMAINS
for (int i = 0; i < m; ++i)
- if (add_domain(state, domains_inactive[i], 0) < 0) {
- ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ if (is_domain_ignored(domains_inactive[i]) ||
+ add_domain(state, domains_inactive[i], 0) < 0) {
+ /* domain ignored or failed during adding to domains list*/
virDomainFree(domains_inactive[i]);
domains_inactive[i] = NULL;
continue;
}
#endif
- if (add_domain(state, dom, 1) < 0) {
+ if (is_domain_ignored(dom) || add_domain(state, dom, 1) < 0) {
/*
+ * domain ignored or failed during adding to domains list
+ *
* When domain is already tracked, then there is
* no problem with memory handling (will be freed
* with the rest of domains cached data)
* before adding domain to track) we have to take
* care it ourselves and call virDomainFree
*/
- ERROR(PLUGIN_NAME " plugin: malloc failed.");
virDomainFree(dom);
continue;
}
continue;
}
- if (ignorelist_match(il_domains, domname) != 0)
- continue;
-
/* Get a list of devices for this domain. */
xmlDocPtr xml_doc = NULL;
xmlXPathContextPtr xpath_ctx = NULL;
static int add_domain(struct lv_read_state *state, virDomainPtr dom,
bool active) {
-
int new_size = sizeof(state->domains[0]) * (state->nr_domains + 1);
domain_t *new_ptr = realloc(state->domains, new_size);
- if (new_ptr == NULL)
+ if (new_ptr == NULL) {
+ ERROR(PLUGIN_NAME " plugin: realloc failed in add_domain()");
return -1;
+ }
state->domains = new_ptr;
state->domains[state->nr_domains].ptr = dom;
}
static int add_block_device(struct lv_read_state *state, virDomainPtr dom,
- const char *path) {
+ const char *path, bool has_source) {
char *path_copy = strdup(path);
if (!path_copy)
state->block_devices = new_ptr;
state->block_devices[state->nr_block_devices].dom = dom;
state->block_devices[state->nr_block_devices].path = path_copy;
+ state->block_devices[state->nr_block_devices].has_source = has_source;
return state->nr_block_devices++;
}
lv_fini_instance(i);
}
- DEBUG(PLUGIN_NAME " plugin: stopping event loop");
-
if (!persistent_notification)
stop_event_loop(¬if_thread);
}
void module_register(void) {
- plugin_register_config(PLUGIN_NAME, lv_config, config_keys, NR_CONFIG_KEYS);
+ plugin_register_complex_config("virt", lv_config);
plugin_register_init(PLUGIN_NAME, lv_init);
plugin_register_shutdown(PLUGIN_NAME, lv_shutdown);
}
projects / collectd.git / commitdiff