my nagf fork
ActivePublic
Actions

Authored by zhuyifei1999 on Jun 26 2018, 6:01 PM.

Tags

None

Referenced Files

	F22690619: my nagf fork
	Jun 26 2018, 6:01 PM

Subscribers

None

	diff --git a/inc/Nagf.php b/inc/Nagf.php
	index 807241b..2a2174b 100644
	--- a/inc/Nagf.php
	+++ b/inc/Nagf.php
	@@ -26,7 +26,7 @@ class Nagf {
	}

	// NB: Keywords must be compatible with Graphites "from" param (See NagfView::getProjectPage)
	- $ranges = array('day', 'week', 'month', 'year');
	+ $ranges = array('hour', 'day', 'week', 'month', 'year');
	// Filter out invalid ranges and ensure we have at least one of them selected
	$cookieRange = isset($_COOKIE['nagf-range']) ? explode('!', $_COOKIE['nagf-range']) : array();
	$checked = array_intersect($ranges, $cookieRange) ?: array( 'day' );
	@@ -45,6 +45,20 @@ class Nagf {

	protected function getHostGraphsConfig() {
	return array(
	+ 'load' => array(
	+ 'title' => 'Load',
	+ 'targets' => array(
	+ 'alias(color(stacked(HOST.loadavg.01),"#bbbbbb"),"1-min")',
	+ 'alias(color(HOST.cpu.cpu_count,"red"),"CPUs")',
	+ 'alias(color(HOST.loadavg.processes_running,"#2030f4"),"Procs")',
	+ ),
	+ 'overview' => array(
	+ 'alias(color(stacked(sum(HOST.loadavg.01)),"#bbbbbb"),"1-min")',
	+ 'alias(color(sum(HOST.cpu.cpu_count),"red"),"CPUs")',
	+ 'alias(color(sum(offset(scale(HOST.loadavg.01,0),1)),"green"),"Nodes")',
	+ 'alias(color(sum(HOST.loadavg.processes_running),"#2030f4"),"Procs")',
	+ ),
	+ ),
	'cpu' => array(
	'title' => 'CPU',
	'targets' => array(
	@@ -85,12 +99,11 @@ class Nagf {
	'disk' => array(
	'title' => 'Disk space',
	'targets' => array(
	- 'aliasByNode(maximumAbove(HOST.diskspace.*.byte_avail,0),-3,-2)',
	+ 'aliasByNode(maximumBelow(maximumAbove(HOST.diskspace.*.byte_avail,0),1099511627776),-3,-2)',
	),
	'overview' => array(
	- 'alias(stacked(sum(HOST.diskspace.*.byte_avail)),"byte_avail")',
	+ 'alias(sum(maximumBelow(maximumAbove(HOST.diskspace.*.byte_avail,0),1099511627776)),"byte_avail")',
	),
	- 'overview' => 'sum',
	),
	'network-bytes' => array(
	'title' => 'Network bytes',
	diff --git a/inc/NagfView.php b/inc/NagfView.php
	index 75acf4c..e2aa66b 100644
	--- a/inc/NagfView.php
	+++ b/inc/NagfView.php
	@@ -171,6 +171,7 @@ class NagfView {
	'width' => 800,
	'height' => 250,
	'from' => '-1' . $range,
	+ 'until' => '-1minute',
	'hideLegend' => 'false',
	'uniqueLegend' => 'true',
	) + $renderOptions) . $targetQuery)

Event Timeline

zhuyifei1999 created this paste.Jun 26 2018, 6:01 PM

my nagf forkActivePublicActions

Event Timeline

my nagf fork
ActivePublic
Actions