From be225148ca9f4a48e6f07b4c8857c8652b8591dd Mon Sep 17 00:00:00 2001 From: Mark Schouten Date: Fri, 5 Feb 2016 14:50:27 +0100 Subject: [PATCH] There was one more include that screwed up the Ceph graphs --- html/pages/device/apps/ceph.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/html/pages/device/apps/ceph.inc.php b/html/pages/device/apps/ceph.inc.php index 50dedc8c48..9ad7536516 100644 --- a/html/pages/device/apps/ceph.inc.php +++ b/html/pages/device/apps/ceph.inc.php @@ -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) { - $graph_array['to'] = $config['time']['now']; - $graph_array['id'] = $app['app_id']; if (preg_match("/.*-pool-(.+)\.rrd$/", $rrd_filename, $pools)) { + $graph_array['to'] = $config['time']['now']; + $graph_array['id'] = $app['app_id']; $pool = $pools[1]; echo '

'.$pool.' Reads/Writes

'; $graph_array['type'] = 'application_ceph_pool_io'; @@ -29,6 +29,8 @@ foreach ($graphs as $key => $text) { include 'includes/print-graphrow.inc.php'; echo ''; + $graph_array['to'] = $config['time']['now']; + $graph_array['id'] = $app['app_id']; echo '

'.$pool.' IOPS

'; $graph_array['type'] = 'application_ceph_pool_iops'; $graph_array['pool'] = $pool;