laf 0bf3b518f5 Merge branch 'master' of github.com:laf/librenms into issue-798 ...

Conflicts:
	includes/polling/functions.inc.php

2015-05-04 09:16:48 +01:00

..

agent.inc.php

…

arubacontroller_numaps.inc.php

…

arubacontroller_numclients.inc.php

…

asa_conns.inc.php

…

auth.inc.php

…

bits.inc.php

…

charge.inc.php

…

cipsec_flow_bits.inc.php

…

cipsec_flow_pkts.inc.php

…

cipsec_flow_stats.inc.php

…

cipsec_flow_tunnels.inc.php

…

collectd.inc.php

…

cras_sessions.inc.php

…

current.inc.php

…

dbm.inc.php

…

diskio_bits.inc.php

…

diskio_common.inc.php

…

diskio_ops.inc.php

…

diskio.inc.php

…

fanspeed.inc.php

…

fdb_count.inc.php

…

fortigate_cpu.inc.php

…

fortigate_sessions.inc.php

…

frequency.inc.php

…

hr_processes.inc.php

…

hr_users.inc.php

…

humidity.inc.php

…

ipsystemstats_ipv4_frag.inc.php

…

ipsystemstats_ipv4.inc.php

…

ipsystemstats_ipv6_frag.inc.php

…

ipsystemstats_ipv6.inc.php

…

ipSystemStats.inc.php

…

mempool.inc.php

…

netscaler_tcp_bits.inc.php

…

netscaler_tcp_conn.inc.php

…

netscaler_tcp_pkts.inc.php

…

netstat_icmp_info.inc.php

…

netstat_icmp.inc.php

…

netstat_ip_frag.inc.php

…

netstat_ip.inc.php

…

netstat_snmp_pkt.inc.php

…

netstat_snmp.inc.php

…

netstat_tcp.inc.php

…

netstat_udp.inc.php

…

nfsen_common.inc.php

…

nfsen_flows.inc.php

…

nfsen_packets.inc.php

…

nfsen_traffic.inc.php

…

panos_sessions.inc.php

…

ping_perf.inc.php

…

poller_perf.inc.php

…

power.inc.php

…

processor_separate.inc.php

…

processor_stack.inc.php

…

processor.inc.php

…

screenos_sessions.inc.php

…

sensor.inc.php

…

siklu_rfAverageCinr.inc.php

…

siklu_rfAverageRssi.inc.php

…

siklu_rfinterfaceOctets.inc.php

…

siklu_rfinterfaceOtherOctets.inc.php

…

siklu_rfinterfaceOtherPkts.inc.php

…

siklu_rfinterfacePkts.inc.php

…

siklu_rfOperationalFrequency.inc.php

…

sla.inc.php

…

smokeping_all_common_avg.inc.php

…

smokeping_all_common.inc.php

…

smokeping_common.inc.php

…

smokeping_in_all_avg.inc.php

…

smokeping_in_all.inc.php

…

smokeping_out_all_avg.inc.php

…

smokeping_out_all.inc.php

…

storage.inc.php

…

temperature.inc.php

…

toner.inc.php

…

ubnt_airfiber_Capacity.inc.php

…

ubnt_airfiber_LinkDist.inc.php

…

ubnt_airfiber_RadioFreqs.inc.php

…

ubnt_airfiber_RadioTemp.inc.php

…

ubnt_airfiber_RFTotOctetsRx.inc.php

…

ubnt_airfiber_RFTotOctetsTx.inc.php

…

ubnt_airfiber_RFTotPktsRx.inc.php

…

ubnt_airfiber_RFTotPktsTx.inc.php

…

ubnt_airfiber_TxPower.inc.php

…

ubnt_airmax_AirMaxCapacity.inc.php

…

ubnt_airmax_AirMaxQuality.inc.php

…

ubnt_airmax_RadioDistance.inc.php

…

ubnt_airmax_RadioFreq.inc.php

…

ubnt_airmax_RadioRssi_0.inc.php

…

ubnt_airmax_RadioRssi_1.inc.php

…

ubnt_airmax_RadioTxPower.inc.php

…

ubnt_airmax_WlStatCcq.inc.php

…

ubnt_airmax_WlStatNoiseFloor.inc.php

…

ubnt_airmax_WlStatRssi.inc.php

…

ubnt_airmax_WlStatRxRate.inc.php

…

ubnt_airmax_WlStatSignal.inc.php

…

ubnt_airmax_WlStatStaCount.inc.php

…

ubnt_airmax_WlStatTxRate.inc.php

…

ucd_contexts.inc.php

…

ucd_cpu.inc.php

…

ucd_interrupts.inc.php

…

ucd_io.inc.php

…

ucd_load.inc.php

…

ucd_memory.inc.php

…

ucd_swap_io.inc.php

…

uptime.inc.php

…

voltage.inc.php

…

vpdn_sessions_l2tp.inc.php

…

vpdn_tunnels_l2tp.inc.php

…

wifi_clients.inc.php

…