Permalink
Browse files

Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into …

…testing
  • Loading branch information...
2 parents 415c6a1 + db2e3be commit d2425634b7d3e8b28598f44d49a55fc414ef0d3d Neil Soman committed Apr 11, 2013
Showing with 9 additions and 8 deletions.
  1. +9 −8 tools/getstats.pl
View
@@ -129,12 +129,13 @@
my $stats = $diskstats{$dev_name};
my $dim = $disk->{target}->{dev};
if (defined $stats) {
- print_stat ($dom, $disk_ts, $dim, "DiskReadOps", $stats->{reads_comp});
- print_stat ($dom, $disk_ts, $dim, "DiskWriteOps", $stats->{writes_comp});
- print_stat ($dom, $disk_ts, $dim, "DiskReadBytes", $stats->{sect_read} * $BYTES_PER_SECTOR);
- print_stat ($dom, $disk_ts, $dim, "DiskWriteBytes", $stats->{sect_written} * $BYTES_PER_SECTOR);
- print_stat ($dom, $disk_ts, $dim, "VolumeTotalReadTime", $stats->{mill_read} / $MILLS_PER_SECOND);
- print_stat ($dom, $disk_ts, $dim, "VolumeTotalWriteTime", $stats->{mill_written} / $MILLS_PER_SECOND);
+ print_stat ($dom, $disk_ts, $dim, "summation", "DiskReadOps", $stats->{reads_comp});
+ print_stat ($dom, $disk_ts, $dim, "summation", "DiskWriteOps", $stats->{writes_comp});
+ print_stat ($dom, $disk_ts, $dim, "summation", "DiskReadBytes", $stats->{sect_read} * $BYTES_PER_SECTOR);
+ print_stat ($dom, $disk_ts, $dim, "summation", "DiskWriteBytes", $stats->{sect_written} * $BYTES_PER_SECTOR);
+ print_stat ($dom, $disk_ts, $dim, "summation", "VolumeTotalReadTime", $stats->{mill_read} / $MILLS_PER_SECOND);
+ print_stat ($dom, $disk_ts, $dim, "summation", "VolumeTotalWriteTime", $stats->{mill_written} / $MILLS_PER_SECOND);
+ print_stat ($dom, $disk_ts, $dim, "latest", "VolumeQueueLength", $stats->{ios_progress});
}
}
}
@@ -145,12 +146,12 @@ sub get_ts {
}
sub print_stat {
- my ($dom, $ts, $dimension, $counter, $value) = @_;
+ my ($dom, $ts, $dimension, $type, $counter, $value) = @_;
my $s = "\t"; # separator
print $dom->get_name() . $s
. $ts . $s
. $counter . $s
- . "summation" . $s
+ . $type . $s
. $dimension . $s
. $value . "\n";
}

0 comments on commit d242563

Please sign in to comment.