#include "common.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
#include "utils_complain.h"
+#include "utils_ignorelist.h"
+#include <libgen.h> /* for basename(3) */
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
-#include <libgen.h> /* for basename(3) */
+#include <libxml/xpathInternals.h>
/* Plugin name */
#define PLUGIN_NAME "virt"
-static const char *config_keys[] = {
- "Connection",
+#ifdef LIBVIR_CHECK_VERSION
- "RefreshInterval",
+#if LIBVIR_CHECK_VERSION(0, 9, 5)
+#define HAVE_BLOCK_STATS_FLAGS 1
+#endif
- "Domain",
- "BlockDevice",
- "BlockDeviceFormat",
- "BlockDeviceFormatBasename",
- "InterfaceDevice",
- "IgnoreSelected",
+#if LIBVIR_CHECK_VERSION(0, 9, 11)
+#define HAVE_CPU_STATS 1
+#endif
- "HostnameFormat",
- "InterfaceFormat",
+#endif /* LIBVIR_CHECK_VERSION */
- "PluginInstanceFormat",
+static const char *config_keys[] = {"Connection",
- NULL
-};
+ "RefreshInterval",
+
+ "Domain",
+ "BlockDevice",
+ "BlockDeviceFormat",
+ "BlockDeviceFormatBasename",
+ "InterfaceDevice",
+ "IgnoreSelected",
+
+ "HostnameFormat",
+ "InterfaceFormat",
+
+ "PluginInstanceFormat",
+
+ "Instances",
+ "ExtraStats",
+
+ NULL};
#define NR_CONFIG_KEYS ((sizeof config_keys / sizeof config_keys[0]) - 1)
/* Connection. */
/* List of network interface devices, if specified. */
static ignorelist_t *il_interface_devices = NULL;
-static int ignore_device_match (ignorelist_t *,
- const char *domname, const char *devpath);
-
-/* Actual list of domains found on last refresh. */
-static virDomainPtr *domains = NULL;
-static int nr_domains = 0;
-
-static void free_domains (void);
-static int add_domain (virDomainPtr dom);
+static int ignore_device_match(ignorelist_t *, const char *domname,
+ const char *devpath);
/* Actual list of block devices found on last refresh. */
struct block_device {
- virDomainPtr dom; /* domain */
- char *path; /* name of block device */
+ virDomainPtr dom; /* domain */
+ char *path; /* name of block device */
};
-static struct block_device *block_devices = NULL;
-static int nr_block_devices = 0;
-
-static void free_block_devices (void);
-static int add_block_device (virDomainPtr dom, const char *path);
-
/* Actual list of network interfaces found on last refresh. */
struct interface_device {
- virDomainPtr dom; /* domain */
- char *path; /* name of interface device */
- char *address; /* mac address of interface device */
- char *number; /* interface device number */
+ virDomainPtr dom; /* domain */
+ char *path; /* name of interface device */
+ char *address; /* mac address of interface device */
+ char *number; /* interface device number */
+};
+
+struct lv_read_state {
+ /* Actual list of domains found on last refresh. */
+ virDomainPtr *domains;
+ int nr_domains;
+
+ struct block_device *block_devices;
+ int nr_block_devices;
+
+ struct interface_device *interface_devices;
+ int nr_interface_devices;
+};
+
+static void free_domains(struct lv_read_state *state);
+static int add_domain(struct lv_read_state *state, virDomainPtr dom);
+
+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);
+
+static void free_interface_devices(struct lv_read_state *state);
+static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
+ const char *path, const char *address,
+ unsigned int number);
+
+#define METADATA_VM_PARTITION_URI "http://ovirt.org/ovirtmap/tag/1.0"
+#define METADATA_VM_PARTITION_ELEMENT "tag"
+#define METADATA_VM_PARTITION_PREFIX "ovirtmap"
+
+#define BUFFER_MAX_LEN 256
+#define PARTITION_TAG_MAX_LEN 32
+
+struct lv_read_instance {
+ struct lv_read_state read_state;
+ char tag[PARTITION_TAG_MAX_LEN];
+ size_t id;
};
-static struct interface_device *interface_devices = NULL;
-static int nr_interface_devices = 0;
+struct lv_user_data {
+ struct lv_read_instance inst;
+ user_data_t ud;
+};
-static void free_interface_devices (void);
-static int add_interface_device (virDomainPtr dom, const char *path, const char *address, unsigned int number);
+#define NR_INSTANCES_DEFAULT 1
+#define NR_INSTANCES_MAX 128
+static int nr_instances = NR_INSTANCES_DEFAULT;
+static struct lv_user_data lv_read_user_data[NR_INSTANCES_MAX];
/* HostnameFormat. */
#define HF_MAX_FIELDS 3
-enum hf_field {
- hf_none = 0,
- hf_hostname,
- hf_name,
- hf_uuid
-};
+enum hf_field { hf_none = 0, hf_hostname, hf_name, hf_uuid };
-static enum hf_field hostname_format[HF_MAX_FIELDS] =
- { hf_name };
+static enum hf_field hostname_format[HF_MAX_FIELDS] = {hf_name};
/* PluginInstanceFormat */
#define PLGINST_MAX_FIELDS 2
-enum plginst_field {
- plginst_none = 0,
- plginst_name,
- plginst_uuid
-};
+enum plginst_field { plginst_none = 0, plginst_name, plginst_uuid };
-static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] =
- { plginst_none };
+static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] = {
+ plginst_none};
/* BlockDeviceFormat */
-enum bd_field {
- target,
- source
-};
+enum bd_field { target, source };
/* InterfaceFormat. */
-enum if_field {
- if_address,
- if_name,
- if_number
+enum if_field { if_address, if_name, if_number };
+
+/* ExtraStats */
+#define EX_STATS_MAX_FIELDS 8
+enum ex_stats { ex_stats_none = 0, ex_stats_disk = 1, ex_stats_pcpu = 2 };
+static unsigned int extra_stats = ex_stats_none;
+
+struct ex_stats_item {
+ const char *name;
+ enum ex_stats flag;
+};
+static const struct ex_stats_item ex_stats_table[] = {
+ {"disk", ex_stats_disk}, {"pcpu", ex_stats_pcpu}, {NULL, ex_stats_none},
};
/* BlockDeviceFormatBasename */
static enum if_field interface_format = if_name;
/* Time that we last refreshed. */
-static time_t last_refresh = (time_t) 0;
+static time_t last_refresh = (time_t)0;
+
+static int refresh_lists(struct lv_read_instance *inst);
+
+struct lv_info {
+ virDomainInfo di;
+ unsigned long long total_user_cpu_time;
+ unsigned long long total_syst_cpu_time;
+};
+
+struct lv_block_info {
+ virDomainBlockStatsStruct bi;
+
+ long long rd_total_times;
+ long long wr_total_times;
+
+ long long fl_req;
+ long long fl_total_times;
+};
+
+static void init_block_info(struct lv_block_info *binfo) {
+ if (binfo == NULL)
+ return;
-static int refresh_lists (void);
+ binfo->bi.rd_req = -1;
+ binfo->bi.wr_req = -1;
+ binfo->bi.rd_bytes = -1;
+ binfo->bi.wr_bytes = -1;
+
+ binfo->rd_total_times = -1;
+ binfo->wr_total_times = -1;
+ binfo->fl_req = -1;
+ binfo->fl_total_times = -1;
+}
+
+#ifdef HAVE_BLOCK_STATS_FLAGS
+
+#define GET_BLOCK_INFO_VALUE(NAME, FIELD) \
+ do { \
+ if (!strcmp(param[i].field, NAME)) { \
+ binfo->FIELD = param[i].value.l; \
+ continue; \
+ } \
+ } while (0)
+
+static int get_block_info(struct lv_block_info *binfo,
+ virTypedParameterPtr param, int nparams) {
+ if (binfo == 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);
+ }
+
+ return 0;
+}
+
+#undef GET_BLOCK_INFO_VALUE
+
+#endif /* HAVE_BLOCK_STATS_FLAGS */
/* ERROR(...) macro for virterrors. */
-#define VIRT_ERROR(conn,s) do { \
- virErrorPtr err; \
- err = (conn) ? virConnGetLastError ((conn)) : virGetLastError (); \
- if (err) ERROR ("%s: %s", (s), err->message); \
- } while(0)
-
-static void
-init_value_list (value_list_t *vl, virDomainPtr dom)
-{
- int n;
- const char *name;
- char uuid[VIR_UUID_STRING_BUFLEN];
+#define VIRT_ERROR(conn, s) \
+ do { \
+ virErrorPtr err; \
+ err = (conn) ? virConnGetLastError((conn)) : virGetLastError(); \
+ if (err) \
+ ERROR("%s: %s", (s), err->message); \
+ } while (0)
+
+static void init_lv_info(struct lv_info *info) {
+ if (info != NULL)
+ memset(info, 0, sizeof(*info));
+}
- sstrncpy (vl->plugin, PLUGIN_NAME, sizeof (vl->plugin));
+static int lv_domain_info(virDomainPtr dom, struct lv_info *info) {
+#ifdef HAVE_CPU_STATS
+ virTypedParameterPtr param = NULL;
+ int nparams = 0;
+#endif /* HAVE_CPU_STATS */
+ int ret = virDomainGetInfo(dom, &(info->di));
+ if (ret != 0) {
+ return ret;
+ }
+
+#ifdef HAVE_CPU_STATS
+ nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, 0);
+ if (nparams < 0) {
+ VIRT_ERROR(conn, "getting the CPU params count");
+ return -1;
+ }
- vl->host[0] = '\0';
+ param = calloc(nparams, sizeof(virTypedParameter));
+ if (param == NULL) {
+ ERROR("virt plugin: alloc(%i) for cpu parameters failed.", nparams);
+ return -1;
+ }
- /* Construct the hostname field according to HostnameFormat. */
- for (int i = 0; i < HF_MAX_FIELDS; ++i) {
- if (hostname_format[i] == hf_none)
- continue;
+ ret = virDomainGetCPUStats(dom, param, nparams, -1, 1, 0); // total stats.
+ if (ret < 0) {
+ virTypedParamsFree(param, nparams);
+ VIRT_ERROR(conn, "getting the disk params values");
+ return -1;
+ }
- n = DATA_MAX_NAME_LEN - strlen (vl->host) - 2;
+ for (int i = 0; i < nparams; ++i) {
+ if (!strcmp(param[i].field, "user_time"))
+ info->total_user_cpu_time = param[i].value.ul;
+ else if (!strcmp(param[i].field, "system_time"))
+ info->total_syst_cpu_time = param[i].value.ul;
+ }
- if (i > 0 && n >= 1) {
- strncat (vl->host, ":", 1);
- n--;
- }
+ virTypedParamsFree(param, nparams);
+#endif /* HAVE_CPU_STATS */
- switch (hostname_format[i]) {
- case hf_none: break;
- case hf_hostname:
- strncat (vl->host, hostname_g, n);
- break;
- case hf_name:
- name = virDomainGetName (dom);
- if (name)
- strncat (vl->host, name, n);
- break;
- case hf_uuid:
- if (virDomainGetUUIDString (dom, uuid) == 0)
- strncat (vl->host, uuid, n);
- break;
- }
+ return 0;
+}
+
+static void init_value_list(value_list_t *vl, virDomainPtr dom) {
+ int n;
+ const char *name;
+ char uuid[VIR_UUID_STRING_BUFLEN];
+
+ sstrncpy(vl->plugin, PLUGIN_NAME, sizeof(vl->plugin));
+
+ vl->host[0] = '\0';
+
+ /* Construct the hostname field according to HostnameFormat. */
+ for (int i = 0; i < HF_MAX_FIELDS; ++i) {
+ if (hostname_format[i] == hf_none)
+ continue;
+
+ n = DATA_MAX_NAME_LEN - strlen(vl->host) - 2;
+
+ if (i > 0 && n >= 1) {
+ strncat(vl->host, ":", 1);
+ n--;
}
- vl->host[sizeof (vl->host) - 1] = '\0';
+ switch (hostname_format[i]) {
+ case hf_none:
+ break;
+ case hf_hostname:
+ strncat(vl->host, hostname_g, n);
+ break;
+ case hf_name:
+ name = virDomainGetName(dom);
+ if (name)
+ strncat(vl->host, name, n);
+ break;
+ case hf_uuid:
+ if (virDomainGetUUIDString(dom, uuid) == 0)
+ strncat(vl->host, uuid, n);
+ break;
+ }
+ }
- /* Construct the plugin instance field according to PluginInstanceFormat. */
- for (int i = 0; i < PLGINST_MAX_FIELDS; ++i) {
- if (plugin_instance_format[i] == plginst_none)
- continue;
+ vl->host[sizeof(vl->host) - 1] = '\0';
- n = sizeof(vl->plugin_instance) - strlen (vl->plugin_instance) - 2;
+ /* Construct the plugin instance field according to PluginInstanceFormat. */
+ for (int i = 0; i < PLGINST_MAX_FIELDS; ++i) {
+ if (plugin_instance_format[i] == plginst_none)
+ continue;
- if (i > 0 && n >= 1) {
- strncat (vl->plugin_instance, ":", 1);
- n--;
- }
+ n = sizeof(vl->plugin_instance) - strlen(vl->plugin_instance) - 2;
- switch (plugin_instance_format[i]) {
- case plginst_none: break;
- case plginst_name:
- name = virDomainGetName (dom);
- if (name)
- strncat (vl->plugin_instance, name, n);
- break;
- case plginst_uuid:
- if (virDomainGetUUIDString (dom, uuid) == 0)
- strncat (vl->plugin_instance, uuid, n);
- break;
- }
+ if (i > 0 && n >= 1) {
+ strncat(vl->plugin_instance, ":", 1);
+ n--;
+ }
+
+ switch (plugin_instance_format[i]) {
+ case plginst_none:
+ break;
+ case plginst_name:
+ name = virDomainGetName(dom);
+ if (name)
+ strncat(vl->plugin_instance, name, n);
+ break;
+ case plginst_uuid:
+ if (virDomainGetUUIDString(dom, uuid) == 0)
+ strncat(vl->plugin_instance, uuid, n);
+ break;
}
+ }
- vl->plugin_instance[sizeof (vl->plugin_instance) - 1] = '\0';
+ vl->plugin_instance[sizeof(vl->plugin_instance) - 1] = '\0';
} /* void init_value_list */
-static void submit (virDomainPtr dom,
- char const *type, char const *type_instance,
- value_t *values, size_t values_len)
-{
- value_list_t vl = VALUE_LIST_INIT;
- init_value_list (&vl, dom);
+static void submit(virDomainPtr dom, char const *type,
+ char const *type_instance, value_t *values,
+ size_t values_len) {
+ value_list_t vl = VALUE_LIST_INIT;
+ init_value_list(&vl, dom);
- vl.values = values;
- vl.values_len = values_len;
+ vl.values = values;
+ vl.values_len = values_len;
- sstrncpy (vl.type, type, sizeof (vl.type));
- if (type_instance != NULL)
- sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ sstrncpy(vl.type, type, sizeof(vl.type));
+ if (type_instance != NULL)
+ sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
- plugin_dispatch_values (&vl);
+ plugin_dispatch_values(&vl);
}
-static void
-memory_submit (gauge_t value, virDomainPtr dom)
-{
- submit (dom, "memory", "total", &(value_t) { .gauge = value }, 1);
+static void memory_submit(gauge_t value, virDomainPtr dom) {
+ submit(dom, "memory", "total", &(value_t){.gauge = value}, 1);
}
-static void
-memory_stats_submit (gauge_t value, virDomainPtr dom, int tag_index)
-{
- static const char *tags[] = { "swap_in", "swap_out", "major_fault", "minor_fault",
- "unused", "available", "actual_balloon", "rss"};
+static void memory_stats_submit(gauge_t value, virDomainPtr dom,
+ int tag_index) {
+ static const char *tags[] = {"swap_in", "swap_out", "major_fault",
+ "minor_fault", "unused", "available",
+ "actual_balloon", "rss"};
- if ((tag_index < 0) || (tag_index >= STATIC_ARRAY_SIZE (tags))) {
- ERROR ("virt plugin: Array index out of bounds: tag_index = %d", tag_index);
- return;
- }
+ if ((tag_index < 0) || (tag_index >= STATIC_ARRAY_SIZE(tags))) {
+ ERROR("virt plugin: Array index out of bounds: tag_index = %d", tag_index);
+ return;
+ }
- submit (dom, "memory", tags[tag_index], &(value_t) { .gauge = value }, 1);
+ submit(dom, "memory", tags[tag_index], &(value_t){.gauge = value}, 1);
}
-static void
-cpu_submit (unsigned long long value,
- virDomainPtr dom, const char *type)
-{
- submit (dom, type, NULL, &(value_t) { .derive = (derive_t) value }, 1);
-}
+static void submit_derive2(const char *type, derive_t v0, derive_t v1,
+ virDomainPtr dom, const char *devname) {
+ value_t values[] = {
+ {.derive = v0}, {.derive = v1},
+ };
-static void
-vcpu_submit (derive_t value,
- virDomainPtr dom, int vcpu_nr, const char *type)
-{
- char type_instance[DATA_MAX_NAME_LEN];
+ submit(dom, type, devname, values, STATIC_ARRAY_SIZE(values));
+} /* void submit_derive2 */
- ssnprintf (type_instance, sizeof (type_instance), "%d", vcpu_nr);
+static void pcpu_submit(virDomainPtr dom, struct lv_info *info) {
+#ifdef HAVE_CPU_STATS
+ if (extra_stats & ex_stats_pcpu)
+ submit_derive2("ps_cputime", info->total_user_cpu_time,
+ info->total_syst_cpu_time, dom, NULL);
+#endif /* HAVE_CPU_STATS */
+}
- submit (dom, type, type_instance, &(value_t) { .derive = value }, 1);
+static void cpu_submit(unsigned long long value, virDomainPtr dom,
+ const char *type) {
+ submit(dom, type, NULL, &(value_t){.derive = (derive_t)value}, 1);
}
-static void
-submit_derive2 (const char *type, derive_t v0, derive_t v1,
- virDomainPtr dom, const char *devname)
-{
- value_t values[] = {
- { .derive = v0 },
- { .derive = v1 },
- };
+static void vcpu_submit(derive_t value, virDomainPtr dom, int vcpu_nr,
+ const char *type) {
+ char type_instance[DATA_MAX_NAME_LEN];
- submit (dom, type, devname, values, STATIC_ARRAY_SIZE (values));
-} /* void submit_derive2 */
+ ssnprintf(type_instance, sizeof(type_instance), "%d", vcpu_nr);
-static int
-lv_init (void)
-{
- if (virInitialize () != 0)
- return -1;
- else
- return 0;
+ submit(dom, type, type_instance, &(value_t){.derive = value}, 1);
}
-static int
-lv_config (const char *key, const char *value)
-{
- if (virInitialize () != 0)
- return 1;
-
- if (il_domains == NULL)
- il_domains = ignorelist_create (1);
- if (il_block_devices == NULL)
- il_block_devices = ignorelist_create (1);
- if (il_interface_devices == NULL)
- il_interface_devices = ignorelist_create (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;
+static void disk_submit(struct lv_block_info *binfo, virDomainPtr dom,
+ const char *type_instance) {
+ char flush_type_instance[DATA_MAX_NAME_LEN];
+
+ ssnprintf(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 ((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 (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 (binfo->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
+ submit(dom, "total_time_in_ms", flush_type_instance,
+ &(value_t){.derive = value}, 1);
}
+ }
+}
- if (strcasecmp (key, "RefreshInterval") == 0) {
- char *eptr = NULL;
- interval = strtol (value, &eptr, 10);
- if (eptr == NULL || *eptr != '\0') return 1;
- return 0;
+static unsigned int parse_ex_stats_flags(char **exstats, int numexstats) {
+ unsigned int ex_stats_flags = ex_stats_none;
+ 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) {
+ DEBUG(PLUGIN_NAME " plugin: enabling extra stats for '%s'",
+ ex_stats_table[j].name);
+ ex_stats_flags |= ex_stats_table[j].flag;
+ break;
+ }
}
+ }
+ return ex_stats_flags;
+}
- 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;
+static int lv_config(const char *key, const char *value) {
+ if (virInitialize() != 0)
+ return 1;
+
+ if (il_domains == NULL)
+ il_domains = ignorelist_create(1);
+ if (il_block_devices == NULL)
+ il_block_devices = ignorelist_create(1);
+ if (il_interface_devices == NULL)
+ il_interface_devices = ignorelist_create(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, "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);
- return -1;
- }
- return 0;
- }
- if (strcasecmp (key, "BlockDeviceFormatBasename") == 0) {
- blockdevice_format_basename = IS_TRUE (value);
- return 0;
+ if (strcasecmp(key, "RefreshInterval") == 0) {
+ char *eptr = NULL;
+ interval = strtol(value, &eptr, 10);
+ if (eptr == NULL || *eptr != '\0')
+ return 1;
+ return 0;
+ }
+
+ 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 (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);
+ return -1;
}
- if (strcasecmp (key, "InterfaceDevice") == 0) {
- if (ignorelist_add (il_interface_devices, value)) return 1;
- return 0;
+ return 0;
+ }
+ if (strcasecmp(key, "BlockDeviceFormatBasename") == 0) {
+ blockdevice_format_basename = IS_TRUE(value);
+ 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;
+ }
- 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;
+ if (strcasecmp(key, "HostnameFormat") == 0) {
+ char *value_copy;
+ char *fields[HF_MAX_FIELDS];
+ int n;
+
+ value_copy = strdup(value);
+ if (value_copy == NULL) {
+ ERROR(PLUGIN_NAME " plugin: strdup failed.");
+ return -1;
}
- if (strcasecmp (key, "HostnameFormat") == 0) {
- char *value_copy;
- char *fields[HF_MAX_FIELDS];
- int n;
+ n = strsplit(value_copy, fields, HF_MAX_FIELDS);
+ if (n < 1) {
+ sfree(value_copy);
+ ERROR(PLUGIN_NAME " plugin: HostnameFormat: no fields");
+ return -1;
+ }
- value_copy = strdup (value);
- if (value_copy == NULL) {
- ERROR (PLUGIN_NAME " plugin: strdup failed.");
- 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 {
+ ERROR(PLUGIN_NAME " plugin: unknown HostnameFormat field: %s",
+ fields[i]);
+ sfree(value_copy);
+ return -1;
+ }
+ }
+ sfree(value_copy);
- n = strsplit (value_copy, fields, HF_MAX_FIELDS);
- if (n < 1) {
- sfree (value_copy);
- ERROR (PLUGIN_NAME " plugin: HostnameFormat: no fields");
- return -1;
- }
+ for (int i = n; i < HF_MAX_FIELDS; ++i)
+ hostname_format[i] = hf_none;
- 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 {
- ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
- sfree (value_copy);
- return -1;
- }
- }
- sfree (value_copy);
+ return 0;
+ }
- for (int i = n; i < HF_MAX_FIELDS; ++i)
- hostname_format[i] = hf_none;
+ if (strcasecmp(key, "PluginInstanceFormat") == 0) {
+ char *value_copy;
+ char *fields[PLGINST_MAX_FIELDS];
+ int n;
- return 0;
+ value_copy = strdup(value);
+ if (value_copy == NULL) {
+ ERROR(PLUGIN_NAME " plugin: strdup failed.");
+ return -1;
}
- if (strcasecmp (key, "PluginInstanceFormat") == 0) {
- char *value_copy;
- char *fields[PLGINST_MAX_FIELDS];
- int n;
+ n = strsplit(value_copy, fields, PLGINST_MAX_FIELDS);
+ if (n < 1) {
+ sfree(value_copy);
+ ERROR(PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
+ return -1;
+ }
- value_copy = strdup (value);
- if (value_copy == NULL) {
- ERROR (PLUGIN_NAME " plugin: strdup failed.");
- return -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 {
+ ERROR(PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s",
+ fields[i]);
+ sfree(value_copy);
+ return -1;
+ }
+ }
+ sfree(value_copy);
- n = strsplit (value_copy, fields, PLGINST_MAX_FIELDS);
- if (n < 1) {
- sfree (value_copy);
- ERROR (PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
- return -1;
- }
+ for (int i = n; i < PLGINST_MAX_FIELDS; ++i)
+ plugin_instance_format[i] = plginst_none;
- 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 {
- ERROR (PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s", fields[i]);
- sfree (value_copy);
- return -1;
- }
- }
- sfree (value_copy);
+ return 0;
+ }
+
+ 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;
+ }
- for (int i = n; i < PLGINST_MAX_FIELDS; ++i)
- plugin_instance_format[i] = plginst_none;
+ if (strcasecmp(key, "Instances") == 0) {
+ char *eptr = NULL;
+ double val = strtod(value, &eptr);
- return 0;
+ 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;
}
- 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;
+ nr_instances = (int)val;
+ DEBUG(PLUGIN_NAME " plugin: configured %i instances", nr_instances);
+ return 0;
+ }
+
+ 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);
}
+ }
- /* Unrecognised option. */
- return -1;
+ /* Unrecognised option. */
+ return -1;
}
-static int
-lv_read (void)
-{
- time_t t;
-
+static int lv_connect(void) {
+ if (conn == NULL) {
+ /* `conn_string == NULL' is acceptable. */
+ conn = virConnectOpenReadOnly(conn_string);
if (conn == NULL) {
- /* `conn_string == NULL' is acceptable. */
- conn = virConnectOpenReadOnly (conn_string);
- if (conn == NULL) {
- c_complain (LOG_ERR, &conn_complain,
- PLUGIN_NAME " plugin: Unable to connect: "
- "virConnectOpenReadOnly failed.");
- return -1;
- }
+ c_complain(LOG_ERR, &conn_complain,
+ PLUGIN_NAME " plugin: Unable to connect: "
+ "virConnectOpenReadOnly failed.");
+ return -1;
}
- c_release (LOG_NOTICE, &conn_complain,
+ }
+ c_release(LOG_NOTICE, &conn_complain,
PLUGIN_NAME " plugin: Connection established.");
+ return 0;
+}
- time (&t);
+static void lv_disconnect(void) {
+ if (conn != NULL)
+ virConnectClose(conn);
+ conn = NULL;
+ WARNING(PLUGIN_NAME " plugin: closed connection to libvirt");
+}
- /* Need to refresh domain or device lists? */
- if ((last_refresh == (time_t) 0) ||
- ((interval > 0) && ((last_refresh + interval) <= t))) {
- if (refresh_lists () != 0) {
- if (conn != NULL)
- virConnectClose (conn);
- conn = NULL;
- return -1;
- }
- last_refresh = t;
+static int lv_domain_block_info(virDomainPtr dom, const char *path,
+ struct lv_block_info *binfo) {
+#ifdef HAVE_BLOCK_STATS_FLAGS
+ virTypedParameterPtr params = NULL;
+ int nparams = 0;
+ int rc = -1;
+ int ret = virDomainBlockStatsFlags(dom, path, NULL, &nparams, 0);
+ if (ret < 0 || nparams == 0) {
+ VIRT_ERROR(conn, "getting the disk params count");
+ return -1;
+ }
+
+ params = calloc(nparams, sizeof(virTypedParameter));
+ if (params == NULL) {
+ ERROR("virt plugin: alloc(%i) for block=%s parameters failed.", nparams,
+ path);
+ return -1;
+ }
+ ret = virDomainBlockStatsFlags(dom, path, params, &nparams, 0);
+ if (ret < 0) {
+ VIRT_ERROR(conn, "getting the disk params values");
+ goto done;
+ }
+
+ rc = get_block_info(binfo, params, nparams);
+
+done:
+ virTypedParamsFree(params, nparams);
+ return rc;
+#else
+ return virDomainBlockStats(dom, path, &(binfo->bi), sizeof(binfo->bi));
+#endif /* HAVE_BLOCK_STATS_FLAGS */
+}
+
+static int lv_read(user_data_t *ud) {
+ time_t t;
+ struct lv_read_instance *inst = NULL;
+ struct lv_read_state *state = NULL;
+
+ if (ud->data == NULL) {
+ ERROR(PLUGIN_NAME " plugin: NULL userdata");
+ return -1;
+ }
+
+ inst = ud->data;
+ state = &inst->read_state;
+
+ if (inst->id == 0) {
+ if (lv_connect() < 0)
+ return -1;
+ }
+
+ time(&t);
+
+ /* Need to refresh domain or device lists? */
+ if ((last_refresh == (time_t)0) ||
+ ((interval > 0) && ((last_refresh + interval) <= t))) {
+ if (refresh_lists(inst) != 0) {
+ if (inst->id == 0)
+ lv_disconnect();
+ return -1;
}
+ last_refresh = t;
+ }
#if 0
for (int i = 0; i < nr_domains; ++i)
interface_devices[i].path);
#endif
- /* Get CPU usage, memory, VCPU usage for each domain. */
- for (int i = 0; i < nr_domains; ++i) {
- virDomainInfo info;
- virVcpuInfoPtr vinfo = NULL;
- virDomainMemoryStatPtr minfo = NULL;
- int status;
-
- status = virDomainGetInfo (domains[i], &info);
- if (status != 0)
- {
- ERROR (PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
- status);
- continue;
- }
+ /* Get CPU usage, memory, VCPU usage for each domain. */
+ for (int i = 0; i < state->nr_domains; ++i) {
+ struct lv_info info;
+ virVcpuInfoPtr vinfo = NULL;
+ virDomainMemoryStatPtr minfo = NULL;
+ int status;
+
+ init_lv_info(&info);
+ status = lv_domain_info(state->domains[i], &info);
+ if (status != 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
+ status);
+ continue;
+ }
- if (info.state != VIR_DOMAIN_RUNNING)
- {
- /* only gather stats for running domains */
- continue;
- }
+ pcpu_submit(state->domains[i], &info);
+ cpu_submit(info.di.cpuTime, state->domains[i], "virt_cpu_total");
+ memory_submit((gauge_t)info.di.memory * 1024, state->domains[i]);
- cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
- memory_submit ((gauge_t) info.memory * 1024, domains[i]);
+ vinfo = malloc(info.di.nrVirtCpu * sizeof(vinfo[0]));
+ if (vinfo == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ continue;
+ }
- vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
- if (vinfo == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- continue;
- }
+ status = virDomainGetVcpus(state->domains[i], vinfo, info.di.nrVirtCpu,
+ /* cpu map = */ NULL, /* cpu map length = */ 0);
+ if (status < 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.",
+ status);
+ sfree(vinfo);
+ continue;
+ }
- status = virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu,
- /* cpu map = */ NULL, /* cpu map length = */ 0);
- if (status < 0)
- {
- ERROR (PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.",
- status);
- sfree (vinfo);
- continue;
- }
+ for (int j = 0; j < info.di.nrVirtCpu; ++j)
+ vcpu_submit(vinfo[j].cpuTime, state->domains[i], vinfo[j].number,
+ "virt_vcpu");
- for (int j = 0; j < info.nrVirtCpu; ++j)
- vcpu_submit (vinfo[j].cpuTime,
- domains[i], vinfo[j].number, "virt_vcpu");
+ sfree(vinfo);
- sfree (vinfo);
+ minfo =
+ malloc(VIR_DOMAIN_MEMORY_STAT_NR * sizeof(virDomainMemoryStatStruct));
+ if (minfo == NULL) {
+ ERROR("virt plugin: malloc failed.");
+ continue;
+ }
- minfo = malloc (VIR_DOMAIN_MEMORY_STAT_NR * sizeof (virDomainMemoryStatStruct));
- if (minfo == NULL) {
- ERROR ("virt plugin: malloc failed.");
- continue;
- }
+ status = virDomainMemoryStats(state->domains[i], minfo,
+ VIR_DOMAIN_MEMORY_STAT_NR, 0);
- status = virDomainMemoryStats (domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0);
+ if (status < 0) {
+ ERROR("virt plugin: virDomainMemoryStats failed with status %i.", status);
+ sfree(minfo);
+ continue;
+ }
- if (status < 0) {
- ERROR ("virt plugin: virDomainMemoryStats failed with status %i.",
- status);
- sfree (minfo);
- continue;
- }
+ for (int j = 0; j < status; j++) {
+ memory_stats_submit((gauge_t)minfo[j].val * 1024, state->domains[i],
+ minfo[j].tag);
+ }
- for (int j = 0; j < status; j++) {
- memory_stats_submit ((gauge_t) minfo[j].val * 1024, domains[i], minfo[j].tag);
- }
+ sfree(minfo);
+ }
+
+ /* Get block device stats for each domain. */
+ for (int i = 0; i < state->nr_block_devices; ++i) {
+ struct block_device *bdev = &(state->block_devices[i]);
+ struct lv_block_info binfo;
+ init_block_info(&binfo);
+
+ if (lv_domain_block_info(bdev->dom, bdev->path, &binfo) < 0)
+ continue;
+
+ char *type_instance = bdev->path;
+ char *path = NULL;
+ if (blockdevice_format_basename && blockdevice_format == source) {
+ path = strdup(bdev->path);
+ if (path == NULL) {
+ WARNING(PLUGIN_NAME
+ " plugin: error extracting the basename for '%s', skipped",
+ bdev->path);
+ continue;
+ }
+ type_instance = basename(path);
+ }
- sfree (minfo);
+ disk_submit(&binfo, bdev->dom, type_instance);
+
+ sfree(path);
+ } /* for (nr_block_devices) */
+
+ /* Get interface stats for each domain. */
+ for (int i = 0; i < state->nr_interface_devices; ++i) {
+ struct _virDomainInterfaceStats stats;
+ char *display_name = NULL;
+
+ switch (interface_format) {
+ case if_address:
+ display_name = state->interface_devices[i].address;
+ break;
+ case if_number:
+ display_name = state->interface_devices[i].number;
+ break;
+ case if_name:
+ default:
+ display_name = state->interface_devices[i].path;
}
+ if (virDomainInterfaceStats(state->interface_devices[i].dom,
+ state->interface_devices[i].path, &stats,
+ sizeof stats) != 0)
+ continue;
+
+ if ((stats.rx_bytes != -1) && (stats.tx_bytes != -1))
+ submit_derive2("if_octets", (derive_t)stats.rx_bytes,
+ (derive_t)stats.tx_bytes, state->interface_devices[i].dom,
+ display_name);
+
+ if ((stats.rx_packets != -1) && (stats.tx_packets != -1))
+ submit_derive2("if_packets", (derive_t)stats.rx_packets,
+ (derive_t)stats.tx_packets,
+ state->interface_devices[i].dom, display_name);
+
+ if ((stats.rx_errs != -1) && (stats.tx_errs != -1))
+ submit_derive2("if_errors", (derive_t)stats.rx_errs,
+ (derive_t)stats.tx_errs, state->interface_devices[i].dom,
+ display_name);
+
+ if ((stats.rx_drop != -1) && (stats.tx_drop != -1))
+ submit_derive2("if_dropped", (derive_t)stats.rx_drop,
+ (derive_t)stats.tx_drop, state->interface_devices[i].dom,
+ display_name);
+ } /* for (nr_interface_devices) */
+
+ return 0;
+}
- /* Get block device stats for each domain. */
- for (int i = 0; i < nr_block_devices; ++i) {
- struct _virDomainBlockStats stats;
+static int lv_init_instance(size_t i, plugin_read_cb callback) {
+ struct lv_user_data *lv_ud = &(lv_read_user_data[i]);
+ struct lv_read_instance *inst = &(lv_ud->inst);
- if (virDomainBlockStats (block_devices[i].dom, block_devices[i].path,
- &stats, sizeof stats) != 0)
- continue;
+ memset(lv_ud, 0, sizeof(*lv_ud));
- char *type_instance = NULL;
- if (blockdevice_format_basename && blockdevice_format == source)
- type_instance = strdup(basename(block_devices[i].path));
- else
- type_instance = strdup(block_devices[i].path);
-
- if ((stats.rd_req != -1) && (stats.wr_req != -1))
- submit_derive2 ("disk_ops",
- (derive_t) stats.rd_req, (derive_t) stats.wr_req,
- block_devices[i].dom, type_instance);
-
- if ((stats.rd_bytes != -1) && (stats.wr_bytes != -1))
- submit_derive2 ("disk_octets",
- (derive_t) stats.rd_bytes, (derive_t) stats.wr_bytes,
- block_devices[i].dom, type_instance);
-
- sfree (type_instance);
- } /* for (nr_block_devices) */
-
- /* Get interface stats for each domain. */
- for (int i = 0; i < nr_interface_devices; ++i) {
- struct _virDomainInterfaceStats stats;
- char *display_name = NULL;
-
- switch (interface_format) {
- case if_address:
- display_name = interface_devices[i].address;
- break;
- case if_number:
- display_name = interface_devices[i].number;
- break;
- case if_name:
- default:
- display_name = interface_devices[i].path;
- }
+ ssnprintf(inst->tag, sizeof(inst->tag), "%s-%zu", PLUGIN_NAME, i);
+ inst->id = i;
- if (virDomainInterfaceStats (interface_devices[i].dom,
- interface_devices[i].path,
- &stats, sizeof stats) != 0)
- continue;
+ user_data_t *ud = &(lv_ud->ud);
+ ud->data = inst;
+ ud->free_func = NULL;
- if ((stats.rx_bytes != -1) && (stats.tx_bytes != -1))
- submit_derive2 ("if_octets",
- (derive_t) stats.rx_bytes, (derive_t) stats.tx_bytes,
- interface_devices[i].dom, display_name);
+ INFO(PLUGIN_NAME " plugin: reader %s initialized", inst->tag);
+ return plugin_register_complex_read(NULL, inst->tag, callback, 0, ud);
+}
- if ((stats.rx_packets != -1) && (stats.tx_packets != -1))
- submit_derive2 ("if_packets",
- (derive_t) stats.rx_packets, (derive_t) stats.tx_packets,
- interface_devices[i].dom, display_name);
+static void lv_clean_read_state(struct lv_read_state *state) {
+ free_block_devices(state);
+ free_interface_devices(state);
+ free_domains(state);
+}
- if ((stats.rx_errs != -1) && (stats.tx_errs != -1))
- submit_derive2 ("if_errors",
- (derive_t) stats.rx_errs, (derive_t) stats.tx_errs,
- interface_devices[i].dom, display_name);
+static void lv_fini_instance(size_t i) {
+ struct lv_read_instance *inst = &(lv_read_user_data[i].inst);
+ struct lv_read_state *state = &(inst->read_state);
- if ((stats.rx_drop != -1) && (stats.tx_drop != -1))
- submit_derive2 ("if_dropped",
- (derive_t) stats.rx_drop, (derive_t) stats.tx_drop,
- interface_devices[i].dom, display_name);
- } /* for (nr_interface_devices) */
+ lv_clean_read_state(state);
+ INFO(PLUGIN_NAME " plugin: reader %s finalized", inst->tag);
+}
- return 0;
+static int lv_init(void) {
+ if (virInitialize() != 0)
+ return -1;
+
+ if (lv_connect() != 0)
+ return -1;
+
+ DEBUG(PLUGIN_NAME " plugin: starting %i instances", nr_instances);
+
+ for (int i = 0; i < nr_instances; ++i)
+ lv_init_instance(i, lv_read);
+
+ return 0;
+}
+
+/*
+ * returns 0 on success and <0 on error
+ */
+static int lv_domain_get_tag(xmlXPathContextPtr xpath_ctx, const char *dom_name,
+ char *dom_tag) {
+ char xpath_str[BUFFER_MAX_LEN] = {'\0'};
+ xmlXPathObjectPtr xpath_obj = NULL;
+ xmlNodePtr xml_node = NULL;
+ int ret = -1;
+ int err;
+
+ err = xmlXPathRegisterNs(xpath_ctx,
+ (const xmlChar *)METADATA_VM_PARTITION_PREFIX,
+ (const xmlChar *)METADATA_VM_PARTITION_URI);
+ if (err) {
+ ERROR(PLUGIN_NAME " plugin: xmlXpathRegisterNs(%s, %s) failed on domain %s",
+ METADATA_VM_PARTITION_PREFIX, METADATA_VM_PARTITION_URI, dom_name);
+ goto done;
+ }
+
+ ssnprintf(xpath_str, sizeof(xpath_str), "/domain/metadata/%s:%s/text()",
+ METADATA_VM_PARTITION_PREFIX, METADATA_VM_PARTITION_ELEMENT);
+ xpath_obj = xmlXPathEvalExpression((xmlChar *)xpath_str, xpath_ctx);
+ if (xpath_obj == NULL) {
+ ERROR(PLUGIN_NAME " plugin: xmlXPathEval(%s) failed on domain %s",
+ xpath_str, dom_name);
+ goto done;
+ }
+
+ if (xpath_obj->type != XPATH_NODESET) {
+ ERROR(PLUGIN_NAME " plugin: xmlXPathEval(%s) unexpected return type %d "
+ "(wanted %d) on domain %s",
+ xpath_str, xpath_obj->type, XPATH_NODESET, dom_name);
+ goto done;
+ }
+
+ /*
+ * from now on there is no real error, it's ok if a domain
+ * doesn't have the metadata partition tag.
+ */
+ ret = 0;
+ if (xpath_obj->nodesetval == NULL || xpath_obj->nodesetval->nodeNr != 1) {
+ DEBUG(PLUGIN_NAME " plugin: xmlXPathEval(%s) return nodeset size=%i "
+ "expected=1 on domain %s",
+ xpath_str,
+ (xpath_obj->nodesetval == NULL) ? 0 : xpath_obj->nodesetval->nodeNr,
+ dom_name);
+ } else {
+ xml_node = xpath_obj->nodesetval->nodeTab[0];
+ sstrncpy(dom_tag, (const char *)xml_node->content, PARTITION_TAG_MAX_LEN);
+ }
+
+done:
+ /* deregister to clean up */
+ err = xmlXPathRegisterNs(xpath_ctx,
+ (const xmlChar *)METADATA_VM_PARTITION_PREFIX, NULL);
+ if (err) {
+ /* we can't really recover here */
+ ERROR(PLUGIN_NAME
+ " plugin: deregistration of namespace %s failed for domain %s",
+ METADATA_VM_PARTITION_PREFIX, dom_name);
+ }
+ if (xpath_obj)
+ xmlXPathFreeObject(xpath_obj);
+
+ return ret;
+}
+
+static int is_known_tag(const char *dom_tag) {
+ for (int i = 0; i < nr_instances; ++i)
+ if (!strcmp(dom_tag, lv_read_user_data[i].inst.tag))
+ return 1;
+ return 0;
+}
+
+static int lv_instance_include_domain(struct lv_read_instance *inst,
+ const char *dom_name,
+ const char *dom_tag) {
+ if ((dom_tag[0] != '\0') && (strcmp(dom_tag, inst->tag) == 0))
+ return 1;
+
+ /* instance#0 will always be there, so it is in charge of extra duties */
+ if (inst->id == 0) {
+ if (dom_tag[0] == '\0' || !is_known_tag(dom_tag)) {
+ DEBUG(PLUGIN_NAME " plugin#%s: refreshing domain %s "
+ "with unknown tag '%s'",
+ inst->tag, dom_name, dom_tag);
+ return 1;
+ }
+ }
+
+ return 0;
}
/*
# endif
#endif
-static int
-refresh_lists (void)
-{
- int n;
+static int refresh_lists(struct lv_read_instance *inst) {
+ struct lv_read_state *state = &inst->read_state;
+ int n;
- n = virConnectNumOfDomains (conn);
- if (n < 0) {
- VIRT_ERROR (conn, "reading number of domains");
- return -1;
- }
+ n = virConnectNumOfDomains(conn);
+ if (n < 0) {
+ VIRT_ERROR(conn, "reading number of domains");
+ return -1;
+ }
- if (n > 0) {
+ lv_clean_read_state(state);
+
+ if (n > 0) {
#ifdef HAVE_LIST_ALL_DOMAINS
- virDomainPtr *domains;
- n = virConnectListAllDomains (conn, &domains, VIR_CONNECT_LIST_DOMAINS_ACTIVE);
+ virDomainPtr *domains;
+ n = virConnectListAllDomains (conn, &domains, VIR_CONNECT_LIST_DOMAINS_ACTIVE);
#else
- int *domids;
+ int *domids;
- /* Get list of domains. */
- domids = malloc (sizeof (*domids) * n);
- if (domids == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- return -1;
- }
+ /* Get list of domains. */
+ domids = malloc(sizeof(*domids) * n);
+ if (domids == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ return -1;
+ }
- n = virConnectListDomains (conn, domids, n);
+ n = virConnectListDomains(conn, domids, n);
#endif
- if (n < 0) {
- VIRT_ERROR (conn, "reading list of domains");
+ if (n < 0) {
+ VIRT_ERROR(conn, "reading list of domains");
#ifndef HAVE_LIST_ALL_DOMAINS
- sfree (domids);
+ sfree(domids);
#endif
- return -1;
- }
-
- free_block_devices ();
- free_interface_devices ();
- free_domains ();
+ return -1;
+ }
- /* Fetch each domain and add it to the list, unless ignore. */
- for (int i = 0; i < n; ++i) {
- const char *name;
- char *xml = NULL;
- xmlDocPtr xml_doc = NULL;
- xmlXPathContextPtr xpath_ctx = NULL;
- xmlXPathObjectPtr xpath_obj = NULL;
+ /* Fetch each domain and add it to the list, unless ignore. */
+ for (int i = 0; i < n; ++i) {
+ const char *name;
+ char *xml = NULL;
+ xmlDocPtr xml_doc = NULL;
+ xmlXPathContextPtr xpath_ctx = NULL;
+ xmlXPathObjectPtr xpath_obj = NULL;
+ char tag[PARTITION_TAG_MAX_LEN] = {'\0'};
+ virDomainInfo info;
+ int status;
#ifdef HAVE_LIST_ALL_DOMAINS
- virDomainPtr dom = domains[i];
+ virDomainPtr dom = domains[i];
#else
- virDomainPtr dom = NULL;
-
- dom = virDomainLookupByID (conn, domids[i]);
- if (dom == NULL) {
- VIRT_ERROR (conn, "virDomainLookupByID");
- /* Could be that the domain went away -- ignore it anyway. */
- continue;
- }
+ virDomainPtr dom = NULL;
+ dom = virDomainLookupByID(conn, domids[i]);
+ if (dom == NULL) {
+ VIRT_ERROR(conn, "virDomainLookupByID");
+ /* Could be that the domain went away -- ignore it anyway. */
+ continue;
+ }
#endif
- name = virDomainGetName (dom);
- if (name == NULL) {
- VIRT_ERROR (conn, "virDomainGetName");
- goto cont;
- }
-
- if (il_domains && ignorelist_match (il_domains, name) != 0)
- goto cont;
-
- if (add_domain (dom) < 0) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- goto cont;
- }
-
- /* Get a list of devices for this domain. */
- xml = virDomainGetXMLDesc (dom, 0);
- if (!xml) {
- VIRT_ERROR (conn, "virDomainGetXMLDesc");
- goto cont;
- }
-
- /* Yuck, XML. Parse out the devices. */
- xml_doc = xmlReadDoc ((xmlChar *) xml, NULL, NULL, XML_PARSE_NONET);
- if (xml_doc == NULL) {
- VIRT_ERROR (conn, "xmlReadDoc");
- goto cont;
- }
-
- xpath_ctx = xmlXPathNewContext (xml_doc);
-
- /* Block devices. */
- char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
- if (blockdevice_format == source)
- bd_xmlpath = "/domain/devices/disk/source[@dev]";
- xpath_obj = xmlXPathEval ((xmlChar *) bd_xmlpath, xpath_ctx);
-
- if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
- xpath_obj->nodesetval == NULL)
- goto cont;
-
- for (int j = 0; j < xpath_obj->nodesetval->nodeNr; ++j) {
- xmlNodePtr node;
- char *path = NULL;
-
- node = xpath_obj->nodesetval->nodeTab[j];
- if (!node) continue;
- path = (char *) xmlGetProp (node, (xmlChar *) "dev");
- if (!path) continue;
-
- if (il_block_devices &&
- ignore_device_match (il_block_devices, name, path) != 0)
- goto cont2;
-
- add_block_device (dom, path);
- cont2:
- if (path) xmlFree (path);
- }
- xmlXPathFreeObject (xpath_obj);
-
- /* Network interfaces. */
- xpath_obj = xmlXPathEval
- ((xmlChar *) "/domain/devices/interface[target[@dev]]",
- xpath_ctx);
- if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
- xpath_obj->nodesetval == NULL)
- goto cont;
-
- xmlNodeSetPtr xml_interfaces = xpath_obj->nodesetval;
-
- for (int j = 0; j < xml_interfaces->nodeNr; ++j) {
- char *path = NULL;
- char *address = NULL;
- xmlNodePtr xml_interface;
-
- xml_interface = xml_interfaces->nodeTab[j];
- if (!xml_interface) continue;
-
- for (xmlNodePtr child = xml_interface->children; child; child = child->next) {
- if (child->type != XML_ELEMENT_NODE) continue;
-
- if (xmlStrEqual(child->name, (const xmlChar *) "target")) {
- path = (char *) xmlGetProp (child, (const xmlChar *) "dev");
- if (!path) continue;
- } else if (xmlStrEqual(child->name, (const xmlChar *) "mac")) {
- address = (char *) xmlGetProp (child, (const xmlChar *) "address");
- if (!address) continue;
- }
- }
-
- if (il_interface_devices &&
- (ignore_device_match (il_interface_devices, name, path) != 0 ||
- ignore_device_match (il_interface_devices, name, address) != 0))
- goto cont3;
-
- add_interface_device (dom, path, address, j+1);
- cont3:
- if (path) xmlFree (path);
- if (address) xmlFree (address);
- }
-
- cont:
- if (xpath_obj) xmlXPathFreeObject (xpath_obj);
- if (xpath_ctx) xmlXPathFreeContext (xpath_ctx);
- if (xml_doc) xmlFreeDoc (xml_doc);
- sfree (xml);
+ name = virDomainGetName(dom);
+ if (name == NULL) {
+ VIRT_ERROR(conn, "virDomainGetName");
+ goto cont;
+ }
+
+ status = virDomainGetInfo(dom, &info);
+ if (status != 0) {
+ ERROR(PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
+ status);
+ continue;
+ }
+
+ if (info.state != VIR_DOMAIN_RUNNING) {
+ DEBUG(PLUGIN_NAME " plugin: skipping inactive domain %s", name);
+ continue;
+ }
+
+ if (il_domains && ignorelist_match(il_domains, name) != 0)
+ goto cont;
+
+ /* Get a list of devices for this domain. */
+ xml = virDomainGetXMLDesc(dom, 0);
+ if (!xml) {
+ VIRT_ERROR(conn, "virDomainGetXMLDesc");
+ goto cont;
+ }
+
+ /* Yuck, XML. Parse out the devices. */
+ xml_doc = xmlReadDoc((xmlChar *)xml, NULL, NULL, XML_PARSE_NONET);
+ if (xml_doc == NULL) {
+ VIRT_ERROR(conn, "xmlReadDoc");
+ goto cont;
+ }
+
+ xpath_ctx = xmlXPathNewContext(xml_doc);
+
+ if (lv_domain_get_tag(xpath_ctx, name, tag) < 0) {
+ ERROR(PLUGIN_NAME " plugin: lv_domain_get_tag failed.");
+ goto cont;
+ }
+
+ if (!lv_instance_include_domain(inst, name, tag))
+ goto cont;
+
+ if (add_domain(state, dom) < 0) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ goto cont;
+ }
+
+ /* Block devices. */
+ const char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
+ if (blockdevice_format == source)
+ bd_xmlpath = "/domain/devices/disk/source[@dev]";
+ xpath_obj = xmlXPathEval((const xmlChar *)bd_xmlpath, xpath_ctx);
+
+ if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
+ xpath_obj->nodesetval == NULL)
+ goto cont;
+
+ for (int j = 0; j < xpath_obj->nodesetval->nodeNr; ++j) {
+ xmlNodePtr node;
+ char *path = NULL;
+
+ node = xpath_obj->nodesetval->nodeTab[j];
+ if (!node)
+ continue;
+ path = (char *)xmlGetProp(node, (xmlChar *)"dev");
+ if (!path)
+ continue;
+
+ if (il_block_devices &&
+ ignore_device_match(il_block_devices, name, path) != 0)
+ goto cont2;
+
+ add_block_device(state, dom, path);
+ cont2:
+ if (path)
+ xmlFree(path);
+ }
+ xmlXPathFreeObject(xpath_obj);
+
+ /* Network interfaces. */
+ xpath_obj = xmlXPathEval(
+ (xmlChar *)"/domain/devices/interface[target[@dev]]", xpath_ctx);
+ if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
+ xpath_obj->nodesetval == NULL)
+ goto cont;
+
+ xmlNodeSetPtr xml_interfaces = xpath_obj->nodesetval;
+
+ for (int j = 0; j < xml_interfaces->nodeNr; ++j) {
+ char *path = NULL;
+ char *address = NULL;
+ xmlNodePtr xml_interface;
+
+ xml_interface = xml_interfaces->nodeTab[j];
+ if (!xml_interface)
+ continue;
+
+ for (xmlNodePtr child = xml_interface->children; child;
+ child = child->next) {
+ if (child->type != XML_ELEMENT_NODE)
+ continue;
+
+ if (xmlStrEqual(child->name, (const xmlChar *)"target")) {
+ path = (char *)xmlGetProp(child, (const xmlChar *)"dev");
+ if (!path)
+ continue;
+ } else if (xmlStrEqual(child->name, (const xmlChar *)"mac")) {
+ address = (char *)xmlGetProp(child, (const xmlChar *)"address");
+ if (!address)
+ continue;
+ }
}
+ if (il_interface_devices &&
+ (ignore_device_match(il_interface_devices, name, path) != 0 ||
+ ignore_device_match(il_interface_devices, name, address) != 0))
+ goto cont3;
+
+ add_interface_device(state, dom, path, address, j + 1);
+ cont3:
+ if (path)
+ xmlFree(path);
+ if (address)
+ xmlFree(address);
+ }
+
+ cont:
+ if (xpath_obj)
+ xmlXPathFreeObject(xpath_obj);
+ if (xpath_ctx)
+ xmlXPathFreeContext(xpath_ctx);
+ if (xml_doc)
+ xmlFreeDoc(xml_doc);
+ sfree(xml);
+ }
+
#ifdef HAVE_LIST_ALL_DOMAINS
- sfree (domains);
+ sfree (domains);
#else
- sfree (domids);
+ sfree(domids);
#endif
- }
+ }
- return 0;
+ DEBUG(PLUGIN_NAME " plugin#%s: refreshing"
+ " domains=%i block_devices=%i iface_devices=%i",
+ inst->tag, state->nr_domains, state->nr_block_devices,
+ state->nr_interface_devices);
+
+ return 0;
}
-static void
-free_domains (void)
-{
- if (domains) {
- for (int i = 0; i < nr_domains; ++i)
- virDomainFree (domains[i]);
- sfree (domains);
- }
- domains = NULL;
- nr_domains = 0;
+static void free_domains(struct lv_read_state *state) {
+ if (state->domains) {
+ for (int i = 0; i < state->nr_domains; ++i)
+ virDomainFree(state->domains[i]);
+ sfree(state->domains);
+ }
+ state->domains = NULL;
+ state->nr_domains = 0;
}
-static int
-add_domain (virDomainPtr dom)
-{
- virDomainPtr *new_ptr;
- int new_size = sizeof (domains[0]) * (nr_domains+1);
+static int add_domain(struct lv_read_state *state, virDomainPtr dom) {
+ virDomainPtr *new_ptr;
+ int new_size = sizeof(state->domains[0]) * (state->nr_domains + 1);
- if (domains)
- new_ptr = realloc (domains, new_size);
- else
- new_ptr = malloc (new_size);
+ if (state->domains)
+ new_ptr = realloc(state->domains, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL)
- return -1;
+ if (new_ptr == NULL)
+ return -1;
- domains = new_ptr;
- domains[nr_domains] = dom;
- return nr_domains++;
+ state->domains = new_ptr;
+ state->domains[state->nr_domains] = dom;
+ return state->nr_domains++;
}
-static void
-free_block_devices (void)
-{
- if (block_devices) {
- for (int i = 0; i < nr_block_devices; ++i)
- sfree (block_devices[i].path);
- sfree (block_devices);
- }
- block_devices = NULL;
- nr_block_devices = 0;
+static void free_block_devices(struct lv_read_state *state) {
+ if (state->block_devices) {
+ for (int i = 0; i < state->nr_block_devices; ++i)
+ sfree(state->block_devices[i].path);
+ sfree(state->block_devices);
+ }
+ state->block_devices = NULL;
+ state->nr_block_devices = 0;
}
-static int
-add_block_device (virDomainPtr dom, const char *path)
-{
- struct block_device *new_ptr;
- int new_size = sizeof (block_devices[0]) * (nr_block_devices+1);
- char *path_copy;
+static int add_block_device(struct lv_read_state *state, virDomainPtr dom,
+ const char *path) {
+ struct block_device *new_ptr;
+ int new_size =
+ sizeof(state->block_devices[0]) * (state->nr_block_devices + 1);
+ char *path_copy;
- path_copy = strdup (path);
- if (!path_copy)
- return -1;
+ path_copy = strdup(path);
+ if (!path_copy)
+ return -1;
- if (block_devices)
- new_ptr = realloc (block_devices, new_size);
- else
- new_ptr = malloc (new_size);
+ if (state->block_devices)
+ new_ptr = realloc(state->block_devices, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL) {
- sfree (path_copy);
- return -1;
- }
- block_devices = new_ptr;
- block_devices[nr_block_devices].dom = dom;
- block_devices[nr_block_devices].path = path_copy;
- return nr_block_devices++;
+ if (new_ptr == NULL) {
+ sfree(path_copy);
+ return -1;
+ }
+ state->block_devices = new_ptr;
+ state->block_devices[state->nr_block_devices].dom = dom;
+ state->block_devices[state->nr_block_devices].path = path_copy;
+ return state->nr_block_devices++;
}
-static void
-free_interface_devices (void)
-{
- if (interface_devices) {
- for (int i = 0; i < nr_interface_devices; ++i) {
- sfree (interface_devices[i].path);
- sfree (interface_devices[i].address);
- sfree (interface_devices[i].number);
- }
- sfree (interface_devices);
+static void free_interface_devices(struct lv_read_state *state) {
+ if (state->interface_devices) {
+ for (int i = 0; i < state->nr_interface_devices; ++i) {
+ sfree(state->interface_devices[i].path);
+ sfree(state->interface_devices[i].address);
+ sfree(state->interface_devices[i].number);
}
- interface_devices = NULL;
- nr_interface_devices = 0;
+ sfree(state->interface_devices);
+ }
+ state->interface_devices = NULL;
+ state->nr_interface_devices = 0;
}
-static int
-add_interface_device (virDomainPtr dom, const char *path, const char *address, unsigned int number)
-{
- struct interface_device *new_ptr;
- int new_size = sizeof (interface_devices[0]) * (nr_interface_devices+1);
- char *path_copy, *address_copy, number_string[15];
+static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
+ const char *path, const char *address,
+ unsigned int number) {
+ struct interface_device *new_ptr;
+ int new_size =
+ sizeof(state->interface_devices[0]) * (state->nr_interface_devices + 1);
+ char *path_copy, *address_copy, number_string[15];
- if ((path == NULL) || (address == NULL))
- return EINVAL;
+ if ((path == NULL) || (address == NULL))
+ return EINVAL;
- path_copy = strdup (path);
- if (!path_copy) return -1;
+ path_copy = strdup(path);
+ if (!path_copy)
+ return -1;
- address_copy = strdup (address);
- if (!address_copy) {
- sfree(path_copy);
- return -1;
- }
+ address_copy = strdup(address);
+ if (!address_copy) {
+ sfree(path_copy);
+ return -1;
+ }
- snprintf(number_string, sizeof (number_string), "interface-%u", number);
+ snprintf(number_string, sizeof(number_string), "interface-%u", number);
- if (interface_devices)
- new_ptr = realloc (interface_devices, new_size);
- else
- new_ptr = malloc (new_size);
+ if (state->interface_devices)
+ new_ptr = realloc(state->interface_devices, new_size);
+ else
+ new_ptr = malloc(new_size);
- if (new_ptr == NULL) {
- sfree (path_copy);
- sfree (address_copy);
- return -1;
- }
- interface_devices = new_ptr;
- interface_devices[nr_interface_devices].dom = dom;
- interface_devices[nr_interface_devices].path = path_copy;
- interface_devices[nr_interface_devices].address = address_copy;
- interface_devices[nr_interface_devices].number = strdup(number_string);
- return nr_interface_devices++;
+ if (new_ptr == NULL) {
+ sfree(path_copy);
+ sfree(address_copy);
+ return -1;
+ }
+ state->interface_devices = new_ptr;
+ state->interface_devices[state->nr_interface_devices].dom = dom;
+ state->interface_devices[state->nr_interface_devices].path = path_copy;
+ state->interface_devices[state->nr_interface_devices].address = address_copy;
+ state->interface_devices[state->nr_interface_devices].number =
+ strdup(number_string);
+ return state->nr_interface_devices++;
}
-static int
-ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
-{
- char *name;
- int n, r;
+static int ignore_device_match(ignorelist_t *il, const char *domname,
+ const char *devpath) {
+ char *name;
+ int n, r;
- if ((domname == NULL) || (devpath == NULL))
- return 0;
+ if ((domname == NULL) || (devpath == NULL))
+ return 0;
- n = sizeof (char) * (strlen (domname) + strlen (devpath) + 2);
- name = malloc (n);
- if (name == NULL) {
- ERROR (PLUGIN_NAME " plugin: malloc failed.");
- return 0;
- }
- ssnprintf (name, n, "%s:%s", domname, devpath);
- r = ignorelist_match (il, name);
- sfree (name);
- return r;
+ n = sizeof(char) * (strlen(domname) + strlen(devpath) + 2);
+ name = malloc(n);
+ if (name == NULL) {
+ ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ return 0;
+ }
+ ssnprintf(name, n, "%s:%s", domname, devpath);
+ r = ignorelist_match(il, name);
+ sfree(name);
+ return r;
}
-static int
-lv_shutdown (void)
-{
- free_block_devices ();
- free_interface_devices ();
- free_domains ();
+static int lv_shutdown(void) {
+ for (int i = 0; i < nr_instances; ++i) {
+ lv_fini_instance(i);
+ }
- if (conn != NULL)
- virConnectClose (conn);
- conn = NULL;
+ lv_disconnect();
- ignorelist_free (il_domains);
- il_domains = NULL;
- ignorelist_free (il_block_devices);
- il_block_devices = NULL;
- ignorelist_free (il_interface_devices);
- il_interface_devices = NULL;
+ ignorelist_free(il_domains);
+ il_domains = NULL;
+ ignorelist_free(il_block_devices);
+ il_block_devices = NULL;
+ ignorelist_free(il_interface_devices);
+ il_interface_devices = NULL;
- return 0;
+ return 0;
}
-void
-module_register (void)
-{
- plugin_register_config (PLUGIN_NAME,
- lv_config,
- config_keys, NR_CONFIG_KEYS);
- plugin_register_init (PLUGIN_NAME, lv_init);
- plugin_register_read (PLUGIN_NAME, lv_read);
- plugin_register_shutdown (PLUGIN_NAME, lv_shutdown);
+void module_register(void) {
+ plugin_register_config(PLUGIN_NAME, lv_config, config_keys, NR_CONFIG_KEYS);
+ plugin_register_init(PLUGIN_NAME, lv_init);
+ plugin_register_shutdown(PLUGIN_NAME, lv_shutdown);
}
-
-/*
- * vim: shiftwidth=4 tabstop=8 softtabstop=4 expandtab fdm=marker
- */
projects / collectd.git / blobdiff