From 669eb872a59426ceb660bfcfba838fee55603774 Mon Sep 17 00:00:00 2001
From: Mark Schouten <mark@tuxis.nl>
Date: Tue, 10 Nov 2015 11:44:30 +0100
Subject: [PATCH] Implement a function to fix the rrd path

---
 .../graphs/application/ceph_common.inc.php      | 17 +++++++++++++++++
 .../application/ceph_osd_performance.inc.php    |  6 +++---
 .../graphs/application/ceph_pool_df.inc.php     |  4 ++--
 .../graphs/application/ceph_pool_io.inc.php     |  6 +++---
 .../graphs/application/ceph_pool_iops.inc.php   |  5 ++---
 .../application/ceph_pool_objects.inc.php       |  5 ++---
 6 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 html/includes/graphs/application/ceph_common.inc.php

diff --git a/html/includes/graphs/application/ceph_common.inc.php b/html/includes/graphs/application/ceph_common.inc.php
new file mode 100644
index 000000000..8b996592f
--- /dev/null
+++ b/html/includes/graphs/application/ceph_common.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+function ceph_rrd($gtype) {
+    global $device;
+    global $vars;
+    global $config;
+
+    if ($gtype == "osd") {
+        $var = $vars['osd'];
+    }
+    else {
+        $var = $vars['pool'];
+    }
+
+    $rrd = join('-', array('app', 'ceph', $vars['id'], $gtype, $var)).'.rrd';
+    return join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+}
diff --git a/html/includes/graphs/application/ceph_osd_performance.inc.php b/html/includes/graphs/application/ceph_osd_performance.inc.php
index f089041bc..3d04861df 100644
--- a/html/includes/graphs/application/ceph_osd_performance.inc.php
+++ b/html/includes/graphs/application/ceph_osd_performance.inc.php
@@ -1,14 +1,14 @@
 <?php
 
+require 'includes/graphs/application/ceph_common.inc.php';
+
 $ds_in  = 'apply_ms';
 $ds_out = 'commit_ms';
 
 $in_text = 'Apply';
 $out_text = 'Commit';
 
-$rrd = join('-', array('app', 'ceph', $vars['id'], 'osd', $vars['osd'])).'.rrd';
-
-$ceph_osd_rrd = join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+$ceph_osd_rrd = ceph_rrd('osd');
 
 if (is_file($ceph_osd_rrd)) {
     $rrd_filename = $ceph_osd_rrd;
diff --git a/html/includes/graphs/application/ceph_pool_df.inc.php b/html/includes/graphs/application/ceph_pool_df.inc.php
index efa52e0a9..278b59a98 100644
--- a/html/includes/graphs/application/ceph_pool_df.inc.php
+++ b/html/includes/graphs/application/ceph_pool_df.inc.php
@@ -1,10 +1,10 @@
 <?php
 
 require 'includes/graphs/common.inc.php';
+require 'includes/graphs/application/ceph_common.inc.php';
 
-$rrd = join('-', array('app', 'ceph', $vars['id'], 'df', $vars['pool'])).'.rrd';
 
-$ceph_pool_rrd = join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+$ceph_pool_rrd = ceph_rrd('df');
 
 if (is_file($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
diff --git a/html/includes/graphs/application/ceph_pool_io.inc.php b/html/includes/graphs/application/ceph_pool_io.inc.php
index e278cc9d7..bfff57b03 100644
--- a/html/includes/graphs/application/ceph_pool_io.inc.php
+++ b/html/includes/graphs/application/ceph_pool_io.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+require 'includes/graphs/application/ceph_common.inc.php';
+
 $ds_in  = 'rbytes';
 $in_text = 'Read';
 $ds_out = 'wrbytes';
@@ -7,9 +9,7 @@ $out_text = 'Write';
 
 $format = 'bytes';
 
-$rrd = join('-', array('app', 'ceph', $vars['id'], 'pool', $vars['pool'])).'.rrd';
-
-$ceph_pool_rrd = join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+$ceph_pool_rrd = ceph_rrd('pool');
 
 if (is_file($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
diff --git a/html/includes/graphs/application/ceph_pool_iops.inc.php b/html/includes/graphs/application/ceph_pool_iops.inc.php
index e5bbf18a3..898736b54 100644
--- a/html/includes/graphs/application/ceph_pool_iops.inc.php
+++ b/html/includes/graphs/application/ceph_pool_iops.inc.php
@@ -3,10 +3,9 @@
 $scale_min = 0;
 
 require 'includes/graphs/common.inc.php';
+require 'includes/graphs/application/ceph_common.inc.php';
 
-$rrd = join('-', array('app', 'ceph', $vars['id'], 'pool', $vars['pool'])).'.rrd';
-
-$ceph_pool_rrd = join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+$ceph_pool_rrd = ceph_rrd('pool');
 
 if (is_file($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;
diff --git a/html/includes/graphs/application/ceph_pool_objects.inc.php b/html/includes/graphs/application/ceph_pool_objects.inc.php
index 61272081c..e4b163728 100644
--- a/html/includes/graphs/application/ceph_pool_objects.inc.php
+++ b/html/includes/graphs/application/ceph_pool_objects.inc.php
@@ -3,10 +3,9 @@
 $scale_min = 0;
 
 require 'includes/graphs/common.inc.php';
+require 'includes/graphs/application/ceph_common.inc.php';
 
-$rrd = join('-', array('app', 'ceph', $vars['id'], 'df', $vars['pool'])).'.rrd';
-
-$ceph_pool_rrd = join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
+$ceph_pool_rrd = ceph_rrd('df');
 
 if (is_file($ceph_pool_rrd)) {
     $rrd_filename = $ceph_pool_rrd;