Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)
Conflicts:
src/libvirt.c

1  2 
src/libvirt.c

diff --cc src/libvirt.c
@@@ -441,8 -306,13 +441,14 @@@ lv_read (void
              continue;
          }
  
 -        cpu_submit (info.cpuTime, t, domains[i], "virt_cpu_total");
+         if (info.state != VIR_DOMAIN_RUNNING)
+         {
+             /* only gather stats for running domains */
+             continue;
+         }
 +        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) {