From 930d9b022d2cb59c6b35cad9211ad9d03840d219 Mon Sep 17 00:00:00 2001
From: Mark Schouten <mark@tuxis.nl>
Date: Tue, 10 Nov 2015 12:33:52 +0100
Subject: [PATCH] Move the ceph_rrd function to includes/common.inc.php

---
 .../graphs/application/ceph_common.inc.php    | 17 ---------------
 .../application/ceph_osd_performance.inc.php  |  2 --
 .../graphs/application/ceph_pool_df.inc.php   |  2 --
 .../graphs/application/ceph_pool_io.inc.php   |  2 --
 .../graphs/application/ceph_pool_iops.inc.php |  1 -
 .../application/ceph_pool_objects.inc.php     |  1 -
 includes/common.php                           | 21 +++++++++++++++++++
 7 files changed, 21 insertions(+), 25 deletions(-)
 delete 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
deleted file mode 100644
index 8b996592f..000000000
--- a/html/includes/graphs/application/ceph_common.inc.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 3d04861df..58381a978 100644
--- a/html/includes/graphs/application/ceph_osd_performance.inc.php
+++ b/html/includes/graphs/application/ceph_osd_performance.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-require 'includes/graphs/application/ceph_common.inc.php';
-
 $ds_in  = 'apply_ms';
 $ds_out = 'commit_ms';
 
diff --git a/html/includes/graphs/application/ceph_pool_df.inc.php b/html/includes/graphs/application/ceph_pool_df.inc.php
index 278b59a98..4dbca1695 100644
--- a/html/includes/graphs/application/ceph_pool_df.inc.php
+++ b/html/includes/graphs/application/ceph_pool_df.inc.php
@@ -1,8 +1,6 @@
 <?php
 
 require 'includes/graphs/common.inc.php';
-require 'includes/graphs/application/ceph_common.inc.php';
-
 
 $ceph_pool_rrd = ceph_rrd('df');
 
diff --git a/html/includes/graphs/application/ceph_pool_io.inc.php b/html/includes/graphs/application/ceph_pool_io.inc.php
index bfff57b03..8b0985664 100644
--- a/html/includes/graphs/application/ceph_pool_io.inc.php
+++ b/html/includes/graphs/application/ceph_pool_io.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-require 'includes/graphs/application/ceph_common.inc.php';
-
 $ds_in  = 'rbytes';
 $in_text = 'Read';
 $ds_out = 'wrbytes';
diff --git a/html/includes/graphs/application/ceph_pool_iops.inc.php b/html/includes/graphs/application/ceph_pool_iops.inc.php
index 898736b54..4ed81d367 100644
--- a/html/includes/graphs/application/ceph_pool_iops.inc.php
+++ b/html/includes/graphs/application/ceph_pool_iops.inc.php
@@ -3,7 +3,6 @@
 $scale_min = 0;
 
 require 'includes/graphs/common.inc.php';
-require 'includes/graphs/application/ceph_common.inc.php';
 
 $ceph_pool_rrd = ceph_rrd('pool');
 
diff --git a/html/includes/graphs/application/ceph_pool_objects.inc.php b/html/includes/graphs/application/ceph_pool_objects.inc.php
index e4b163728..c4f138941 100644
--- a/html/includes/graphs/application/ceph_pool_objects.inc.php
+++ b/html/includes/graphs/application/ceph_pool_objects.inc.php
@@ -3,7 +3,6 @@
 $scale_min = 0;
 
 require 'includes/graphs/common.inc.php';
-require 'includes/graphs/application/ceph_common.inc.php';
 
 $ceph_pool_rrd = ceph_rrd('df');
 
diff --git a/includes/common.php b/includes/common.php
index 248285600..2f7a7aedc 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -774,3 +774,24 @@ function can_ping_device($attribs) {
         return false;
     }
 } // end can_ping_device
+
+/**
+ * Constructs the path to an RRD for the Ceph application
+ * @param string $gtype The type of rrd we're looking for
+ * @return string
+**/
+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));
+}