X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flibvirt.c;h=c53a81d4b5d1e4261667954b079d26e36a797e07;hb=dff1246579ac6bea70331e560d2e1da0c7429b11;hp=5d9d84b6fa1a124d79fda845b3d0fba8fbbba39e;hpb=853b3da5d4c6614d7db4093f57b1ca4f57b6c485;p=collectd.git diff --git a/src/libvirt.c b/src/libvirt.c index 5d9d84b6..c53a81d4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -91,13 +91,14 @@ struct interface_device { virDomainPtr dom; /* domain */ char *path; /* name of interface device */ char *address; /* mac address of interface device */ + char *number; /* interface device number */ }; static struct interface_device *interface_devices = NULL; static int nr_interface_devices = 0; static void free_interface_devices (void); -static int add_interface_device (virDomainPtr dom, const char *path, const char *address); +static int add_interface_device (virDomainPtr dom, const char *path, const char *address, unsigned int number); /* HostnameFormat. */ #define HF_MAX_FIELDS 3 @@ -115,7 +116,8 @@ static enum hf_field hostname_format[HF_MAX_FIELDS] = /* InterfaceFormat. */ enum if_field { if_address, - if_name + if_name, + if_number }; static enum if_field interface_format = if_name; @@ -138,16 +140,10 @@ init_value_list (value_list_t *vl, virDomainPtr dom) int i, n; const char *name; char uuid[VIR_UUID_STRING_BUFLEN]; - char *host_ptr; - size_t host_len; - - vl->interval = interval_g; sstrncpy (vl->plugin, "libvirt", sizeof (vl->plugin)); vl->host[0] = '\0'; - host_ptr = vl->host; - host_len = sizeof (vl->host); /* Construct the hostname field according to HostnameFormat. */ for (i = 0; i < HF_MAX_FIELDS; ++i) { @@ -190,7 +186,7 @@ cpu_submit (unsigned long long cpu_time, init_value_list (&vl, dom); - values[0].counter = cpu_time; + values[0].derive = cpu_time; vl.values = values; vl.values_len = 1; @@ -201,7 +197,7 @@ cpu_submit (unsigned long long cpu_time, } static void -vcpu_submit (counter_t cpu_time, +vcpu_submit (derive_t cpu_time, virDomainPtr dom, int vcpu_nr, const char *type) { value_t values[1]; @@ -209,7 +205,7 @@ vcpu_submit (counter_t cpu_time, init_value_list (&vl, dom); - values[0].counter = cpu_time; + values[0].derive = cpu_time; vl.values = values; vl.values_len = 1; @@ -220,7 +216,7 @@ vcpu_submit (counter_t cpu_time, } static void -submit_counter2 (const char *type, counter_t v0, counter_t v1, +submit_derive2 (const char *type, derive_t v0, derive_t v1, virDomainPtr dom, const char *devname) { value_t values[2]; @@ -228,8 +224,8 @@ submit_counter2 (const char *type, counter_t v0, counter_t v1, init_value_list (&vl, dom); - values[0].counter = v0; - values[1].counter = v1; + values[0].derive = v0; + values[1].derive = v1; vl.values = values; vl.values_len = 2; @@ -237,7 +233,7 @@ submit_counter2 (const char *type, counter_t v0, counter_t v1, sstrncpy (vl.type_instance, devname, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -} /* void submit_counter2 */ +} /* void submit_derive2 */ static int lv_init (void) @@ -352,6 +348,8 @@ lv_config (const char *key, const char *value) 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 ("unknown InterfaceFormat: %s", value); return -1; @@ -413,22 +411,32 @@ lv_read (void) for (i = 0; i < nr_domains; ++i) { virDomainInfo info; virVcpuInfoPtr vinfo = NULL; + int status; int j; - if (virDomainGetInfo (domains[i], &info) != 0) + status = virDomainGetInfo (domains[i], &info); + if (status != 0) + { + ERROR ("libvirt plugin: virDomainGetInfo failed with status %i.", + status); continue; + } cpu_submit (info.cpuTime, domains[i], "virt_cpu_total"); - vinfo = malloc (info.nrVirtCpu * sizeof vinfo[0]); + vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0])); if (vinfo == NULL) { ERROR ("libvirt plugin: malloc failed."); continue; } - if (virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu, - NULL, 0) != 0) { - sfree (vinfo); + status = virDomainGetVcpus (domains[i], vinfo, info.nrVirtCpu, + /* cpu map = */ NULL, /* cpu map length = */ 0); + if (status < 0) + { + ERROR ("libvirt plugin: virDomainGetVcpus failed with status %i.", + status); + free (vinfo); continue; } @@ -448,23 +456,33 @@ lv_read (void) continue; if ((stats.rd_req != -1) && (stats.wr_req != -1)) - submit_counter2 ("disk_ops", - (counter_t) stats.rd_req, (counter_t) stats.wr_req, + submit_derive2 ("disk_ops", + (derive_t) stats.rd_req, (derive_t) stats.wr_req, block_devices[i].dom, block_devices[i].path); if ((stats.rd_bytes != -1) && (stats.wr_bytes != -1)) - submit_counter2 ("disk_octets", - (counter_t) stats.rd_bytes, (counter_t) stats.wr_bytes, + submit_derive2 ("disk_octets", + (derive_t) stats.rd_bytes, (derive_t) stats.wr_bytes, block_devices[i].dom, block_devices[i].path); } /* for (nr_block_devices) */ /* Get interface stats for each domain. */ for (i = 0; i < nr_interface_devices; ++i) { struct _virDomainInterfaceStats stats; - char *display_name = interface_devices[i].path; - - if (interface_format == if_address) - display_name = interface_devices[i].address; + 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; + } if (virDomainInterfaceStats (interface_devices[i].dom, interface_devices[i].path, @@ -472,23 +490,23 @@ lv_read (void) continue; if ((stats.rx_bytes != -1) && (stats.tx_bytes != -1)) - submit_counter2 ("if_octets", - (counter_t) stats.rx_bytes, (counter_t) stats.tx_bytes, + submit_derive2 ("if_octets", + (derive_t) stats.rx_bytes, (derive_t) stats.tx_bytes, interface_devices[i].dom, display_name); if ((stats.rx_packets != -1) && (stats.tx_packets != -1)) - submit_counter2 ("if_packets", - (counter_t) stats.rx_packets, (counter_t) stats.tx_packets, + submit_derive2 ("if_packets", + (derive_t) stats.rx_packets, (derive_t) stats.tx_packets, interface_devices[i].dom, display_name); if ((stats.rx_errs != -1) && (stats.tx_errs != -1)) - submit_counter2 ("if_errors", - (counter_t) stats.rx_errs, (counter_t) stats.tx_errs, + submit_derive2 ("if_errors", + (derive_t) stats.rx_errs, (derive_t) stats.tx_errs, interface_devices[i].dom, display_name); if ((stats.rx_drop != -1) && (stats.tx_drop != -1)) - submit_counter2 ("if_dropped", - (counter_t) stats.rx_drop, (counter_t) stats.tx_drop, + submit_derive2 ("if_dropped", + (derive_t) stats.rx_drop, (derive_t) stats.tx_drop, interface_devices[i].dom, display_name); } /* for (nr_interface_devices) */ @@ -638,7 +656,7 @@ refresh_lists (void) ignore_device_match (il_interface_devices, name, address) != 0)) goto cont3; - add_interface_device (dom, path, address); + add_interface_device (dom, path, address, j+1); cont3: if (path) xmlFree (path); if (address) xmlFree (address); @@ -739,6 +757,7 @@ free_interface_devices () for (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); } @@ -747,17 +766,22 @@ free_interface_devices () } static int -add_interface_device (virDomainPtr dom, const char *path, const char *address) +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; + char *path_copy, *address_copy, number_string[15]; path_copy = strdup (path); if (!path_copy) return -1; address_copy = strdup (address); - if (!address_copy) return -1; + if (!address_copy) { + sfree(path_copy); + return -1; + } + + snprintf(number_string, sizeof (number_string), "interface-%u", number); if (interface_devices) new_ptr = realloc (interface_devices, new_size); @@ -773,6 +797,7 @@ add_interface_device (virDomainPtr dom, const char *path, const char *address) 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++; } @@ -802,7 +827,7 @@ lv_shutdown (void) free_domains (); if (conn != NULL) - virConnectClose (conn); + virConnectClose (conn); conn = NULL; ignorelist_free (il_domains); @@ -819,8 +844,8 @@ void module_register (void) { plugin_register_config ("libvirt", - lv_config, - config_keys, NR_CONFIG_KEYS); + lv_config, + config_keys, NR_CONFIG_KEYS); plugin_register_init ("libvirt", lv_init); plugin_register_read ("libvirt", lv_read); plugin_register_shutdown ("libvirt", lv_shutdown);