From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 12 Dec 2014 22:13:15 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.3.2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1318b06b424523d3704fcdfd16d3adb25d17d18;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
	src/libvirt.c
---

c1318b06b424523d3704fcdfd16d3adb25d17d18
diff --cc src/libvirt.c
index cfabaaa2,4ab8bd5c..87b71e69
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@@ -441,8 -306,13 +441,14 @@@ lv_read (void
              continue;
          }
  
+         if (info.state != VIR_DOMAIN_RUNNING)
+         {
+             /* only gather stats for running domains */
+             continue;
+         }
+ 
 -        cpu_submit (info.cpuTime, t, domains[i], "virt_cpu_total");
 +        cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
 +        memory_submit ((gauge_t) info.memory * 1024, domains[i]);
  
          vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
          if (vinfo == NULL) {