mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the ceph_rrd function to includes/common.inc.php

Browse Source
This commit is contained in:
Mark Schouten
2015-11-10 12:33:52 +01:00
parent 669eb872a5
commit 930d9b022d
7 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/includes/graphs/application/ceph_common.inc.php
View File

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

2
html/includes/graphs/application/ceph_osd_performance.inc.php
View File

@@ -1,7 +1,5 @@
<?php
require 'includes/graphs/application/ceph_common.inc.php';
$ds_in = 'apply_ms';
$ds_out = 'commit_ms';

2
html/includes/graphs/application/ceph_pool_df.inc.php
View File

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

2
html/includes/graphs/application/ceph_pool_io.inc.php
View File

@@ -1,7 +1,5 @@
<?php
require 'includes/graphs/application/ceph_common.inc.php';
$ds_in = 'rbytes';
$in_text = 'Read';
$ds_out = 'wrbytes';

1
html/includes/graphs/application/ceph_pool_iops.inc.php
View File

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

1
html/includes/graphs/application/ceph_pool_objects.inc.php
View File

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

21
includes/common.php
View File

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