Commit Graph

10052 Commits

Author SHA1 Message Date
Eldon Koyle
22a81e0424 Use unique id for bootgrid table in alert widget so there can be more than one 2016-02-17 15:04:50 -07:00
Daniel Preussker
b5ebaf3135 Merge pull request #3019 from pblasquez/pblasquez-unauth_graph
skip graph.php authentication if configured
2016-02-17 21:47:33 +00:00
pblasquez
591c40a6f4 Update defaults.inc.php 2016-02-17 13:10:07 -08:00
pblasquez
823177e877 Update graph.php 2016-02-17 13:06:46 -08:00
Neil Lathwood
9a5b1a6b6d Merge pull request #3028 from laf/bgp-fix2
Fixing cisco bgp polling issue for data
2016-02-17 16:33:08 +00:00
laf
fc8b4b4068 Fix cisco snmp query 2016-02-17 16:30:22 +00:00
laf
3c35b0e336 Fix cisco snmp query 2016-02-17 16:17:01 +00:00
laf
27306fbb6b Fix cisco snmp query 2016-02-17 16:09:09 +00:00
Neil Lathwood
c72d8cca84 Merge pull request #3020 from murrant/patch-1
Properly parse sysDescr for Unifi Switches
2016-02-17 14:18:42 +00:00
Daniel Preussker
d09a904764 Merge pull request #3026 from librenms/revert-2979-sanity
Revert "[WIP] Sanity!"
2016-02-17 14:00:34 +00:00
Daniel Preussker
731e43bc66 Revert "[WIP] Sanity!" 2016-02-17 13:59:58 +00:00
Neil Lathwood
2120875a3d Merge pull request #3024 from laf/issue-3015
Removed content-type for ajax_form
2016-02-17 13:32:16 +00:00
laf
371f561b9e Removed content-type 2016-02-17 13:31:28 +00:00
Tony Murray
0c2abe5b77 Properly parse sysDescr fro Unifi Switches
Fix issue #2759
I only tested the regex, not against hardware as I don't have access to any.
2016-02-16 22:51:42 -06:00
pblasquez
adedd872ae Update graph.php 2016-02-16 19:46:22 -08:00
Paul Gear
1a905f2a1a Merge pull request #2990 from laf/issue-2613
Reverted fortigate cpu update from Dec 2015
2016-02-17 07:53:44 +10:00
Neil Lathwood
633ac101eb Merge pull request #2979 from f0o/sanity
[WIP] Sanity!
2016-02-16 21:44:10 +00:00
Daniel Preussker
736b0a0ffd Merge pull request #3011 from laf/bgp-fix
Fixed ipv6 bgp polling on junos
2016-02-16 10:02:11 +00:00
laf
cf54684279 Fixed ipv6 bgp polling on junos 2016-02-16 09:48:20 +00:00
Daniel Preussker
2e0c66eb40 Merge pull request #3009 from Morrvick/patch-1
Ignore devices that do not provide an uptime statistic.
2016-02-16 09:34:22 +00:00
Daniel Preussker
7e215ad9b8 Merge pull request #3010 from laf/bgp-fix
Fixed ipv6 bgp polling on junos
2016-02-16 09:25:41 +00:00
laf
f1a3b9da34 Fixed ipv6 bgp polling on junos 2016-02-16 09:17:59 +00:00
Morrvick
7aa2b1fa28 Ignore devices that do not provide an uptime statistic.
Hundreds of my devices do not supply an uptime in their data.  This causes lots of useless warnings in my availability map.  This tweak corrects that.
2016-02-15 11:44:05 -06:00
Neil Lathwood
16cbd3261c Merge pull request #3007 from pheinrichs/master
Contributor Agreement
2016-02-15 15:13:21 +00:00
Paul Heinrichs
99d14fafca I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-02-15 09:24:37 -05:00
Neil Lathwood
a572bc4578 Merge pull request #2820 from HenocKA/issue280
Discoverying and polling vrf #Issue280
2016-02-15 09:53:53 +00:00
HenocKA
0161260b17 merging 2016-02-13 21:48:26 +01:00
Neil Lathwood
8a3c685997 Merge pull request #2999 from Rosiak/issue-2934
Remove unused code
2016-02-13 20:47:40 +00:00
Rosiak
d82ca08bc2 Remove unused code
#2934
2016-02-13 21:44:24 +01:00
Søren Rosiak
9790b97b2d Merge pull request #2991 from laf/issue-2983 2016-02-13 20:52:47 +01:00
Neil Lathwood
0836c03e3b Merge pull request #2998 from Rosiak/issue-2993 2016-02-13 19:49:38 +00:00
Rosiak
f6b97248a1 Basic Barracuda Spam Firewall Support
#2993
2016-02-13 20:45:42 +01:00
Neil Lathwood
2e7fab42b7 Merge pull request #2994 from murrant/config_diff
Oxidized config diffs
2016-02-13 18:27:11 +00:00
Tony Murray
916c568ce7 Add GeSHi GPv2+ acknowledgement. 2016-02-13 12:18:55 -06:00
Tony Murray
f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
Tony Murray
564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
Tony Murray
31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
Tony Murray
cc344bf3c3 Use Oxidized's built in diffing capability. Drops the need for xdiff and one http call. 2016-02-12 14:21:55 -06:00
Tony Murray
28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
Tony Murray
aa9d4798dc Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.
Update the documentation a bit.

Issue #2812
2016-02-12 10:23:49 -06:00
laf
9059b687b2 Updated FortiOS to pick up all FortiManagers + updated rewrite for hardware 2016-02-12 14:17:57 +00:00
laf
444d6a7a8c Reverted fortigate cpu update from Dec 2015 2016-02-12 13:38:22 +00:00
Daniel Preussker
2500cfd424 Merge pull request #2985 from laf/more-validate
Added rrdcached check, disable_function check and more binary location checks
2016-02-12 08:15:25 +00:00
Daniel Preussker
e064d7ddff Merge pull request #2988 from laf/issue-2947
Added show/hide line numbers button to show config page
2016-02-12 08:12:41 +00:00
Daniel Preussker
42bb92ca93 Merge pull request #2986 from laf/issue-2984
Added missing from email settings field
2016-02-12 07:58:19 +00:00
Daniel Preussker
8315031804 Merge pull request #2987 from laf/issue-2960
Removed old alerting dbInsert code
2016-02-12 07:57:25 +00:00
laf
6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
laf
8c53a94233 Removed old alerting dbInsert code 2016-02-11 22:27:36 +00:00
laf
4aaf4d8a7b Added missing from email settings field 2016-02-11 22:11:07 +00:00
Søren Rosiak
6456bc4fec Merge pull request #2967 from laf/issue-2870 2016-02-11 22:59:06 +01:00