Commit Graph
17185 Commits
Author SHA1 Message Date
Neil Lathwood bc3916df2c Merge pull request #1829 from f0o/mysql-lock-release
Add another safety-net to remove locks if the execution of poller/disco gets aborted or killed
2015-09-01 16:06:16 +01:00
Daniel Preussker 614e45f73c Merge pull request #1830 from arjitc/patch-20
Added page title and header
2015-09-01 13:53:34 +00:00
Daniel Preussker e9bca4554f Merge pull request #1828 from arjitc/patch-19
Minor change to poll log icon
2015-09-01 13:52:59 +00:00
Arjit Chaudhary 4ddbcfe7e4 Added page title and header 2015-09-01 19:21:49 +05:30
f0o 26554221fb Add another safety-net to remove locks if the execution of poller/disco gets aborted or killed 2015-09-01 14:49:55 +01:00
Neil Lathwood c14ecf9449 Merge pull request #1826 from f0o/mysql-lock-release
Pause polling and discovery if there's an update-lock
2015-09-01 14:44:59 +01:00
Arjit Chaudhary 61b2f1a171 Minor change to poll log icon
Seems more apt for the log icon, Screenshot: http://i.imgur.com/YhS0iZj.png
2015-09-01 19:14:18 +05:30
Daniel Preussker f22b1a989e Merge pull request #1827 from tuxis-ie/fix-bugs-1825
* Fix bug introduced in #1825 (vmid != instance)
2015-09-01 13:39:24 +00:00
Mark Schouten 1abf7d89f8 * Fix bug introduced in #1825 (vmid != instance)
* Fix if-then-else-formatting
2015-09-01 15:36:08 +02:00
f0o e11f613bdd Pause polling and discovery if there's an update-lock 2015-09-01 14:14:50 +01:00
Neil Lathwood cc092e7771 Merge pull request #1825 from f0o/issue-1824
Reformat proxmox application HTML
2015-09-01 14:11:32 +01:00
f0o 8b820fe316 Reformat proxmox application HTML 2015-09-01 13:41:03 +01:00
Daniel Preussker b9bf61bbf6 Merge pull request #1789 from tuxis-ie/add-proxmox-app
Add proxmox monitoring.
2015-09-01 11:53:35 +00:00
Neil Lathwood ce3dfd6d42 Merge pull request #1822 from f0o/mysql-lock-release
Release MySQL locks when they are not used anymore
2015-09-01 12:47:53 +01:00
f0o ccfdddeae6 Added lock release for schema updates even if it gets aborted or received sigterm 2015-09-01 12:41:38 +01:00
Mark Schouten a608faf06b Add DocBlock 2015-09-01 12:22:54 +02:00
f0o b0a302bf77 Release MySQL locks when they are not used anymore 2015-09-01 11:10:56 +01:00
Neil Lathwood 48bfc1e2a5 Merge pull request #1809 from Rosiak/issue-1808
Add Varnish Docs
2015-09-01 10:58:00 +01:00
Neil Lathwood 2ec4ffbd0f Merge pull request #1818 from f0o/cron-fix
Remove 'sh' from cron as we now use 'bash'
2015-09-01 10:57:34 +01:00
Neil Lathwood 04bb652e06 Merge pull request #1817 from f0o/issue-1770
Only process followups if there are any results
2015-09-01 09:38:55 +01:00
f0o d337ea052b Remove 'sh' from cron as we now use 'bash' 2015-09-01 09:22:09 +01:00
Mark Schouten e5281fa49d Remove useless global calls and add docblocks 2015-09-01 10:14:15 +02:00
Mark Schouten bcca44b08e require_once, not include. And shift some HTML to the right 2015-09-01 10:01:39 +02:00
Daniel Preussker 8ade12ddc8 Merge pull request #1811 from laf/issue-1689
Ability to override the ports ifAlias
2015-09-01 07:27:53 +00:00
Daniel Preussker 03d1d84d10 Merge pull request #1815 from laf/issue-1790
Adds basic FortiOS support
2015-09-01 07:24:00 +00:00
Daniel Preussker 2c3dbbfc3d Merge pull request #1816 from laf/issue-1786
Fixed syslog and eventlog tables to be responsive
2015-09-01 07:22:38 +00:00
laf f132ec2c50 Fixed syslog and eventlog tables to be responsive 2015-08-31 21:33:57 +00:00
laf 79cbd51702 Updated sysObjectId 2015-08-31 21:21:36 +00:00
laf c708610c96 Added basic detection for FortiOS 2015-08-31 21:19:39 +00:00
laf 703bdf3717 http://en.community.dell.com/techcenter/networking/nms/f/4877/t/19583922 2015-08-31 21:18:49 +00:00
laf 3c577a2715 www.fortinet.com/sites/all/themes/fortinet/images/fortinet_logo.png 2015-08-31 21:18:19 +00:00
laf 6d39bb4f81 Added appliance logo - this is a copy of apps.png 2015-08-31 21:17:56 +00:00
laf e67f91c48e Added FortiOS definitions + appliance type 2015-08-31 21:17:34 +00:00
Daniel Preussker e01639f9ed Merge pull request #1814 from laf/issue-1795
Added mouseclick / mouseleave to stop map zooming around
2015-08-31 21:26:37 +01:00
laf ca3869f48b Added mouseclick / mouseleave to stop map zooming around 2015-08-31 19:10:53 +00:00
Mark Schouten 73e4dd178f Do not use var_isset and fix if-then-else-codestyle 2015-08-31 16:40:53 +02:00
Mark Schouten 8543ca3d46 Fix some if-else-codeblocks according to codingstyle 2015-08-31 16:36:00 +02:00
Mark Schouten 34abb859df Remove proxmox as a page and add is as an app. Also, this introduces actual working app_instance stuff into LibreNMS 2015-08-31 16:36:00 +02:00
Mark Schouten 45dd02d301 %s/mysql/proxmox/g 2015-08-31 16:36:00 +02:00
Mark Schouten f3211733cd Add missing SQL statement 2015-08-31 16:36:00 +02:00
Mark Schouten d704488413 Add documentation 2015-08-31 16:34:55 +02:00
Mark Schouten 822a93b509 Do not run the Proxmox-stuff unless it is explicitly enabled in the config 2015-08-31 16:34:55 +02:00
Mark Schouten fce9b44c32 Add licenses 2015-08-31 16:34:55 +02:00
Mark Schouten 1595f03568 Cleanup and show an app-page with the corresponding device 2015-08-31 16:34:55 +02:00
Mark Schouten a211b3706d We don't seem to need a multiplier here 2015-08-31 16:34:55 +02:00
Mark Schouten 0153ace2e7 Add SQL for proxmox 2015-08-31 16:34:55 +02:00
Mark Schouten bf913f5a3b Add initial support for Proxmox VM network traffic. [WIP] 2015-08-31 16:32:28 +02:00
Daniel Preussker 3798a0f569 Merge pull request #1812 from spinza/pollerserviceupstart
Change poller-service upstart script to wait before respawn and keep trying.
2015-08-31 06:43:42 +01:00
laf 0f9ac4afd1 Scrut fix 2015-08-30 15:09:54 -07:00
Louis Rossouw e55b1cb68f Change upstart script:
- Respawn and unlimited number of times
- Wait 60 seconds before restarting
Logic is to give whatever cause the process to fail some time to fix.  And to keep trying.
2015-08-31 00:04:26 +02:00