Merge pull request #2942 from tuxis-ie/fix_remaining_ceph_graph_bug

This commit is contained in:
Neil Lathwood
2016-02-05 17:56:29 +00:00

View File

@ -17,9 +17,9 @@ foreach ($graphs as $key => $text) {
if ($key == "ceph_poolstats") {
foreach (glob($rrddir."/app-ceph-".$app['app_id']."-pool-*") as $rrd_filename) {
if (preg_match("/.*-pool-(.+)\.rrd$/", $rrd_filename, $pools)) {
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
if (preg_match("/.*-pool-(.+)\.rrd$/", $rrd_filename, $pools)) {
$pool = $pools[1];
echo '<h3>'.$pool.' Reads/Writes</h3>';
$graph_array['type'] = 'application_ceph_pool_io';
@ -29,6 +29,8 @@ foreach ($graphs as $key => $text) {
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
echo '<h3>'.$pool.' IOPS</h3>';
$graph_array['type'] = 'application_ceph_pool_iops';
$graph_array['pool'] = $pool;