[pve-devel] [PATCH 1/2] add graphite plugin
Alexandre Derumier
aderumier at odiso.com
Mon Jun 22 18:07:34 CEST 2015
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
PVE/Status/Graphite.pm | 72 +++++++++++++++++++++++++++++++++++++++++++-------
PVE/Status/Plugin.pm | 8 +++---
bin/pvestatd | 8 +++---
3 files changed, 71 insertions(+), 17 deletions(-)
diff --git a/PVE/Status/Graphite.pm b/PVE/Status/Graphite.pm
index cbc1229..cd246f9 100644
--- a/PVE/Status/Graphite.pm
+++ b/PVE/Status/Graphite.pm
@@ -7,6 +7,8 @@ use PVE::Status::Plugin;
# example config (/etc/pve/status.cfg)
#graphite:
# graphiteserver test
+# port 2003
+# path proxmox.mycluster
# disable 0
#
@@ -22,39 +24,91 @@ sub properties {
type => 'string',
description => "External graphite statistic server",
},
+ port => {
+ type => 'string',
+ description => "graphite server port",
+ default => 2003,
+ },
+ path => {
+ type => 'string',
+ description => "root graphite path",
+ default => 'proxmox'
+ },
};
}
sub options {
return {
graphiteserver => {},
+ port => { optional => 1 },
+ path => { optional => 1 },
disable => { optional => 1 },
};
}
# Plugin implementation
sub update_node_status {
- my ($plugin_config, $node, $data) = @_;
+ my ($class, $plugin_config, $node, $data, $ctime) = @_;
+
+ write_graphite_hash($plugin_config, $data, $ctime, "nodes.$node");
- # implement me
}
sub update_qemu_status {
- my ($plugin_config, $vmid, $data) = @_;
-
- # implement me
+ my ($class, $plugin_config, $vmid, $data, $ctime) = @_;
+ write_graphite_hash($plugin_config, $data, $ctime, "qemu.$vmid");
}
sub update_lxc_status {
- my ($plugin_config, $vmid, $data) = @_;
+ my ($class, $plugin_config, $vmid, $data, $ctime) = @_;
- # implement me
+ write_graphite_hash($plugin_config, $data, $ctime, "lxc.$vmid");
}
sub update_storage_status {
- my ($plugin_config, $storeid, $data) = @_;
+ my ($class, $plugin_config, $nodename, $storeid, $data, $ctime) = @_;
+
+ write_graphite_hash($plugin_config, $data, $ctime, "storages.$nodename.$storeid");
+}
+
+sub write_graphite_hash {
+ my ($plugin_config, $d, $ctime, $object) = @_;
+
+ my $host = $plugin_config->{graphiteserver};
+ my $port = $plugin_config->{port} ? $plugin_config->{port} : 2003;
+ my $path = $plugin_config->{path} ? $plugin_config->{path} : 'proxmox';
+
+ my $carbon_socket = IO::Socket::IP->new(
+ PeerAddr => $host,
+ PeerPort => $port,
+ Proto => 'udp',
+ );
+
+ write_graphite($carbon_socket, $d, $ctime, $path.".$object");
+
+ $carbon_socket->close() if $carbon_socket;
+
+}
+
+sub write_graphite {
+ my ($carbon_socket, $d, $ctime, $path) = @_;
+
+ for my $key (keys %$d) {
+
+ my $value = $d->{$key};
+ my $oldpath = $path;
+ $key =~ s/\./-/g;
+ $path .= ".$key";
- # implement me
+ if ( defined $value ) {
+ if ( ref $value eq 'HASH' ) {
+ write_graphite($carbon_socket, $value, $ctime, $path);
+ }else {
+ $carbon_socket->send( "$path $value $ctime" );
+ }
+ }
+ $path = $oldpath;
+ }
}
1;
diff --git a/PVE/Status/Plugin.pm b/PVE/Status/Plugin.pm
index 13d9b3c..699d868 100644
--- a/PVE/Status/Plugin.pm
+++ b/PVE/Status/Plugin.pm
@@ -48,25 +48,25 @@ sub parse_section_header {
}
sub update_node_status {
- my ($plugin_config, $node, $data) = @_;
+ my ($class, $plugin_config, $node, $data, $ctime) = @_;
die "please implement inside plugin";
}
sub update_qemu_status {
- my ($plugin_config, $vmid, $data) = @_;
+ my ($class, $plugin_config, $vmid, $data, $ctime) = @_;
die "please implement inside plugin";
}
sub update_lxc_status {
- my ($plugin_config, $vmid, $data) = @_;
+ my ($class, $plugin_config, $vmid, $data, $ctime) = @_;
die "please implement inside plugin";
}
sub update_storage_status {
- my ($plugin_config, $storeid, $data) = @_;
+ my ($class, $plugin_config, $nodename, $storeid, $data, $ctime) = @_;
die "please implement inside plugin";
}
diff --git a/bin/pvestatd b/bin/pvestatd
index 51bb245..785380c 100755
--- a/bin/pvestatd
+++ b/bin/pvestatd
@@ -119,7 +119,7 @@ sub update_node_status {
next if $plugin_config->{disable};
my $plugin = PVE::Status::Plugin->lookup($plugin_config->{type});
my $d = {}; # fixme: what data?
- $plugin->update_node_status($plugin_config, $nodename, $d);
+ $plugin->update_node_status($plugin_config, $nodename, $d, $ctime);
}
}
@@ -197,7 +197,7 @@ sub update_qemu_status {
my $plugin_config = $status_cfg->{ids}->{$id};
next if $plugin_config->{disable};
my $plugin = PVE::Status::Plugin->lookup($plugin_config->{type});
- $plugin->update_qemu_status($plugin_config, $vmid, $d);
+ $plugin->update_qemu_status($plugin_config, $vmid, $d, $ctime);
}
}
}
@@ -244,7 +244,7 @@ sub update_lxc_status {
my $plugin_config = $status_cfg->{ids}->{$id};
next if $plugin_config->{disable};
my $plugin = PVE::Status::Plugin->lookup($plugin_config->{type});
- $plugin->update_lxc_status($plugin_config, $vmid, $d);
+ $plugin->update_lxc_status($plugin_config, $vmid, $d, $ctime);
}
}
}
@@ -274,7 +274,7 @@ sub update_storage_status {
my $plugin_config = $status_cfg->{ids}->{$id};
next if $plugin_config->{disable};
my $plugin = PVE::Status::Plugin->lookup($plugin_config->{type});
- $plugin->update_storage_status($plugin_config, $storeid, $d);
+ $plugin->update_storage_status($plugin_config, $nodename, $storeid, $d, $ctime);
}
}
}
--
2.1.4
More information about the pve-devel
mailing list