diff --git a/includes/polling/applications/squid.inc.php b/includes/polling/applications/squid.inc.php index 3c80d91441c7..b2d8a8b7e362 100644 --- a/includes/polling/applications/squid.inc.php +++ b/includes/polling/applications/squid.inc.php @@ -5,7 +5,7 @@ $name = 'squid'; $app_id = $app['app_id']; -+$oids=array( +$oids=array( '.1.3.6.1.4.1.3495.1.2.5.1.0', '.1.3.6.1.4.1.3495.1.2.5.2.0', '.1.3.6.1.4.1.3495.1.2.5.3.0', @@ -89,43 +89,43 @@ $rrd_name = array('app', $name, $app_id); $rrd_def = RrdDefinition::make() - ->addDataset('memmaxsize', 'gauge', 0) - ->addDataset('swapmaxsize', 'gauge', 0) - ->addDataset('swaphighwm', 'gauge', 0) - ->addDataset('swaplowwm', 'gauge', 0) - ->addDataset('syspagefaults', 'counter', 0) - ->addDataset('sysnumreads', 'counter', 0) - ->addDataset('memusage', 'gauge', 0) - ->addDataset('cputime', 'gauge', 0) - ->addDataset('cpuusage', 'gauge', 0) - ->addDataset('maxressize', 'gauge', 0) - ->addDataset('numobjcount', 'gauge', 0) - ->addDataset('curunlinkreq', 'gauge', 0) - ->addDataset('curunusedfdescrcnt', 'gauge', 0) - ->addDataset('curresfiledescrcnt', 'gauge', 0) - ->addDataset('curfiledescrcnt', 'gauge', 0) - ->addDataset('curfiledescrmax', 'gauge', 0) - ->addDataset('protoclienthttpreq', 'counter', 0) - ->addDataset('httphits', 'counter', 0) - ->addDataset('httperrors', 'counter', 0) - ->addDataset('httpinkb', 'counter', 0) - ->addDataset('httpoutkb', 'counter', 0) - ->addDataset('icppktssent', 'counter', 0) - ->addDataset('icppktsrecv', 'counter', 0) - ->addDataset('icpkbsent', 'counter', 0) - ->addDataset('icpkbrecv', 'counter', 0) - ->addDataset('serverrequests', 'counter', 0) - ->addDataset('servererrors', 'counter', 0) - ->addDataset('serverinkb', 'counter', 0) - ->addDataset('serveroutkb', 'counter', 0) - ->addDataset('currentswapsize', 'gauge', 0) - ->addDataset('clients', 'gauge', 0) - ->addDataset('reqhitratio1', 'gauge', 0) - ->addDataset('reqhitratio5', 'gauge', 0) - ->addDataset('reqhitratio60', 'gauge', 0) - ->addDataset('reqbyteratio1', 'gauge', 0) - ->addDataset('reqbyteratio5', 'gauge', 0) - ->addDataset('reqbyteratio60', 'gauge', 0); + ->addDataset('memmaxsize', 'GAUGE', 0) + ->addDataset('swapmaxsize', 'GAUGE', 0) + ->addDataset('swaphighwm', 'GAUGE', 0) + ->addDataset('swaplowwm', 'GAUGE', 0) + ->addDataset('syspagefaults', 'COUNTER', 0) + ->addDataset('sysnumreads', 'COUNTER', 0) + ->addDataset('memusage', 'GAUGE', 0) + ->addDataset('cputime', 'GAUGE', 0) + ->addDataset('cpuusage', 'GAUGE', 0) + ->addDataset('maxressize', 'GAUGE', 0) + ->addDataset('numobjcount', 'GAUGE', 0) + ->addDataset('curunlinkreq', 'GAUGE', 0) + ->addDataset('curunusedfdescrcnt', 'GAUGE', 0) + ->addDataset('curresfiledescrcnt', 'GAUGE', 0) + ->addDataset('curfiledescrcnt', 'GAUGE', 0) + ->addDataset('curfiledescrmax', 'GAUGE', 0) + ->addDataset('protoclienthttpreq', 'COUNTER', 0) + ->addDataset('httphits', 'COUNTER', 0) + ->addDataset('httperrors', 'COUNTER', 0) + ->addDataset('httpinkb', 'COUNTER', 0) + ->addDataset('httpoutkb', 'COUNTER', 0) + ->addDataset('icppktssent', 'COUNTER', 0) + ->addDataset('icppktsrecv', 'COUNTER', 0) + ->addDataset('icpkbsent', 'COUNTER', 0) + ->addDataset('icpkbrecv', 'COUNTER', 0) + ->addDataset('serverrequests', 'COUNTER', 0) + ->addDataset('servererrors', 'COUNTER', 0) + ->addDataset('serverinkb', 'COUNTER', 0) + ->addDataset('serveroutkb', 'COUNTER', 0) + ->addDataset('currentswapsize', 'GAUGE', 0) + ->addDataset('clients', 'GAUGE', 0) + ->addDataset('reqhitratio1', 'GAUGE', 0) + ->addDataset('reqhitratio5', 'GAUGE', 0) + ->addDataset('reqhitratio60', 'GAUGE', 0) + ->addDataset('reqbyteratio1', 'GAUGE', 0) + ->addDataset('reqbyteratio5', 'GAUGE', 0) + ->addDataset('reqbyteratio60', 'GAUGE', 0); $memmaxsize=$memmaxsize*1000; $swapmaxsize=$swapmaxsize*1000;