10989 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
laf	110dcae4c9	Added device_id to eventlog table	2016-06-18 02:09:22 +01:00
Neil Lathwood	f236741e49	Merge pull request #3681 from laf/issue-3680 ... Fix for php5.3 in sentry3 discovery file	2016-06-17 09:02:09 +01:00
laf	866d87bde8	Update	2016-06-17 09:01:57 +01:00
laf	8dc55b11d5	Fix for php5.3 in sentry3 discovery file	2016-06-17 00:22:40 +01:00
Neil Lathwood	0f1d8db107	Merge pull request #3679 from Rosiak/fix-sophos-logo ... Fix Sophos Logo	2016-06-16 19:55:37 +01:00
Søren Rosiak	6f2badb206	Fix logo ... User complained about the logo and the top/bottom border.	2016-06-16 20:26:43 +02:00
Neil Lathwood	d2dfcfdce0	Merge pull request #3678 from Rosiak/sophos-support ... Sophos Support Redo	2016-06-16 19:10:02 +01:00
Søren Rosiak	a7ea2374de	Sophos Support Redo	2016-06-16 19:13:18 +02:00
Neil Lathwood	43e8597955	Merge pull request #3677 from laf/docs-faq ... Updated faqs	2016-06-16 16:21:09 +01:00
laf	cb0ebeb25a	Updated faqs	2016-06-16 16:20:05 +01:00
Neil Lathwood	7453eab661	Merge pull request #3676 from laf/docs-emailalerting ... Removed deprecated config options for email alerting	2016-06-16 16:09:08 +01:00
laf	2ca9fb6b7d	Removed deprecated config options for email alerting	2016-06-16 16:04:58 +01:00
Neil Lathwood	629be82fd6	Merge pull request #3675 from laf/docs-distpolling ... Updated distributed polling docs to be a bit clearer and include full config examples	2016-06-16 16:00:43 +01:00
laf	b43253b16b	Updated distributed polling docs to be a bit clearer and include full config examples	2016-06-16 15:57:14 +01:00
Neil Lathwood	05305f00e3	Merge pull request #3673 from laf/docs-influxdb ... Added/Updated requirements for InfluxDB	2016-06-16 11:53:12 +01:00
laf	a3a508d569	Added/Updated requirements for InfluxDB	2016-06-16 11:52:43 +01:00
Neil Lathwood	6de51460d8	Merge pull request #3671 from laf/docs-autodiscovery ... Added docs for auto discovery	2016-06-16 10:28:48 +01:00
laf	1774d0a3d7	Added info on when discovery runs	2016-06-16 10:22:17 +01:00
laf	26e23545e3	Added additional config option to docs	2016-06-16 10:19:59 +01:00
laf	5497af750f	Added docs for auto discovery	2016-06-16 10:16:13 +01:00
Daniel Preussker	aee1225476	Merge pull request #3662 from laf/issue-3593 ... Added detection for SwOS	2016-06-16 05:44:43 +00:00
Daniel Preussker	91e37a6eb7	Merge pull request #3667 from laf/issue-3526 ... Un-acknowledging an alert will allow it to continue sending alerts	2016-06-16 05:30:22 +00:00
Neil Lathwood	3c45a96e3b	Merge pull request #3661 from laf/issue-3657 ... Fixed ajax_* calls for use with base_url	2016-06-16 00:51:51 +01:00
laf	16155e2264	Un-acknowledging an alert will allow it to continue sending alerts	2016-06-16 00:50:22 +01:00
Neil Lathwood	54b5edd50a	Merge pull request #3664 from geordish/add-sctp-mib ... Add SCTP MIB	2016-06-15 15:44:32 +01:00
Dave Bell	d3d8bee596	Add SCTP MIB	2016-06-15 15:30:40 +01:00
Neil Lathwood	c4de7a3e37	Merge pull request #3663 from lucasRolff/master ... Add In/Out to multiport graph	2016-06-15 14:48:03 +01:00
laf	ed17c7e39d	Added detection for SwOS	2016-06-15 13:21:09 +00:00
Lucas Rolff	f5d9c5e48b	Add In/Out to multiport graph ... - Add In/Out text and color boxes to multiport bit graph	2016-06-15 15:20:19 +02:00
laf	e3db9c8561	Fixed ajax_* calls for use with base_url	2016-06-15 12:58:23 +00:00
Neil Lathwood	9391b75e19	Merge pull request #3660 from gitdimi/master ... Fixed spelling	2016-06-15 13:55:57 +01:00
Dimitry	84b78fc6d2	Fixed spelling	2016-06-15 14:51:23 +02:00
Neil Lathwood	66f8a7e071	Merge pull request #3659 from justmedude/master ... start of adding basic support for the servertech sentry4 cdus	2016-06-15 10:02:17 +01:00
Vikram Adukia	d247af2cf3	I agree to the conditions of the Contributor Agreement ... contained in doc/General/Contributing.md.	2016-06-15 01:52:53 -07:00
Vikram Adukia	7d61f21a2b	Merge branch 'master' of github.com:justmedude/librenms	2016-06-14 18:22:07 -07:00
Vikram Adukia	5b9fb7db5a	start of adding basic support for the servertech sentry4 cdus ... I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.	2016-06-14 18:21:16 -07:00
Vikram Adukia	5e586040f3	start of adding basic support for the servertech sentry4 cdus	2016-06-14 18:19:53 -07:00
Søren Rosiak	3d8e75a216	Merge pull request #3652 from laf/issue-3544	2016-06-14 19:01:28 +02:00
Søren Rosiak	47741d891a	Merge pull request #3651 from laf/issue-3650	2016-06-14 19:00:59 +02:00
Søren Rosiak	366c43c1ae	Merge pull request #3645 from laf/issue-3633	2016-06-14 19:00:23 +02:00
Neil Lathwood	1b97411b40	Merge pull request #3655 from BarbarossaTM/discovery-fix ... Discovery fix	2016-06-14 14:00:12 +01:00
Maximilian Wilhelm	d53619ab4f	Fix database update queries in discovery.php. ... Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>	2016-06-14 13:13:24 +02:00
Maximilian Wilhelm	2fd9879278	Fix database query for known ports in discovery. ... While adding configurable port mapping in 2c9df26bbf I broke the query for known ports from the database so discovery.php considered ALL ports to be new every time it ran. Whoops. This went undetected for so long as there is a unique constraint on the ports table (device_id+ifIndex) which prevented ports from being added again and again. Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>	2016-06-14 13:12:12 +02:00
laf	1d678642b3	Updated docs and webui	2016-06-13 22:04:51 +00:00
laf	ea5512ffe6	Added location to be available in alerts template	2016-06-13 22:03:17 +00:00
laf	ed0479a2f3	Fixed the create new alert template / edit template bug	2016-06-13 19:44:14 +00:00
Neil Lathwood	779c4dee71	Merge pull request #3646 from murrant/edit-port-missing	2016-06-13 08:03:41 +01:00
Tony Murray	173336c76b	Only display when it is not set to the default setting.	2016-06-12 21:36:04 -05:00
Tony Murray	55f8576973	Fix custom port not showing on the device edit page	2016-06-12 21:23:21 -05:00
laf	e1ee0df0fa	Updated poweralert sensors divisor to 1 from 10	2016-06-12 20:13:44 +00:00