Aaron Daniels 70a05369fb Merge branch 'master' into issue-3550 ...

Conflicts:
	html/includes/graphs/device/sla.inc.php
	includes/polling/cisco-sla.inc.php

- Use standardised RRD functions

2016-08-12 08:22:40 +10:00

..

alerts

formatting error

2016-07-19 15:20:48 -07:00

caches

Nagios Services - Status update

2016-04-26 22:05:34 +10:00

db

…

discovery

Merge branch 'master' into issue-3550

2016-08-12 08:22:40 +10:00

phpmailer

…

polling

Merge branch 'master' into issue-3550

2016-08-12 08:22:40 +10:00

services

- Added $check_cmd for check_dhcp as per:

2016-04-18 08:57:33 +10:00

snmptrap

…

sql-schema

…

alerts.inc.php

Added check for empty emails

2016-07-28 20:28:23 +01:00

billing.php

Final fixes for billing

2016-07-17 20:35:50 +01:00

callback.php

…

cisco-entities.php

…

common.php

Merge remote-tracking branch 'upstream/master' into rrd-create-remote

2016-08-07 08:22:32 -05:00

component.php

Component Update - Status

2016-07-11 16:51:01 +10:00

console_colour.php

…

console_table.php

…

datastore.inc.php

Update nfs-stats.inc.php to use data_update

2016-07-25 20:42:37 -05:00

dbFacile.mysql.php

…

dbFacile.mysqli.php

…

dbFacile.php

…

defaults.inc.php

Don't use $config['rrdcached_dir'] anymore, always use relative directories when using rrdcached.

2016-07-25 16:24:09 -05:00

definitions.inc.php

Merge pull request #3966 from ahmedsajid/powerconnect-patches

2016-08-05 22:22:35 +01:00

device-groups.inc.php

This probably can be deleted since it was wrong

2016-08-09 02:57:45 +02:00

exceptions.inc.php

Actually add the exceptions

2016-08-08 15:47:35 -05:00

functions.php

Merge pull request #3800 from murrant/rrd-create-remote

2016-08-10 18:44:45 +01:00

include-dir.inc.php

…

influxdb.inc.php

Version 2 of sending the correct data to influx. Also catching the exception that would stop updates working.

2016-04-12 10:01:20 +01:00

load_db_graph_types.inc.php

…

mergecnf.inc.php

…

notifications.php

Remove unnecessary array reverse

2016-03-09 12:47:11 +00:00

object-cache.inc.php

…

port-descr-parser.inc.php

…

rewrites.php

rewrite of brocade switches models

2016-08-07 04:50:31 +03:00

rrdtool.inc.php

rrdtool.inc.php: Remove unused functions

2016-08-09 09:31:45 -05:00

services.inc.php

Remove nfs requirement for distributed poller (with rrdtool 1.5+)

2016-07-07 21:10:06 -05:00

snmp.inc.php

More updates for junos bgp polling

2016-08-03 16:49:41 +01:00

static-config.php

…

syslog.php

reduction, thx an @murrant

2016-08-08 17:36:19 +02:00

vmware_guestid.inc.php

…