Aaron Daniels 8f59b8c7f7 Merge branch 'master' into issue-2193

2016-03-29 20:16:07 +10:00

..

alerts

Give slightly more information on Transport API failure.

2016-03-23 17:01:06 +00:00

caches

Added notifications poller,page,schema,display

2015-11-21 11:22:59 +00:00

db

Fix coding style part 2

2015-07-15 11:04:22 +02:00

discovery

- added rrd_pipes to check script

2016-03-22 16:40:51 +10:00

phpmailer

…

polling

Merge pull request #3286 from Rosiak/cisco-wifi-fix

2016-03-26 14:57:09 +00:00

services

Nagios Services

2016-03-15 22:23:14 +10:00

snmptrap

Remove php closing tags to fix scrut issues

2015-08-04 19:29:43 +02:00

sql-schema

SQLs are performed up to an execution time of 45s, then a page reload is induced to avoid fcgi/cgi/modphp timeouts.

2015-09-02 15:30:51 +01:00

alerts.inc.php

Merge pull request #3138 from f0o/minor-alerting-addons

2016-03-08 21:00:37 +00:00

billing.php

Scrut fix + Notification

2016-03-07 18:41:51 +00:00

callback.php

Fixed silly sql build for vminfo table

2016-01-24 23:36:38 +00:00

cisco-entities.php

Fix coding style part 2

2015-07-15 11:04:22 +02:00

common.php

Nagios Services

2016-03-15 22:23:14 +10:00

component.php

- Resolved some issues identified by scrutiniser.

2016-01-15 20:37:54 +10:00

console_colour.php

Fix coding style part 2

2015-07-15 11:04:22 +02:00

console_table.php

Fix coding style part 2

2015-07-15 11:04:22 +02:00

datastore.inc.php

Fix scrutinizer issue

2016-01-15 21:49:58 +10:00

dbFacile.mysql.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

dbFacile.mysqli.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

dbFacile.php

Added mysqli support

2015-08-08 19:27:18 +00:00

defaults.inc.php

Nagios Services

2016-03-15 22:23:14 +10:00

definitions.inc.php

Merge pull request #3237 from xbeaudouin/cumulus

2016-03-18 10:33:38 +00:00

device-groups.inc.php

Updated device-groups functions to support returning all data or just group id

2015-12-13 17:20:34 +00:00

functions.php

silly bug

2016-03-09 22:13:57 +01:00

include-dir.inc.php

Remove all unneeded if($debug)-statements and replace them with d_echo in the rest of the directories...

2015-08-21 16:10:01 +02:00

influxdb.inc.php

Some more tweaks

2015-12-23 15:12:42 +00:00

load_db_graph_types.inc.php

Make things clearer by not trying to cram into one line

2016-01-02 07:10:41 +10:00

mergecnf.inc.php

Fix coding style part 2

2015-07-15 11:04:22 +02:00

notifications.php

Remove unnecessary array reverse

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

object-cache.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

port-descr-parser.inc.php

Remove all unneeded if($debug)-statements and replace them with d_echo in the rest of the directories...

2015-08-21 16:10:01 +02:00

rewrites.php

Updated FortiOS to pick up all FortiManagers + updated rewrite for hardware

2016-02-12 14:17:57 +00:00

rrdtool.inc.php

Remove null message on rename

2016-01-22 09:39:26 +10:00

services.inc.php

- Use Nagios alerting: 0 = Ok, 1 = Warning, 2 = Critical

2016-03-29 20:15:42 +10:00

snmp.inc.php

update branch

2016-02-06 06:52:21 +01:00

snom-graphing.php

Fix coding style part 2

2015-07-15 11:04:22 +02:00

static-config.php

Apply "Squiz" code style on old (pre-2014) files

2015-07-11 16:12:35 +02:00

syslog.php

Another test case for the cisco syslog timestamp prefix.

2016-03-09 10:49:12 -06:00

vmware_guestid.inc.php

Apply "Squiz" code style on old (pre-2014) files

2015-07-11 16:12:35 +02:00