Commit Graph

3949 Commits

Author SHA1 Message Date
Paul Gear
91c2a5a628 Merge pull request #311 from laf/issue-laf-50
Updated scripts to remove observium name + use new version of check_mk
2014-11-12 19:27:11 +10:00
Paul Gear
e77c4ce61b Merge pull request #346 from laf/issue-laf-84
Added a preg_replace to get rid of snmp errors for bgp graphs
2014-11-12 19:14:25 +10:00
Paul Gear
de52585796 Merge pull request #335 from laf/issue-laf-74
Added bgp peers route to display all bgp peers
2014-11-12 19:13:12 +10:00
Paul Gear
3f29197f4b Merge pull request #334 from laf/issue-laf-73
Fixed BGP session count to exclude sessions that no longer have a device associated
2014-11-12 19:10:16 +10:00
Neil Lathwood
47e52d9eb1 Merge pull request #347 from toyowheelin/issue-131
issue-131
2014-11-07 17:21:57 +00:00
Greg
6361e183e0 This is a workaround to show d-link port channel devices. Thanks to lafwood for this. 2014-11-07 08:50:59 -08:00
laf
3f2b39550f Added a preg_replace to get rid of snmp errors 2014-11-06 21:12:42 +00:00
Neil Lathwood
638ea2fa64 Merge pull request #345 from f0o/patch-2
Update INSTALL_RHEL.md
2014-11-06 08:01:00 +00:00
Daniel Preussker
590053d126 Update INSTALL_RHEL.md
Added nginx+php-fpm instructions
2014-11-06 07:57:12 +00:00
Neil Lathwood
296bc95de0 Merge pull request #344 from laf/issue-laf-83
Added more js libraries to scrutinizer exclude
2014-11-03 19:13:44 +00:00
Neil Lathwood
4e035751ba Merge pull request #343 from elbuit/issue-341
Add option to clean old perf_times table entries #341
2014-11-03 18:50:22 +00:00
laf
322df1b571 Added more js libraries to scrutinizer exclude 2014-11-03 18:40:06 +00:00
Toni Cunyat
5b6ae9f988 Add option to clean old perf_times table entries #341 2014-11-03 18:25:45 +01:00
Neil Lathwood
30256d60cb Merge pull request #340 from elbuit/issue-338
Alcatel-Lucent OmniSwich (Aruba rebranded) is detected like AOS device ...
2014-11-03 16:29:51 +00:00
Neil Lathwood
d780fc060a Merge pull request #342 from elbuit/master
I agree to the conditions of the Contributor Agreement contained in doc/...
2014-11-03 16:26:18 +00:00
Toni Cunyat
d1bea37236 I agree to the conditions of the Contributor Agreement contained in doc/CONTRIBUTING.md 2014-11-03 16:55:01 +01:00
Toni Cunyat
eefb5eb974 Alcatel-Lucent OmniSwich (Aruba rebranded) is detected like AOS device #338 2014-11-03 16:40:20 +01:00
Neil Lathwood
9a3d5bc560 Merge pull request #333 from laf/issue-laf-80
Updated arp search page to use new MySQL pagination
2014-10-30 10:26:04 +00:00
Neil Lathwood
c4e7da9f10 Merge pull request #332 from laf/issue-laf-77
Added function to generate pagination for mysql results
2014-10-30 10:25:56 +00:00
laf
b4b160ead4 Updates from scrutinizer recommendations 2014-10-29 21:30:35 +00:00
laf
a792d10a76 Fixed BGP session count to exclude sessions that no longer have a device associated 2014-10-29 19:52:50 +00:00
laf
fd3ecdf42f Updated arp search page to use new MySQL pagination 2014-10-29 18:34:26 +00:00
laf
9eafe9af2a Added function to generate pagination for mysql results 2014-10-29 18:30:42 +00:00
Neil Lathwood
b3d9bf03a4 Merge pull request #331 from laf/issue-laf-78
Moved the placement of datetimer picker js library in index.php
2014-10-29 11:11:13 +00:00
laf
db7b613cb7 Moved the placement of datetimer picker js library in index.php 2014-10-29 10:48:18 +00:00
Paul Gear
2d4217995e Merge pull request #309 from laf/issue-laf-55
Removed --no-edit for git pull, not a valid command before git 1.7.10
2014-10-28 08:44:13 +10:00
Paul Gear
8ab0bcb324 Remove unused jqplot functions (was PR#306) 2014-10-28 08:39:19 +10:00
Paul Gear
f7821198da Updated graphs page to use bootstrap datetimepicker PR#306
- Separated from removal of jqplot code
- Merge remote-tracking branch 'laf/issue-laf-52'

Conflicts:
	html/index.php
2014-10-28 08:37:49 +10:00
Paul Gear
ce62a1d324 Merge pull request #329 from laf/issue-laf-76
Added link to changelog
2014-10-28 07:58:21 +10:00
Paul Gear
2fbdfe4cfd Integrate moment PR#308 2014-10-28 07:47:52 +10:00
Paul Gear
736888ee8a Integrate bootstrap datetimepicker PR#308 2014-10-28 07:46:08 +10:00
laf
3ede85267b Added changelog as a hyperlink on version number as well 2014-10-27 21:03:59 +00:00
laf
ede8c1d888 Added link to changelog 2014-10-27 20:55:48 +00:00
Paul Gear
99341e5a90 Documentation refresh with focus on contribution guidelines 2014-10-28 06:53:25 +10:00
Paul Gear
24e20bb847 Merge commit 'a07849b73a0c73c2bcee75d4e1649db239a8b93f' as 'html/js/moment' 2014-10-28 05:59:36 +10:00
Paul Gear
a07849b73a Squashed 'html/js/moment/' content from commit d5ff2cf
git-subtree-dir: html/js/moment
git-subtree-split: d5ff2cfc0000010c37cc5ebe75a5905c943368e4
2014-10-28 05:59:36 +10:00
Paul Gear
75c4ce4edb Genericise Makefile and do not ignore it 2014-10-28 05:56:36 +10:00
laf
3e4a494047 Added bgp peers route to display all bgp peers 2014-10-26 15:48:51 +00:00
Paul Gear
0d704de9b0 Merge commit 'cc43b3595b596d50b7891ad8cbf0830c5c92f609' as 'html/js/datetime' 2014-10-25 09:38:01 +10:00
Paul Gear
cc43b3595b Squashed 'html/js/datetime/' content from commit 5b3fc61
git-subtree-dir: html/js/datetime
git-subtree-split: 5b3fc61571b126116aafbcd5cb1a7aefb41f9d42
2014-10-25 09:38:01 +10:00
Paul Gear
f7892d0c5a A little note for later 2014-10-25 09:16:20 +10:00
Paul Gear
b5136b444c Remove unused function; make it clearer that _json_format is not used in PHP 5.4 & later 2014-10-25 09:16:07 +10:00
Paul Gear
208ac0b104 Merge remote-tracking branch 'laf/issue-laf-47' 2014-10-25 08:49:28 +10:00
Paul Gear
0131e8e7c3 Fix example community string 2014-10-25 08:44:51 +10:00
Paul Gear
1a5544116f Use $() consistently; fail if dirname or cd fails 2014-10-25 08:41:53 +10:00
Paul Gear
70bb420fe7 Use consistent spacing 2014-10-25 08:40:42 +10:00
Paul Gear
5564a581da Merge pull request #328 from laf/issue-laf-72
Fixes the fact daily.sh does not run outside of the install directory
2014-10-24 08:38:51 +10:00
laf
aa5d7f488c Fixes the fact daily.sh does not run outside of the install directory 2014-10-23 21:39:16 +01:00
Paul Gear
d8b0d8224a Merge pull request #324 from laf/issue-laf-69
Added additional text to email alerts that will show icmp or snmp when a down alert is generated
2014-10-22 22:03:48 +10:00
Paul Gear
fd1d972640 Merge pull request #323 from laf/issue-laf-68
Added options for fping to retry and timeout
2014-10-22 22:02:56 +10:00