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

feature: Allow customisation of rrd step/heartbeat when creating new rrd files (#5947)

Browse Source 
* feature: Allow customisation of rrd step/heartbeat when creating new rrd files

* revert defaults

* added docs + webui config option

* Move RrdDefinition to an Object to make them easier to create and remove the possibility of typos.

* Fix style/lint issues and missing use statements

* 3 more missing use statements

* updated doc + moved schema file
This commit is contained in:
Neil Lathwood
2017-02-23 22:45:50 +00:00
committed by GitHub
parent 0997172b37
commit fad5aca1b7
110 changed files with 1475 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
includes/polling/applications/apache.inc.php
View File

@@ -1,6 +1,8 @@
<?php
// Polls Apache statistics from script via SNMP
use LibreNMS\RRD\RrdDefinition;
$name = 'apache';
$app_id = $app['app_id'];
if (!empty($agent_data['app'][$name])) {
@@ -19,28 +21,27 @@ list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec,
$score_closing, $score_logging, $score_graceful, $score_idle, $score_open) = explode("\n", $apache);
$rrd_name = array('app', $name, $app_id);
$rrd_def = array(
'DS:access:DERIVE:600:0:125000000000',
'DS:kbyte:DERIVE:600:0:125000000000',
'DS:cpu:GAUGE:600:0:125000000000',
'DS:uptime:GAUGE:600:0:125000000000',
'DS:reqpersec:GAUGE:600:0:125000000000',
'DS:bytespersec:GAUGE:600:0:125000000000',
'DS:byesperreq:GAUGE:600:0:125000000000',
'DS:busyworkers:GAUGE:600:0:125000000000',
'DS:idleworkers:GAUGE:600:0:125000000000',
'DS:sb_wait:GAUGE:600:0:125000000000',
'DS:sb_start:GAUGE:600:0:125000000000',
'DS:sb_reading:GAUGE:600:0:125000000000',
'DS:sb_writing:GAUGE:600:0:125000000000',
'DS:sb_keepalive:GAUGE:600:0:125000000000',
'DS:sb_dns:GAUGE:600:0:125000000000',
'DS:sb_closing:GAUGE:600:0:125000000000',
'DS:sb_logging:GAUGE:600:0:125000000000',
'DS:sb_graceful:GAUGE:600:0:125000000000',
'DS:sb_idle:GAUGE:600:0:125000000000',
'DS:sb_open:GAUGE:600:0:125000000000'
);
$rrd_def = RrdDefinition::make()
->addDataset('access', 'DERIVE', 0, 125000000000)
->addDataset('kbyte', 'DERIVE', 0, 125000000000)
->addDataset('cpu', 'GAUGE', 0, 125000000000)
->addDataset('uptime', 'GAUGE', 0, 125000000000)
->addDataset('reqpersec', 'GAUGE', 0, 125000000000)
->addDataset('bytespersec', 'GAUGE', 0, 125000000000)
->addDataset('byesperreq', 'GAUGE', 0, 125000000000)
->addDataset('busyworkers', 'GAUGE', 0, 125000000000)
->addDataset('idleworkers', 'GAUGE', 0, 125000000000)
->addDataset('sb_wait', 'GAUGE', 0, 125000000000)
->addDataset('sb_start', 'GAUGE', 0, 125000000000)
->addDataset('sb_reading', 'GAUGE', 0, 125000000000)
->addDataset('sb_writing', 'GAUGE', 0, 125000000000)
->addDataset('sb_keepalive', 'GAUGE', 0, 125000000000)
->addDataset('sb_dns', 'GAUGE', 0, 125000000000)
->addDataset('sb_closing', 'GAUGE', 0, 125000000000)
->addDataset('sb_logging', 'GAUGE', 0, 125000000000)
->addDataset('sb_graceful', 'GAUGE', 0, 125000000000)
->addDataset('sb_idle', 'GAUGE', 0, 125000000000)
->addDataset('sb_open', 'GAUGE', 0, 125000000000);
$fields = array(
'access' => intval(trim($total_access, '"')),