10028 Commits

Author SHA1 Message Date
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
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
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
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
16cbd3261c Merge pull request #3007 from pheinrichs/master
Contributor Agreement
2016-02-15 15:13:21 +00:00
99d14fafca I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-02-15 09:24:37 -05:00
a572bc4578 Merge pull request #2820 from HenocKA/issue280
Discoverying and polling vrf #Issue280
2016-02-15 09:53:53 +00:00
0161260b17 merging 2016-02-13 21:48:26 +01:00
8a3c685997 Merge pull request #2999 from Rosiak/issue-2934
Remove unused code
2016-02-13 20:47:40 +00:00
d82ca08bc2 Remove unused code
#2934
2016-02-13 21:44:24 +01:00
9790b97b2d Merge pull request #2991 from laf/issue-2983 2016-02-13 20:52:47 +01:00
0836c03e3b Merge pull request #2998 from Rosiak/issue-2993 2016-02-13 19:49:38 +00:00
f6b97248a1 Basic Barracuda Spam Firewall Support
#2993
2016-02-13 20:45:42 +01:00
2e7fab42b7 Merge pull request #2994 from murrant/config_diff
Oxidized config diffs
2016-02-13 18:27:11 +00:00
916c568ce7 Add GeSHi GPv2+ acknowledgement. 2016-02-13 12:18:55 -06:00
f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
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
28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
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
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
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
42bb92ca93 Merge pull request #2986 from laf/issue-2984
Added missing from email settings field
2016-02-12 07:58:19 +00:00
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
6456bc4fec Merge pull request #2967 from laf/issue-2870 2016-02-11 22:59:06 +01:00
a9e81c2bfb Merge pull request #2955 from arjitc/patch-24
Merge launch, SSH, telnet and settings into 1 dropdown
2016-02-11 21:43:26 +00:00
laf
0e83e14405 Added rrdcached check, disable_function check and more binary location checks 2016-02-11 21:26:06 +00:00
df0e34f2a0 Merge pull request #2982 from djvdorp/master
Add functions needed to Installation instructions and Support/FAQ
2016-02-11 20:54:15 +00:00
616820d938 Add functions needed to Support/FAQ 'Why do I not see any graphs?' 2016-02-11 16:51:49 +01:00
6b26795500 Add functions needed to Installation instructions for Debian Ubuntu and RHEL CentOS 2016-02-11 16:47:02 +01:00
3eddfd46bd Import GeSHi diff type. 2016-02-10 19:31:31 -06:00
9a2d22df0a Remove array_column() use, it requires php 5.5 2016-02-10 19:24:13 -06:00
0e8ea8b6b2 Mark displayed diffs. 2016-02-10 17:16:59 -06:00
9cca64de4c Merge pull request #2961 from pblasquez/pblasquez-application_json_patch
Missed one file for application/json headers
2016-02-10 21:27:52 +00:00
c53e4de20c Update ajax_setresolution.php 2016-02-10 13:22:22 -08:00
b5106f4e17 Generate and display diffs between versions. Clicking show diff generates a diff between the shown version and the selected version. 2016-02-10 14:51:40 -06:00
fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
6a51746bb7 bug correction 2016-02-10 17:45:05 +01:00
860dad81cb Merge pull request #2978 from librenms/revert-2976-sanity
Revert "Variable/Environment sanity"
2016-02-10 14:31:25 +00:00
2b55c06d9e Revert "Variable/Environment sanity" 2016-02-10 14:31:16 +00:00
25657881e7 Merge pull request #2976 from f0o/sanity
Variable/Environment sanity
2016-02-10 14:24:23 +00:00
f0o
8d9b522bdb Remove redundant calls 2016-02-10 13:54:22 +00:00
f0o
a6bca987bf Enforce sanity before returning from database 2016-02-10 13:52:43 +00:00