From 7d95e949548aa644c13ed445b0b17464f906a395 Mon Sep 17 00:00:00 2001 From: f0o Date: Mon, 28 Sep 2015 08:24:57 +0000 Subject: [PATCH 1/2] Fix rrd creation parameters --- includes/polling/applications/apache.inc.php | 40 ++--- includes/polling/applications/bind.inc.php | 20 +-- includes/polling/applications/drbd.inc.php | 22 +-- .../polling/applications/mailscanner.inc.php | 14 +- .../polling/applications/memcached.inc.php | 38 ++--- includes/polling/applications/mysql.inc.php | 158 +++++++++--------- includes/polling/applications/nginx.inc.php | 10 +- .../polling/applications/ntp-client.inc.php | 10 +- .../polling/applications/ntpd-server.inc.php | 28 ++-- .../polling/applications/powerdns.inc.php | 44 ++--- includes/polling/applications/proxmox.inc.php | 4 +- .../polling/applications/shoutcast.inc.php | 16 +- includes/polling/applications/tinydns.inc.php | 40 ++--- includes/polling/bgp-peers.inc.php | 16 +- includes/polling/cisco-cef.inc.php | 6 +- includes/polling/cisco-mac-accounting.inc.php | 6 +- includes/polling/cisco-sla.inc.php | 2 +- includes/polling/entity-physical.inc.php | 10 +- includes/polling/functions.inc.php | 2 +- includes/polling/hr-mib.inc.php | 4 +- includes/polling/ipmi.inc.php | 2 +- includes/polling/junose-atm-vp.inc.php | 18 +- includes/polling/os/procurve.inc.php | 2 +- includes/polling/os/screenos.inc.php | 6 +- includes/polling/os/snom.inc.php | 10 +- includes/polling/ospf.inc.php | 8 +- includes/polling/ports.inc.php | 30 ++-- includes/polling/processors.inc.php | 2 +- includes/polling/toner.inc.php | 2 +- includes/polling/ucd-diskio.inc.php | 8 +- includes/polling/ucd-mib.inc.php | 24 +-- includes/polling/wifi.inc.php | 4 +- includes/rrdtool.inc.php | 2 +- 33 files changed, 304 insertions(+), 304 deletions(-) diff --git a/includes/polling/applications/apache.inc.php b/includes/polling/applications/apache.inc.php index e9cbe782db..3c75d38cd7 100644 --- a/includes/polling/applications/apache.inc.php +++ b/includes/polling/applications/apache.inc.php @@ -22,26 +22,26 @@ list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec, if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - 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 \ + '--step 300 + 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 '.$config['rrd_rra'] ); }//end if diff --git a/includes/polling/applications/bind.inc.php b/includes/polling/applications/bind.inc.php index b56d1425fb..8e89e7c493 100644 --- a/includes/polling/applications/bind.inc.php +++ b/includes/polling/applications/bind.inc.php @@ -72,16 +72,16 @@ if (!empty($agent_data['app']['bind']) && $app['app_id'] > 0) { if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:any:COUNTER:600:0:125000000000 \ - DS:a:COUNTER:600:0:125000000000 \ - DS:aaaa:COUNTER:600:0:125000000000 \ - DS:cname:COUNTER:600:0:125000000000 \ - DS:mx:COUNTER:600:0:125000000000 \ - DS:ns:COUNTER:600:0:125000000000 \ - DS:ptr:COUNTER:600:0:125000000000 \ - DS:soa:COUNTER:600:0:125000000000 \ - DS:srv:COUNTER:600:0:125000000000 \ + '--step 300 + DS:any:COUNTER:600:0:125000000000 + DS:a:COUNTER:600:0:125000000000 + DS:aaaa:COUNTER:600:0:125000000000 + DS:cname:COUNTER:600:0:125000000000 + DS:mx:COUNTER:600:0:125000000000 + DS:ns:COUNTER:600:0:125000000000 + DS:ptr:COUNTER:600:0:125000000000 + DS:soa:COUNTER:600:0:125000000000 + DS:srv:COUNTER:600:0:125000000000 DS:spf:COUNTER:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/drbd.inc.php b/includes/polling/applications/drbd.inc.php index 4e2eea8538..8e3b8e4781 100644 --- a/includes/polling/applications/drbd.inc.php +++ b/includes/polling/applications/drbd.inc.php @@ -12,17 +12,17 @@ foreach (explode('|', $agent_data['app']['drbd'][$app['app_instance']]) as $part if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:ns:DERIVE:600:0:125000000000 \ - DS:nr:DERIVE:600:0:125000000000 \ - DS:dw:DERIVE:600:0:125000000000 \ - DS:dr:DERIVE:600:0:125000000000 \ - DS:al:DERIVE:600:0:125000000000 \ - DS:bm:DERIVE:600:0:125000000000 \ - DS:lo:GAUGE:600:0:125000000000 \ - DS:pe:GAUGE:600:0:125000000000 \ - DS:ua:GAUGE:600:0:125000000000 \ - DS:ap:GAUGE:600:0:125000000000 \ + '--step 300 + DS:ns:DERIVE:600:0:125000000000 + DS:nr:DERIVE:600:0:125000000000 + DS:dw:DERIVE:600:0:125000000000 + DS:dr:DERIVE:600:0:125000000000 + DS:al:DERIVE:600:0:125000000000 + DS:bm:DERIVE:600:0:125000000000 + DS:lo:GAUGE:600:0:125000000000 + DS:pe:GAUGE:600:0:125000000000 + DS:ua:GAUGE:600:0:125000000000 + DS:ap:GAUGE:600:0:125000000000 DS:oos:GAUGE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/mailscanner.inc.php b/includes/polling/applications/mailscanner.inc.php index 86c4dee0a1..8b9a1efd27 100644 --- a/includes/polling/applications/mailscanner.inc.php +++ b/includes/polling/applications/mailscanner.inc.php @@ -14,13 +14,13 @@ list ($msg_recv, $msg_rejected, $msg_relay, $msg_sent, $msg_waiting, $spam, $vir if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:msg_recv:COUNTER:600:0:125000000000 \ - DS:msg_rejected:COUNTER:600:0:125000000000 \ - DS:msg_relay:COUNTER:600:0:125000000000 \ - DS:msg_sent:COUNTER:600:0:125000000000 \ - DS:msg_waiting:COUNTER:600:0:125000000000 \ - DS:spam:COUNTER:600:0:125000000000 \ + '--step 300 + DS:msg_recv:COUNTER:600:0:125000000000 + DS:msg_rejected:COUNTER:600:0:125000000000 + DS:msg_relay:COUNTER:600:0:125000000000 + DS:msg_sent:COUNTER:600:0:125000000000 + DS:msg_waiting:COUNTER:600:0:125000000000 + DS:spam:COUNTER:600:0:125000000000 DS:virus:COUNTER:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/memcached.inc.php b/includes/polling/applications/memcached.inc.php index fd56ffe7d1..27bf684007 100644 --- a/includes/polling/applications/memcached.inc.php +++ b/includes/polling/applications/memcached.inc.php @@ -9,25 +9,25 @@ echo 'memcached('.$app['app_instance'].') '; if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:uptime:GAUGE:600:0:125000000000 \ - DS:threads:GAUGE:600:0:125000000000 \ - DS:rusage_user_ms:DERIVE:600:0:125000000000 \ - DS:rusage_system_ms:DERIVE:600:0:125000000000 \ - DS:curr_items:GAUGE:600:0:125000000000 \ - DS:total_items:DERIVE:600:0:125000000000 \ - DS:limit_maxbytes:GAUGE:600:0:125000000000 \ - DS:curr_connections:GAUGE:600:0:125000000000 \ - DS:total_connections:DERIVE:600:0:125000000000 \ - DS:conn_structures:GAUGE:600:0:125000000000 \ - DS:bytes:GAUGE:600:0:125000000000 \ - DS:cmd_get:DERIVE:600:0:125000000000 \ - DS:cmd_set:DERIVE:600:0:125000000000 \ - DS:get_hits:DERIVE:600:0:125000000000 \ - DS:get_misses:DERIVE:600:0:125000000000 \ - DS:evictions:DERIVE:600:0:125000000000 \ - DS:bytes_read:DERIVE:600:0:125000000000 \ - DS:bytes_written:DERIVE:600:0:125000000000 \ + '--step 300 + DS:uptime:GAUGE:600:0:125000000000 + DS:threads:GAUGE:600:0:125000000000 + DS:rusage_user_ms:DERIVE:600:0:125000000000 + DS:rusage_system_ms:DERIVE:600:0:125000000000 + DS:curr_items:GAUGE:600:0:125000000000 + DS:total_items:DERIVE:600:0:125000000000 + DS:limit_maxbytes:GAUGE:600:0:125000000000 + DS:curr_connections:GAUGE:600:0:125000000000 + DS:total_connections:DERIVE:600:0:125000000000 + DS:conn_structures:GAUGE:600:0:125000000000 + DS:bytes:GAUGE:600:0:125000000000 + DS:cmd_get:DERIVE:600:0:125000000000 + DS:cmd_set:DERIVE:600:0:125000000000 + DS:get_hits:DERIVE:600:0:125000000000 + DS:get_misses:DERIVE:600:0:125000000000 + DS:evictions:DERIVE:600:0:125000000000 + DS:bytes_read:DERIVE:600:0:125000000000 + DS:bytes_written:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/mysql.inc.php b/includes/polling/applications/mysql.inc.php index fa78ccb1dd..78310711d4 100644 --- a/includes/polling/applications/mysql.inc.php +++ b/includes/polling/applications/mysql.inc.php @@ -118,85 +118,85 @@ $string = implode(':', $values); if (!is_file($mysql_rrd)) { rrdtool_create( $mysql_rrd, - '--step 300 \ - DS:IDBLBSe:GAUGE:600:0:125000000000 \ - DS:IBLFh:DERIVE:600:0:125000000000 \ - DS:IBLWn:DERIVE:600:0:125000000000 \ - DS:SRows:DERIVE:600:0:125000000000 \ - DS:SRange:DERIVE:600:0:125000000000 \ - DS:SMPs:DERIVE:600:0:125000000000 \ - DS:SScan:DERIVE:600:0:125000000000 \ - DS:IBIRd:DERIVE:600:0:125000000000 \ - DS:IBIWr:DERIVE:600:0:125000000000 \ - DS:IBILg:DERIVE:600:0:125000000000 \ - DS:IBIFSc:DERIVE:600:0:125000000000 \ - DS:IDBRDd:DERIVE:600:0:125000000000 \ - DS:IDBRId:DERIVE:600:0:125000000000 \ - DS:IDBRRd:DERIVE:600:0:125000000000 \ - DS:IDBRUd:DERIVE:600:0:125000000000 \ - DS:IBRd:DERIVE:600:0:125000000000 \ - DS:IBCd:DERIVE:600:0:125000000000 \ - DS:IBWr:DERIVE:600:0:125000000000 \ - DS:TLIe:DERIVE:600:0:125000000000 \ - DS:TLWd:DERIVE:600:0:125000000000 \ - DS:IBPse:GAUGE:600:0:125000000000 \ - DS:IBPDBp:GAUGE:600:0:125000000000 \ - DS:IBPFe:GAUGE:600:0:125000000000 \ - DS:IBPMps:GAUGE:600:0:125000000000 \ - DS:TOC:GAUGE:600:0:125000000000 \ - DS:OFs:GAUGE:600:0:125000000000 \ - DS:OTs:GAUGE:600:0:125000000000 \ - DS:OdTs:COUNTER:600:0:125000000000 \ - DS:IBSRs:DERIVE:600:0:125000000000 \ - DS:IBSWs:DERIVE:600:0:125000000000 \ - DS:IBOWs:DERIVE:600:0:125000000000 \ - DS:QCs:GAUGE:600:0:125000000000 \ - DS:QCeFy:GAUGE:600:0:125000000000 \ - DS:MaCs:GAUGE:600:0:125000000000 \ - DS:MUCs:GAUGE:600:0:125000000000 \ - DS:ACs:DERIVE:600:0:125000000000 \ - DS:AdCs:DERIVE:600:0:125000000000 \ - DS:TCd:GAUGE:600:0:125000000000 \ - DS:Cs:DERIVE:600:0:125000000000 \ - DS:IBTNx:DERIVE:600:0:125000000000 \ - DS:KRRs:DERIVE:600:0:125000000000 \ - DS:KRs:DERIVE:600:0:125000000000 \ - DS:KWR:DERIVE:600:0:125000000000 \ - DS:KWs:DERIVE:600:0:125000000000 \ - DS:QCQICe:DERIVE:600:0:125000000000 \ - DS:QCHs:DERIVE:600:0:125000000000 \ - DS:QCIs:DERIVE:600:0:125000000000 \ - DS:QCNCd:DERIVE:600:0:125000000000 \ - DS:QCLMPs:DERIVE:600:0:125000000000 \ - DS:CTMPDTs:DERIVE:600:0:125000000000 \ - DS:CTMPTs:DERIVE:600:0:125000000000 \ - DS:CTMPFs:DERIVE:600:0:125000000000 \ - DS:IBIIs:DERIVE:600:0:125000000000 \ - DS:IBIMRd:DERIVE:600:0:125000000000 \ - DS:IBIMs:DERIVE:600:0:125000000000 \ - DS:IBILog:DERIVE:602:0:125000000000 \ - DS:IBISc:DERIVE:602:0:125000000000 \ - DS:IBIFLg:DERIVE:600:0:125000000000 \ - DS:IBFBl:DERIVE:600:0:125000000000 \ - DS:IBIIAo:DERIVE:600:0:125000000000 \ - DS:IBIAd:DERIVE:600:0:125000000000 \ - DS:IBIAe:DERIVE:600:0:125000000000 \ - DS:SFJn:DERIVE:600:0:125000000000 \ - DS:SFRJn:DERIVE:600:0:125000000000 \ - DS:SRe:DERIVE:600:0:125000000000 \ - DS:SRCk:DERIVE:600:0:125000000000 \ - DS:SSn:DERIVE:600:0:125000000000 \ - DS:SQs:DERIVE:600:0:125000000000 \ - DS:BRd:DERIVE:600:0:125000000000 \ - DS:BSt:DERIVE:600:0:125000000000 \ - DS:CDe:DERIVE:600:0:125000000000 \ - DS:CIt:DERIVE:600:0:125000000000 \ - DS:CISt:DERIVE:600:0:125000000000 \ - DS:CLd:DERIVE:600:0:125000000000 \ - DS:CRe:DERIVE:600:0:125000000000 \ - DS:CRSt:DERIVE:600:0:125000000000 \ - DS:CSt:DERIVE:600:0:125000000000 \ - DS:CUe:DERIVE:600:0:125000000000 \ + '--step 300 + DS:IDBLBSe:GAUGE:600:0:125000000000 + DS:IBLFh:DERIVE:600:0:125000000000 + DS:IBLWn:DERIVE:600:0:125000000000 + DS:SRows:DERIVE:600:0:125000000000 + DS:SRange:DERIVE:600:0:125000000000 + DS:SMPs:DERIVE:600:0:125000000000 + DS:SScan:DERIVE:600:0:125000000000 + DS:IBIRd:DERIVE:600:0:125000000000 + DS:IBIWr:DERIVE:600:0:125000000000 + DS:IBILg:DERIVE:600:0:125000000000 + DS:IBIFSc:DERIVE:600:0:125000000000 + DS:IDBRDd:DERIVE:600:0:125000000000 + DS:IDBRId:DERIVE:600:0:125000000000 + DS:IDBRRd:DERIVE:600:0:125000000000 + DS:IDBRUd:DERIVE:600:0:125000000000 + DS:IBRd:DERIVE:600:0:125000000000 + DS:IBCd:DERIVE:600:0:125000000000 + DS:IBWr:DERIVE:600:0:125000000000 + DS:TLIe:DERIVE:600:0:125000000000 + DS:TLWd:DERIVE:600:0:125000000000 + DS:IBPse:GAUGE:600:0:125000000000 + DS:IBPDBp:GAUGE:600:0:125000000000 + DS:IBPFe:GAUGE:600:0:125000000000 + DS:IBPMps:GAUGE:600:0:125000000000 + DS:TOC:GAUGE:600:0:125000000000 + DS:OFs:GAUGE:600:0:125000000000 + DS:OTs:GAUGE:600:0:125000000000 + DS:OdTs:COUNTER:600:0:125000000000 + DS:IBSRs:DERIVE:600:0:125000000000 + DS:IBSWs:DERIVE:600:0:125000000000 + DS:IBOWs:DERIVE:600:0:125000000000 + DS:QCs:GAUGE:600:0:125000000000 + DS:QCeFy:GAUGE:600:0:125000000000 + DS:MaCs:GAUGE:600:0:125000000000 + DS:MUCs:GAUGE:600:0:125000000000 + DS:ACs:DERIVE:600:0:125000000000 + DS:AdCs:DERIVE:600:0:125000000000 + DS:TCd:GAUGE:600:0:125000000000 + DS:Cs:DERIVE:600:0:125000000000 + DS:IBTNx:DERIVE:600:0:125000000000 + DS:KRRs:DERIVE:600:0:125000000000 + DS:KRs:DERIVE:600:0:125000000000 + DS:KWR:DERIVE:600:0:125000000000 + DS:KWs:DERIVE:600:0:125000000000 + DS:QCQICe:DERIVE:600:0:125000000000 + DS:QCHs:DERIVE:600:0:125000000000 + DS:QCIs:DERIVE:600:0:125000000000 + DS:QCNCd:DERIVE:600:0:125000000000 + DS:QCLMPs:DERIVE:600:0:125000000000 + DS:CTMPDTs:DERIVE:600:0:125000000000 + DS:CTMPTs:DERIVE:600:0:125000000000 + DS:CTMPFs:DERIVE:600:0:125000000000 + DS:IBIIs:DERIVE:600:0:125000000000 + DS:IBIMRd:DERIVE:600:0:125000000000 + DS:IBIMs:DERIVE:600:0:125000000000 + DS:IBILog:DERIVE:602:0:125000000000 + DS:IBISc:DERIVE:602:0:125000000000 + DS:IBIFLg:DERIVE:600:0:125000000000 + DS:IBFBl:DERIVE:600:0:125000000000 + DS:IBIIAo:DERIVE:600:0:125000000000 + DS:IBIAd:DERIVE:600:0:125000000000 + DS:IBIAe:DERIVE:600:0:125000000000 + DS:SFJn:DERIVE:600:0:125000000000 + DS:SFRJn:DERIVE:600:0:125000000000 + DS:SRe:DERIVE:600:0:125000000000 + DS:SRCk:DERIVE:600:0:125000000000 + DS:SSn:DERIVE:600:0:125000000000 + DS:SQs:DERIVE:600:0:125000000000 + DS:BRd:DERIVE:600:0:125000000000 + DS:BSt:DERIVE:600:0:125000000000 + DS:CDe:DERIVE:600:0:125000000000 + DS:CIt:DERIVE:600:0:125000000000 + DS:CISt:DERIVE:600:0:125000000000 + DS:CLd:DERIVE:600:0:125000000000 + DS:CRe:DERIVE:600:0:125000000000 + DS:CRSt:DERIVE:600:0:125000000000 + DS:CSt:DERIVE:600:0:125000000000 + DS:CUe:DERIVE:600:0:125000000000 DS:CUMi:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); }//end if diff --git a/includes/polling/applications/nginx.inc.php b/includes/polling/applications/nginx.inc.php index 7426641fb0..81fb4a847c 100644 --- a/includes/polling/applications/nginx.inc.php +++ b/includes/polling/applications/nginx.inc.php @@ -16,11 +16,11 @@ list($active, $reading, $writing, $waiting, $req) = explode("\n", $nginx); if (!is_file($nginx_rrd)) { rrdtool_create( $nginx_rrd, - '--step 300 \ - DS:Requests:DERIVE:600:0:125000000000 \ - DS:Active:GAUGE:600:0:125000000000 \ - DS:Reading:GAUGE:600:0:125000000000 \ - DS:Writing:GAUGE:600:0:125000000000 \ + '--step 300 + DS:Requests:DERIVE:600:0:125000000000 + DS:Active:GAUGE:600:0:125000000000 + DS:Reading:GAUGE:600:0:125000000000 + DS:Writing:GAUGE:600:0:125000000000 DS:Waiting:GAUGE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/ntp-client.inc.php b/includes/polling/applications/ntp-client.inc.php index 9210864914..00178e248b 100644 --- a/includes/polling/applications/ntp-client.inc.php +++ b/includes/polling/applications/ntp-client.inc.php @@ -14,11 +14,11 @@ list ($offset, $frequency, $jitter, $noise, $stability) = explode("\n", $ntpclie if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:offset:GAUGE:600:-1000:1000 \ - DS:frequency:GAUGE:600:-1000:1000 \ - DS:jitter:GAUGE:600:-1000:1000 \ - DS:noise:GAUGE:600:-1000:1000 \ + '--step 300 + DS:offset:GAUGE:600:-1000:1000 + DS:frequency:GAUGE:600:-1000:1000 + DS:jitter:GAUGE:600:-1000:1000 + DS:noise:GAUGE:600:-1000:1000 DS:stability:GAUGE:600:-1000:1000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/ntpd-server.inc.php b/includes/polling/applications/ntpd-server.inc.php index b338c7bca0..f6267ce16b 100644 --- a/includes/polling/applications/ntpd-server.inc.php +++ b/includes/polling/applications/ntpd-server.inc.php @@ -16,20 +16,20 @@ list ($stratum, $offset, $frequency, $jitter, $noise, $stability, $uptime, if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:stratum:GAUGE:600:-1000:1000 \ - DS:offset:GAUGE:600:-1000:1000 \ - DS:frequency:GAUGE:600:-1000:1000 \ - DS:jitter:GAUGE:600:-1000:1000 \ - DS:noise:GAUGE:600:-1000:1000 \ - DS:stability:GAUGE:600:-1000:1000 \ - DS:uptime:GAUGE:600:0:125000000000 \ - DS:buffer_recv:GAUGE:600:0:100000 \ - DS:buffer_free:GAUGE:600:0:100000 \ - DS:buffer_used:GAUGE:600:0:100000 \ - DS:packets_drop:DERIVE:600:0:125000000000 \ - DS:packets_ignore:DERIVE:600:0:125000000000 \ - DS:packets_recv:DERIVE:600:0:125000000000 \ + '--step 300 + DS:stratum:GAUGE:600:-1000:1000 + DS:offset:GAUGE:600:-1000:1000 + DS:frequency:GAUGE:600:-1000:1000 + DS:jitter:GAUGE:600:-1000:1000 + DS:noise:GAUGE:600:-1000:1000 + DS:stability:GAUGE:600:-1000:1000 + DS:uptime:GAUGE:600:0:125000000000 + DS:buffer_recv:GAUGE:600:0:100000 + DS:buffer_free:GAUGE:600:0:100000 + DS:buffer_used:GAUGE:600:0:100000 + DS:packets_drop:DERIVE:600:0:125000000000 + DS:packets_ignore:DERIVE:600:0:125000000000 + DS:packets_recv:DERIVE:600:0:125000000000 DS:packets_sent:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/powerdns.inc.php b/includes/polling/applications/powerdns.inc.php index e37acbf5ed..94e0076fbd 100644 --- a/includes/polling/applications/powerdns.inc.php +++ b/includes/polling/applications/powerdns.inc.php @@ -18,28 +18,28 @@ list ($corrupt, $def_cacheInserts, $def_cacheLookup, $latency, $pc_hit, if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:corruptPackets:DERIVE:600:0:125000000000 \ - DS:def_cacheInserts:DERIVE:600:0:125000000000 \ - DS:def_cacheLookup:DERIVE:600:0:125000000000 \ - DS:latency:DERIVE:600:0:125000000000 \ - DS:pc_hit:DERIVE:600:0:125000000000 \ - DS:pc_miss:DERIVE:600:0:125000000000 \ - DS:pc_size:DERIVE:600:0:125000000000 \ - DS:qsize:DERIVE:600:0:125000000000 \ - DS:qc_hit:DERIVE:600:0:125000000000 \ - DS:qc_miss:DERIVE:600:0:125000000000 \ - DS:rec_answers:DERIVE:600:0:125000000000 \ - DS:rec_questions:DERIVE:600:0:125000000000 \ - DS:servfailPackets:DERIVE:600:0:125000000000 \ - DS:q_tcpAnswers:DERIVE:600:0:125000000000 \ - DS:q_tcpQueries:DERIVE:600:0:125000000000 \ - DS:q_timedout:DERIVE:600:0:125000000000 \ - DS:q_udpAnswers:DERIVE:600:0:125000000000 \ - DS:q_udpQueries:DERIVE:600:0:125000000000 \ - DS:q_udp4Answers:DERIVE:600:0:125000000000 \ - DS:q_udp4Queries:DERIVE:600:0:125000000000 \ - DS:q_udp6Answers:DERIVE:600:0:125000000000 \ + '--step 300 + DS:corruptPackets:DERIVE:600:0:125000000000 + DS:def_cacheInserts:DERIVE:600:0:125000000000 + DS:def_cacheLookup:DERIVE:600:0:125000000000 + DS:latency:DERIVE:600:0:125000000000 + DS:pc_hit:DERIVE:600:0:125000000000 + DS:pc_miss:DERIVE:600:0:125000000000 + DS:pc_size:DERIVE:600:0:125000000000 + DS:qsize:DERIVE:600:0:125000000000 + DS:qc_hit:DERIVE:600:0:125000000000 + DS:qc_miss:DERIVE:600:0:125000000000 + DS:rec_answers:DERIVE:600:0:125000000000 + DS:rec_questions:DERIVE:600:0:125000000000 + DS:servfailPackets:DERIVE:600:0:125000000000 + DS:q_tcpAnswers:DERIVE:600:0:125000000000 + DS:q_tcpQueries:DERIVE:600:0:125000000000 + DS:q_timedout:DERIVE:600:0:125000000000 + DS:q_udpAnswers:DERIVE:600:0:125000000000 + DS:q_udpQueries:DERIVE:600:0:125000000000 + DS:q_udp4Answers:DERIVE:600:0:125000000000 + DS:q_udp4Queries:DERIVE:600:0:125000000000 + DS:q_udp6Answers:DERIVE:600:0:125000000000 DS:q_udp6Queries:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); }//end if diff --git a/includes/polling/applications/proxmox.inc.php b/includes/polling/applications/proxmox.inc.php index 64668f5263..37f8d8cd45 100644 --- a/includes/polling/applications/proxmox.inc.php +++ b/includes/polling/applications/proxmox.inc.php @@ -63,8 +63,8 @@ if (count($pmxlines) > 2) { if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - ' --step 300 \ - DS:INOCTETS:DERIVE:600:0:12500000000 \ + ' --step 300 + DS:INOCTETS:DERIVE:600:0:12500000000 DS:OUTOCTETS:DERIVE:600:0:12500000000 '.$config['rrd_rra']); } diff --git a/includes/polling/applications/shoutcast.inc.php b/includes/polling/applications/shoutcast.inc.php index 2a96008471..4cdd593241 100644 --- a/includes/polling/applications/shoutcast.inc.php +++ b/includes/polling/applications/shoutcast.inc.php @@ -29,14 +29,14 @@ foreach ($servers as $item => $server) { if (!is_file($rrdfile)) { rrdtool_create( $rrdfile, - '--step 300 \ - DS:bitrate:GAUGE:600:0:125000000000 \ - DS:traf_in:GAUGE:600:0:125000000000 \ - DS:traf_out:GAUGE:600:0:125000000000 \ - DS:current:GAUGE:600:0:125000000000 \ - DS:status:GAUGE:600:0:125000000000 \ - DS:peak:GAUGE:600:0:125000000000 \ - DS:max:GAUGE:600:0:125000000000 \ + '--step 300 + DS:bitrate:GAUGE:600:0:125000000000 + DS:traf_in:GAUGE:600:0:125000000000 + DS:traf_out:GAUGE:600:0:125000000000 + DS:current:GAUGE:600:0:125000000000 + DS:status:GAUGE:600:0:125000000000 + DS:peak:GAUGE:600:0:125000000000 + DS:max:GAUGE:600:0:125000000000 DS:unique:GAUGE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/applications/tinydns.inc.php b/includes/polling/applications/tinydns.inc.php index 294fcdbc86..903246ad56 100644 --- a/includes/polling/applications/tinydns.inc.php +++ b/includes/polling/applications/tinydns.inc.php @@ -30,26 +30,26 @@ if (!empty($agent_data['app']['tinydns']) && $app['app_id'] > 0) { if (!is_file($rrd_filename)) { rrdtool_create( $rrd_filename, - '--step 300 \ - DS:a:COUNTER:600:0:125000000000 \ - DS:ns:COUNTER:600:0:125000000000 \ - DS:cname:COUNTER:600:0:125000000000 \ - DS:soa:COUNTER:600:0:125000000000 \ - DS:ptr:COUNTER:600:0:125000000000 \ - DS:hinfo:COUNTER:600:0:125000000000 \ - DS:mx:COUNTER:600:0:125000000000 \ - DS:txt:COUNTER:600:0:125000000000 \ - DS:rp:COUNTER:600:0:125000000000 \ - DS:sig:COUNTER:600:0:125000000000 \ - DS:key:COUNTER:600:0:125000000000 \ - DS:aaaa:COUNTER:600:0:125000000000 \ - DS:axfr:COUNTER:600:0:125000000000 \ - DS:any:COUNTER:600:0:125000000000 \ - DS:total:COUNTER:600:0:125000000000 \ - DS:other:COUNTER:600:0:125000000000 \ - DS:notauth:COUNTER:600:0:125000000000 \ - DS:notimpl:COUNTER:600:0:125000000000 \ - DS:badclass:COUNTER:600:0:125000000000 \ + '--step 300 + DS:a:COUNTER:600:0:125000000000 + DS:ns:COUNTER:600:0:125000000000 + DS:cname:COUNTER:600:0:125000000000 + DS:soa:COUNTER:600:0:125000000000 + DS:ptr:COUNTER:600:0:125000000000 + DS:hinfo:COUNTER:600:0:125000000000 + DS:mx:COUNTER:600:0:125000000000 + DS:txt:COUNTER:600:0:125000000000 + DS:rp:COUNTER:600:0:125000000000 + DS:sig:COUNTER:600:0:125000000000 + DS:key:COUNTER:600:0:125000000000 + DS:aaaa:COUNTER:600:0:125000000000 + DS:axfr:COUNTER:600:0:125000000000 + DS:any:COUNTER:600:0:125000000000 + DS:total:COUNTER:600:0:125000000000 + DS:other:COUNTER:600:0:125000000000 + DS:notauth:COUNTER:600:0:125000000000 + DS:notimpl:COUNTER:600:0:125000000000 + DS:badclass:COUNTER:600:0:125000000000 DS:noquery:COUNTER:600:0:125000000000 '.$config['rrd_rra'] ); }//end if diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php index fd371bf139..1d9bff20c0 100644 --- a/includes/polling/bgp-peers.inc.php +++ b/includes/polling/bgp-peers.inc.php @@ -142,10 +142,10 @@ if ($config['enable_bgp']) { $peerrrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('bgp-'.$peer['bgpPeerIdentifier'].'.rrd'); if (!is_file($peerrrd)) { - $create_rrd = 'DS:bgpPeerOutUpdates:COUNTER:600:U:100000000000 \ - DS:bgpPeerInUpdates:COUNTER:600:U:100000000000 \ - DS:bgpPeerOutTotal:COUNTER:600:U:100000000000 \ - DS:bgpPeerInTotal:COUNTER:600:U:100000000000 \ + $create_rrd = 'DS:bgpPeerOutUpdates:COUNTER:600:U:100000000000 + DS:bgpPeerInUpdates:COUNTER:600:U:100000000000 + DS:bgpPeerOutTotal:COUNTER:600:U:100000000000 + DS:bgpPeerInTotal:COUNTER:600:U:100000000000 DS:bgpPeerEstablished:GAUGE:600:0:U '.$config['rrd_rra']; rrdtool_create($peerrrd, $create_rrd); @@ -305,10 +305,10 @@ if ($config['enable_bgp']) { $cbgp_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('cbgp-'.$peer['bgpPeerIdentifier'].".$afi.$safi.rrd"); if (!is_file($cbgp_rrd)) { - $rrd_create = 'DS:AcceptedPrefixes:GAUGE:600:U:100000000000 \ - DS:DeniedPrefixes:GAUGE:600:U:100000000000 \ - DS:AdvertisedPrefixes:GAUGE:600:U:100000000000 \ - DS:SuppressedPrefixes:GAUGE:600:U:100000000000 \ + $rrd_create = 'DS:AcceptedPrefixes:GAUGE:600:U:100000000000 + DS:DeniedPrefixes:GAUGE:600:U:100000000000 + DS:AdvertisedPrefixes:GAUGE:600:U:100000000000 + DS:SuppressedPrefixes:GAUGE:600:U:100000000000 DS:WithdrawnPrefixes:GAUGE:600:U:100000000000 '.$config['rrd_rra']; rrdtool_create($cbgp_rrd, $rrd_create); } diff --git a/includes/polling/cisco-cef.inc.php b/includes/polling/cisco-cef.inc.php index b105746c1c..029c42ed0b 100644 --- a/includes/polling/cisco-cef.inc.php +++ b/includes/polling/cisco-cef.inc.php @@ -52,9 +52,9 @@ if ($device['os_group'] == 'cisco') { if (!is_file($filename)) { rrdtool_create( $filename, - '--step 300 \ - DS:drop:DERIVE:600:0:1000000 \ - DS:punt:DERIVE:600:0:1000000 \ + '--step 300 + DS:drop:DERIVE:600:0:1000000 + DS:punt:DERIVE:600:0:1000000 DS:hostpunt:DERIVE:600:0:1000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/cisco-mac-accounting.inc.php b/includes/polling/cisco-mac-accounting.inc.php index ccb5eb6ad1..f2bad62410 100644 --- a/includes/polling/cisco-mac-accounting.inc.php +++ b/includes/polling/cisco-mac-accounting.inc.php @@ -65,9 +65,9 @@ if ($device['os_group'] == 'cisco') { if (!is_file($rrdfile)) { rrdtool_create( $rrdfile, - 'DS:IN:COUNTER:600:0:12500000000 \ - DS:OUT:COUNTER:600:0:12500000000 \ - DS:PIN:COUNTER:600:0:12500000000 \ + 'DS:IN:COUNTER:600:0:12500000000 + DS:OUT:COUNTER:600:0:12500000000 + DS:PIN:COUNTER:600:0:12500000000 DS:POUT:COUNTER:600:0:12500000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/cisco-sla.inc.php b/includes/polling/cisco-sla.inc.php index 95938e112d..6247f8ede0 100644 --- a/includes/polling/cisco-sla.inc.php +++ b/includes/polling/cisco-sla.inc.php @@ -42,7 +42,7 @@ foreach (dbFetchRows('SELECT * FROM `slas` WHERE `device_id` = ? AND `deleted` = if (!is_file($slarrd)) { rrdtool_create( $slarrd, - '--step 300 \ + '--step 300 DS:rtt:GAUGE:600:0:300000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/entity-physical.inc.php b/includes/polling/entity-physical.inc.php index c07e237f12..d608375ff9 100644 --- a/includes/polling/entity-physical.inc.php +++ b/includes/polling/entity-physical.inc.php @@ -39,11 +39,11 @@ if ($device['os'] == 'ios') { if (!is_file($rrd)) { rrdtool_create( $rrd, - '--step 300 \ - DS:inutil:GAUGE:600:0:100 \ - DS:oututil:GAUGE:600:0:100 \ - DS:outdropped:DERIVE:600:0:125000000000 \ - DS:outerrors:DERIVE:600:0:125000000000 \ + '--step 300 + DS:inutil:GAUGE:600:0:100 + DS:oututil:GAUGE:600:0:100 + DS:outdropped:DERIVE:600:0:125000000000 + DS:outerrors:DERIVE:600:0:125000000000 DS:inerrors:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index ffe79340e0..927163bad4 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -96,7 +96,7 @@ function poll_sensor($device, $class, $unit) { if (!is_file($rrd_file)) { rrdtool_create( $rrd_file, - '--step 300 \ + '--step 300 DS:sensor:GAUGE:600:-20000:20000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/hr-mib.inc.php b/includes/polling/hr-mib.inc.php index ff802563e8..7edcd8c015 100644 --- a/includes/polling/hr-mib.inc.php +++ b/includes/polling/hr-mib.inc.php @@ -12,7 +12,7 @@ if (is_numeric($hrSystem[0]['hrSystemProcesses'])) { if (!is_file($rrd_file)) { rrdtool_create( $rrd_file, - '--step 300 \ + '--step 300 DS:procs:GAUGE:600:0:U '.$config['rrd_rra'] ); } @@ -31,7 +31,7 @@ if (is_numeric($hrSystem[0]['hrSystemNumUsers'])) { if (!is_file($rrd_file)) { rrdtool_create( $rrd_file, - '--step 300 \ + '--step 300 DS:users:GAUGE:600:0:U '.$config['rrd_rra'] ); } diff --git a/includes/polling/ipmi.inc.php b/includes/polling/ipmi.inc.php index 519dcb6003..dffd192777 100644 --- a/includes/polling/ipmi.inc.php +++ b/includes/polling/ipmi.inc.php @@ -36,7 +36,7 @@ if ($ipmi['host'] = get_dev_attrib($device, 'ipmi_hostname')) { if (!is_file($rrd_file)) { rrdtool_create( $rrd_file, - '--step 300 \ + '--step 300 DS:sensor:GAUGE:600:-20000:20000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/junose-atm-vp.inc.php b/includes/polling/junose-atm-vp.inc.php index 64ba4eed23..b7bbd4acf0 100644 --- a/includes/polling/junose-atm-vp.inc.php +++ b/includes/polling/junose-atm-vp.inc.php @@ -36,15 +36,15 @@ if (count($vp_rows)) { if (!is_file($rrd)) { rrdtool_create( $rrd, - '--step 300 \ - DS:incells:DERIVE:600:0:125000000000 \ - DS:outcells:DERIVE:600:0:125000000000 \ - DS:inpackets:DERIVE:600:0:125000000000 \ - DS:outpackets:DERIVE:600:0:125000000000 \ - DS:inpacketoctets:DERIVE:600:0:125000000000 \ - DS:outpacketoctets:DERIVE:600:0:125000000000 \ - DS:inpacketerrors:DERIVE:600:0:125000000000 \ - DS:outpacketerrors:DERIVE:600:0:125000000000 \ + '--step 300 + DS:incells:DERIVE:600:0:125000000000 + DS:outcells:DERIVE:600:0:125000000000 + DS:inpackets:DERIVE:600:0:125000000000 + DS:outpackets:DERIVE:600:0:125000000000 + DS:inpacketoctets:DERIVE:600:0:125000000000 + DS:outpacketoctets:DERIVE:600:0:125000000000 + DS:inpacketerrors:DERIVE:600:0:125000000000 + DS:outpacketerrors:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/os/procurve.inc.php b/includes/polling/os/procurve.inc.php index 010f0e4d04..0b124dee0d 100644 --- a/includes/polling/os/procurve.inc.php +++ b/includes/polling/os/procurve.inc.php @@ -39,7 +39,7 @@ if (is_numeric($FdbAddressCount)) { if (!is_file($fdb_rrd_file)) { rrdtool_create( $fdb_rrd_file, - ' --step 300 \ + ' --step 300 DS:value:GAUGE:600:-1:100000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/os/screenos.inc.php b/includes/polling/os/screenos.inc.php index fa72fe0b95..7fd9297ae9 100644 --- a/includes/polling/os/screenos.inc.php +++ b/includes/polling/os/screenos.inc.php @@ -12,9 +12,9 @@ list ($sessalloc, $sessmax, $sessfailed) = explode("\n", $sess_data); if (!is_file($sessrrd)) { rrdtool_create( $sessrrd, - ' --step 300 \ - DS:allocate:GAUGE:600:0:3000000 \ - DS:max:GAUGE:600:0:3000000 \ + ' --step 300 + DS:allocate:GAUGE:600:0:3000000 + DS:max:GAUGE:600:0:3000000 DS:failed:GAUGE:600:0:1000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/os/snom.inc.php b/includes/polling/os/snom.inc.php index e7f5df80f9..ac446fa1cd 100644 --- a/includes/polling/os/snom.inc.php +++ b/includes/polling/os/snom.inc.php @@ -27,11 +27,11 @@ $rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/data.rrd'; if (!is_file($rrdfile)) { rrdtool_create( $rrdfile, - 'DS:INOCTETS:COUNTER:600:U:100000000000 \ - DS:OUTOCTETS:COUNTER:600:U:10000000000 \ - DS:INPKTS:COUNTER:600:U:10000000000 \ - DS:OUTPKTS:COUNTER:600:U:10000000000 \ - DS:CALLS:COUNTER:600:U:10000000000 \ + 'DS:INOCTETS:COUNTER:600:U:100000000000 + DS:OUTOCTETS:COUNTER:600:U:10000000000 + DS:INPKTS:COUNTER:600:U:10000000000 + DS:OUTPKTS:COUNTER:600:U:10000000000 + DS:CALLS:COUNTER:600:U:10000000000 DS:REGISTRATIONS:COUNTER:600:U:10000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/ospf.inc.php b/includes/polling/ospf.inc.php index 05501f386d..fb5e4b561d 100644 --- a/includes/polling/ospf.inc.php +++ b/includes/polling/ospf.inc.php @@ -362,10 +362,10 @@ $filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('ospf-statis if (!is_file($filename)) { rrdtool_create( $filename, - '--step 300 \ - DS:instances:GAUGE:600:0:1000000 \ - DS:areas:GAUGE:600:0:1000000 \ - DS:ports:GAUGE:600:0:1000000 \ + '--step 300 + DS:instances:GAUGE:600:0:1000000 + DS:areas:GAUGE:600:0:1000000 + DS:ports:GAUGE:600:0:1000000 DS:neighbours:GAUGE:600:0:1000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index b0d61a564f..cea5abca45 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -474,21 +474,21 @@ foreach ($ports as $port) { if (!is_file($rrdfile)) { rrdtool_create( $rrdfile, - ' --step 300 \ - DS:INOCTETS:DERIVE:600:0:12500000000 \ - DS:OUTOCTETS:DERIVE:600:0:12500000000 \ - DS:INERRORS:DERIVE:600:0:12500000000 \ - DS:OUTERRORS:DERIVE:600:0:12500000000 \ - DS:INUCASTPKTS:DERIVE:600:0:12500000000 \ - DS:OUTUCASTPKTS:DERIVE:600:0:12500000000 \ - DS:INNUCASTPKTS:DERIVE:600:0:12500000000 \ - DS:OUTNUCASTPKTS:DERIVE:600:0:12500000000 \ - DS:INDISCARDS:DERIVE:600:0:12500000000 \ - DS:OUTDISCARDS:DERIVE:600:0:12500000000 \ - DS:INUNKNOWNPROTOS:DERIVE:600:0:12500000000 \ - DS:INBROADCASTPKTS:DERIVE:600:0:12500000000 \ - DS:OUTBROADCASTPKTS:DERIVE:600:0:12500000000 \ - DS:INMULTICASTPKTS:DERIVE:600:0:12500000000 \ + ' --step 300 + DS:INOCTETS:DERIVE:600:0:12500000000 + DS:OUTOCTETS:DERIVE:600:0:12500000000 + DS:INERRORS:DERIVE:600:0:12500000000 + DS:OUTERRORS:DERIVE:600:0:12500000000 + DS:INUCASTPKTS:DERIVE:600:0:12500000000 + DS:OUTUCASTPKTS:DERIVE:600:0:12500000000 + DS:INNUCASTPKTS:DERIVE:600:0:12500000000 + DS:OUTNUCASTPKTS:DERIVE:600:0:12500000000 + DS:INDISCARDS:DERIVE:600:0:12500000000 + DS:OUTDISCARDS:DERIVE:600:0:12500000000 + DS:INUNKNOWNPROTOS:DERIVE:600:0:12500000000 + DS:INBROADCASTPKTS:DERIVE:600:0:12500000000 + DS:OUTBROADCASTPKTS:DERIVE:600:0:12500000000 + DS:INMULTICASTPKTS:DERIVE:600:0:12500000000 DS:OUTMULTICASTPKTS:DERIVE:600:0:12500000000 '.$config['rrd_rra'] ); }//end if diff --git a/includes/polling/processors.inc.php b/includes/polling/processors.inc.php index dfe2aa39c5..fb92e41357 100644 --- a/includes/polling/processors.inc.php +++ b/includes/polling/processors.inc.php @@ -16,7 +16,7 @@ foreach (dbFetchRows('SELECT * FROM processors WHERE device_id = ?', array($devi if (!is_file($procrrd)) { rrdtool_create( $procrrd, - '--step 300 \ + '--step 300 DS:usage:GAUGE:600:-273:1000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/toner.inc.php b/includes/polling/toner.inc.php index 9b3c32cb31..202cee429b 100644 --- a/includes/polling/toner.inc.php +++ b/includes/polling/toner.inc.php @@ -23,7 +23,7 @@ if ($config['enable_printers']) { if (!is_file($tonerrrd)) { rrdtool_create( $tonerrrd, - '--step 300 \ + '--step 300 DS:toner:GAUGE:600:0:20000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/ucd-diskio.inc.php b/includes/polling/ucd-diskio.inc.php index f7e197551f..8a3bae0c0f 100644 --- a/includes/polling/ucd-diskio.inc.php +++ b/includes/polling/ucd-diskio.inc.php @@ -24,10 +24,10 @@ if (count($diskio_data)) { if (!is_file($rrd)) { rrdtool_create( $rrd, - '--step 300 \ - DS:read:DERIVE:600:0:125000000000 \ - DS:written:DERIVE:600:0:125000000000 \ - DS:reads:DERIVE:600:0:125000000000 \ + '--step 300 + DS:read:DERIVE:600:0:125000000000 + DS:written:DERIVE:600:0:125000000000 + DS:reads:DERIVE:600:0:125000000000 DS:writes:DERIVE:600:0:125000000000 '.$config['rrd_rra'] ); } diff --git a/includes/polling/ucd-mib.inc.php b/includes/polling/ucd-mib.inc.php index 350a282041..93f9f9e561 100644 --- a/includes/polling/ucd-mib.inc.php +++ b/includes/polling/ucd-mib.inc.php @@ -34,10 +34,10 @@ $ss = snmpwalk_cache_oid($device, 'systemStats', array(), 'UCD-SNMP-MIB'); $ss = $ss[0]; // Insert Nazi joke here. // Create CPU RRD if it doesn't already exist -$cpu_rrd_create = ' --step 300 \ - DS:user:COUNTER:600:0:U \ - DS:system:COUNTER:600:0:U \ - DS:nice:COUNTER:600:0:U \ +$cpu_rrd_create = ' --step 300 + DS:user:COUNTER:600:0:U + DS:system:COUNTER:600:0:U + DS:nice:COUNTER:600:0:U DS:idle:COUNTER:600:0:U '.$config['rrd_rra']; // This is how we currently collect. We should collect one RRD per stat, for ease of handling differen formats, @@ -125,14 +125,14 @@ if (is_numeric($ss['ssRawInterrupts'])) { // UCD-SNMP-MIB::memCached.0 = INTEGER: 2595556 kB // UCD-SNMP-MIB::memSwapError.0 = INTEGER: noError(0) // UCD-SNMP-MIB::memSwapErrorMsg.0 = STRING: -$mem_rrd_create = ' --step 300 \ - DS:totalswap:GAUGE:600:0:10000000000 \ - DS:availswap:GAUGE:600:0:10000000000 \ - DS:totalreal:GAUGE:600:0:10000000000 \ - DS:availreal:GAUGE:600:0:10000000000 \ - DS:totalfree:GAUGE:600:0:10000000000 \ - DS:shared:GAUGE:600:0:10000000000 \ - DS:buffered:GAUGE:600:0:10000000000 \ +$mem_rrd_create = ' --step 300 + DS:totalswap:GAUGE:600:0:10000000000 + DS:availswap:GAUGE:600:0:10000000000 + DS:totalreal:GAUGE:600:0:10000000000 + DS:availreal:GAUGE:600:0:10000000000 + DS:totalfree:GAUGE:600:0:10000000000 + DS:shared:GAUGE:600:0:10000000000 + DS:buffered:GAUGE:600:0:10000000000 DS:cached:GAUGE:600:0:10000000000 '.$config['rrd_rra']; $snmpdata = snmp_get_multi($device, 'memTotalSwap.0 memAvailSwap.0 memTotalReal.0 memAvailReal.0 memTotalFree.0 memShared.0 memBuffer.0 memCached.0', '-OQUs', 'UCD-SNMP-MIB'); diff --git a/includes/polling/wifi.inc.php b/includes/polling/wifi.inc.php index 13ce8a2329..2b52c7f77f 100644 --- a/includes/polling/wifi.inc.php +++ b/includes/polling/wifi.inc.php @@ -74,7 +74,7 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty if (!is_file($wificlientsrrd)) { rrdtool_create( $wificlientsrrd, - '--step 300 \ + '--step 300 DS:wificlients:GAUGE:600:-273:1000 '.$config['rrd_rra'] ); } @@ -94,7 +94,7 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['ty if (!is_file($wificlientsrrd)) { rrdtool_create( $wificlientsrrd, - '--step 300 \ + '--step 300 DS:wificlients:GAUGE:600:-273:1000 '.$config['rrd_rra'] ); } diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php index 8123a654de..49145dcfc8 100644 --- a/includes/rrdtool.inc.php +++ b/includes/rrdtool.inc.php @@ -166,7 +166,7 @@ function rrdtool_graph($graph_file, $options) { function rrdtool($command, $filename, $options) { global $config, $debug, $rrd_pipes, $console_color; - if ($config['rrdtool_version'] >= 1.5 && $config['rrdcached']) { + if ($config['rrdcached'] && ($config['rrdtool_version'] >= 1.5 || $command != "create")) { if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== false) { $filename = str_replace($config['rrd_dir'].'/', './'.$config['rrdcached_dir'].'/', $filename); $filename = str_replace($config['rrd_dir'], './'.$config['rrdcached_dir'].'/', $filename); From afd83f6a8d79488a6c2c0646ac08703f698b329a Mon Sep 17 00:00:00 2001 From: f0o Date: Mon, 28 Sep 2015 09:05:44 +0000 Subject: [PATCH 2/2] Strip newlines from arguments on creation --- includes/rrdtool.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php index 49145dcfc8..1c12f7e399 100644 --- a/includes/rrdtool.inc.php +++ b/includes/rrdtool.inc.php @@ -206,7 +206,7 @@ function rrdtool($command, $filename, $options) { function rrdtool_create($filename, $options) { - return rrdtool('create', $filename, $options); + return rrdtool('create', $filename, str_replace(array("\r", "\n"), '', $options)); }