Implement a function to fix the rrd path

This commit is contained in:
Mark Schouten
2015-11-10 11:44:30 +01:00
parent 24550b0c02
commit 669eb872a5
6 changed files with 29 additions and 14 deletions

View File

@@ -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));
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;