Merge branch 'collectd-4.10' into collectd-5.3

[collectd.git] / bindings / perl / lib / Collectd / Plugins / OpenVZ.pm

diff --git a/bindings/perl/lib/Collectd/Plugins/OpenVZ.pm b/bindings/perl/lib/Collectd/Plugins/OpenVZ.pm
index 52754d1..ea3cee9 100644 (file)
--- a/bindings/perl/lib/Collectd/Plugins/OpenVZ.pm
+++ b/bindings/perl/lib/Collectd/Plugins/OpenVZ.pm
@@ -36,7 +36,7 @@ my $last_stat = {};
 
 sub openvz_read
 {
-    my %v = (time => time(), interval => $interval_g);
+    my %v = (time => time(), interval => plugin_get_interval());
     my (@veids, $veid, $name, $key, $val, $i, @lines, @parts, @counters);
 
     @veids = map { s/ //g; $_; } split(/\n/, `$vzlist -Ho veid`);
@@ -69,7 +69,7 @@ sub openvz_read
             {
                 $v{'type'} = $if_instances[$key];
                 $v{'values'} = [ $counters[$key], $counters[$key + 8] ];
-                plugin_dispatch_values($if_instances[$key], \%v);
+                plugin_dispatch_values(\%v);
             }
         }
 
@@ -105,7 +105,7 @@ sub openvz_read
             {
                 $v{'type_instance'} = $cpu_instances[$key];
                 $v{'values'} = [ $counters[$key] ];
-                plugin_dispatch_values('cpu', \%v);
+                plugin_dispatch_values(\%v);
             }
         }
 
@@ -129,7 +129,7 @@ sub openvz_read
 
             $v{'type_instance'} = $val;
             $v{'values'} = [ $parts[5] * ($parts[6] - $parts[7]), $parts[5] * $parts[7] ];
-            plugin_dispatch_values('df', \%v);
+            plugin_dispatch_values(\%v);
         }
 
         #####################################################################
@@ -142,7 +142,7 @@ sub openvz_read
 
         @parts = split(/ +/, `$vzctl exec $veid cat /proc/loadavg`);
         $v{'values'} = [ $parts[0], $parts[1], $parts[2] ];
-        plugin_dispatch_values('load', \%v);
+        plugin_dispatch_values(\%v);
 
         #####################################################################
         # processes
@@ -166,7 +166,7 @@ sub openvz_read
         {
             $v{'type_instance'} = $key;
             $v{'values'} = [ $ps_states->{$key} ];
-            plugin_dispatch_values('ps_state', \%v);
+            plugin_dispatch_values(\%v);
         }
 
         #####################################################################
@@ -179,7 +179,7 @@ sub openvz_read
 
         @lines = split(/\n/, `$vzctl exec $veid w -h`);
         $v{'values'} = [ scalar(@lines) ];
-        plugin_dispatch_values('users', \%v);
+        plugin_dispatch_values(\%v);
     }
 
     return 1;