This commit is contained in:
laf
2015-10-26 11:08:19 +00:00
918 changed files with 32658 additions and 6792 deletions

View File

@@ -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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

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

View File

@@ -3,9 +3,10 @@
// Polls powerdns statistics from script via SNMP
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/app-powerdns-'.$app['app_id'].'.rrd';
$options = '-O qv';
$mib = 'NET-SNMP-EXTEND-MIB';
$oid = 'nsExtendOutputFull.8.112.111.119.101.114.100.110.115';
$powerdns = snmp_get($device, $oid, $options);
$powerdns = snmp_get($device, $oid, $options, $mib);
echo ' powerdns';
@@ -18,28 +19,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

View File

@@ -0,0 +1,93 @@
<?php
if (isset($config['enable_proxmox']) && $config['enable_proxmox'] && !empty($agent_data['app']['proxmox'])) {
$proxmox = $agent_data['app']['proxmox'];
}
/**
* Check if a port on a Proxmox VM exists
* @param string $p Port name
* @param string $c Clustername
* @param integer $i VM ID
* @return integer|boolean The port-ID if the port exists, false if it doesn't exist
*/
function proxmox_port_exists($i, $c, $p) {
if ($row = dbFetchRow("SELECT pmp.id FROM proxmox_ports pmp, proxmox pm WHERE pm.id = pmp.vm_id AND pmp.port = ? AND pm.cluster = ? AND pm.vmid = ?", array($p, $c, $i))) {
return $row['id'];
}
return false;
}
/**
* Check if a Proxmox VM exists
* @param integer $i VM ID
* @param string $c Clustername
* @param array $pmxcache Reference to the Proxmox VM Cache
* @return boolean true if the VM exists, false if it doesn't
*/
function proxmox_vm_exists($i, $c, &$pmxcache) {
if (isset($pmxcache[$c][$i]) && $pmxcache[$c][$i] > 0) {
return true;
}
if ($row = dbFetchRow("SELECT id FROM proxmox WHERE vmid = ? AND cluster = ?", array($i, $c))) {
$pmxcache[$c][$i] = (integer) $row['id'];
return true;
}
return false;
}
$pmxlines = explode("\n", $proxmox);
if (count($pmxlines) > 2) {
$pmxcluster = array_shift($pmxlines);
$pmxcdir = join('/', array($config['rrd_dir'],'proxmox',$pmxcluster));
if (!is_dir($pmxcdir)) {
mkdir($pmxcdir, 0775, true);
}
dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));
$pmxcache = [];
foreach ($pmxlines as $vm) {
list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
$rrd_filename = join('/', array(
$pmxcdir,
$vmid.'_netif_'.$vmport.'.rrd'));
if (!is_file($rrd_filename)) {
rrdtool_create(
$rrd_filename,
' --step 300
DS:INOCTETS:DERIVE:600:0:12500000000
DS:OUTOCTETS:DERIVE:600:0:12500000000 '.$config['rrd_rra']);
}
rrdtool_update($rrd_filename, 'N:'.$vmpin.':'.$vmpout);
if (proxmox_vm_exists($vmid, $pmxcluster, $pmxcache) === true) {
dbUpdate(array('device_id' => $device['device_id'], 'last_seen' => array('NOW()'), 'description' => $vmdesc), 'proxmox', '`vmid` = ? AND `cluster` = ?', array($vmid, $pmxcluster));
}
else {
$pmxcache[$pmxcluster][$vmid] = dbInsert(array('cluster' => $pmxcluster, 'vmid' => $vmid, 'description' => $vmdesc, 'device_id' => $device['device_id']), 'proxmox');
}
if ($portid = proxmox_port_exists($vmid, $pmxcluster, $vmport) !== false) {
dbUpdate(array('last_seen' => array('NOW()')), 'proxmox_ports', '`vm_id` = ? AND `port` = ?', array($pmxcache[$pmxcluster][$vmid], $vmport));
}
else {
dbInsert(array('vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport), 'proxmox_ports');
}
}
unset($pmxlines);
unset($pmxcluster);
unset($pmxcdir);
unset($proxmox);
unset($pmxcache);
}

View File

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

View File

@@ -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