Commit Graph

7730 Commits

Author SHA1 Message Date
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
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
Neil Lathwood
607912c711 Merge pull request #1796 from arjitc/patch-10
Display a message if no Group is found
2015-08-30 20:05:27 +01:00
Neil Lathwood
cce50d0588 Merge pull request #1801 from arjitc/patch-14
UI changes to preferences.inc.php
2015-08-30 20:03:00 +01:00
Daniel Preussker
4c0df755c8 Merge pull request #1810 from paulgear/menubar-20150830
Move packages to overview menu
2015-08-30 18:28:27 +01:00
Paul Gear
98d99a65b7 Merge pull request #1807 from f0o/issue-1537
Added user defined titles for alert templates
2015-08-30 18:20:56 +01:00
f0o
bea0587634
Fixed edit-javascript 2015-08-30 18:05:57 +01:00
f0o
a833d46d4d
Add placehoders to custom titles 2015-08-30 18:02:29 +01:00
Paul Gear
b0acb26f11 Move packages to the right place 2015-08-30 17:59:05 +01:00
Paul Gear
937d598564 Move packages into overview menu 2015-08-30 17:48:45 +01:00
f0o
68f9812b9d
Added JavaScript to modal 2015-08-30 17:27:31 +01:00
f0o
9057d48273
Fix default template assignment 2015-08-30 17:07:02 +01:00
f0o
ac7d0c9420
Added user defined titles for alert templates 2015-08-30 16:53:34 +01:00
Daniel Preussker
1f97a9d62c Merge pull request #1806 from Rosiak/issue-1693
Docs Correction
2015-08-30 16:17:33 +01:00
Rosiak
e9ca3d4d70 Docs Correction 2015-08-30 16:16:18 +01:00
Neil Lathwood
629d4f5dda Merge pull request #1805 from arjitc/patch-18
UI changes
2015-08-30 15:13:21 +01:00
Daniel Preussker
32cf735989 Merge pull request #1803 from arjitc/patch-16
Added page title
2015-08-29 20:31:54 +01:00
Daniel Preussker
e14c861ac3 Merge pull request #1804 from arjitc/patch-17
Added title and page header
2015-08-29 20:31:25 +01:00
Arjit Chaudhary
8d0f62f1d0 UI changes
Screenshot http://i.imgur.com/tObHk8F.png
2015-08-29 22:52:09 +05:30
Arjit Chaudhary
cba5e03817 Added title and page header 2015-08-29 22:44:44 +05:30
Arjit Chaudhary
6febdbecd1 Updated indents, pulled Line #24 into the if { } 2015-08-29 22:42:04 +05:30
Daniel Preussker
88de45160c Merge pull request #1802 from arjitc/patch-15
Added header to authlog page
2015-08-29 17:09:05 +00:00
Arjit Chaudhary
eb70f3e089 Added page title 2015-08-29 22:37:27 +05:30
Arjit Chaudhary
1f8c48ac66 Fixed :) 2015-08-29 22:35:13 +05:30
Daniel Preussker
a5f9c104f2 Merge pull request #1800 from arjitc/patch-13
Add page title for poll-log.inc.php
2015-08-29 16:59:20 +00:00
Arjit Chaudhary
c69596314a Added header to authlog page 2015-08-29 22:10:19 +05:30
Arjit Chaudhary
9488ef63a9 UI changes to preferences.inc.php
Screenshot: http://i.imgur.com/QaobUQv.png
2015-08-29 21:44:29 +05:30
Arjit Chaudhary
419336a7a2 Add page title for poll-log.inc.php 2015-08-29 21:36:19 +05:30
Arjit Chaudhary
6b9315bdce Fixed indents and coding style. 2015-08-29 21:27:11 +05:30
Neil Lathwood
564ded79c3 Merge pull request #1798 from arjitc/patch-12
Unify UI as in add device..
2015-08-29 16:45:30 +01:00
Neil Lathwood
65d6f6fd14 Merge pull request #1797 from arjitc/patch-11
Minor UI changes
2015-08-29 16:44:52 +01:00
Arjit Chaudhary
7efbb07695 Unify UI as in add device..
Screenshot: http://i.imgur.com/TgpwIXR.png
2015-08-29 19:00:50 +05:30
Arjit Chaudhary
55e9457309 Minor UI changes
Screenshot: http://i.imgur.com/PwmyNNG.png
2015-08-29 18:50:57 +05:30
Arjit Chaudhary
35c7c6ab1b Display a message if no Group is found
Screenshot: http://i.imgur.com/ac9okNO.png
2015-08-29 18:46:14 +05:30
Daniel Preussker
9073cf53b5 Merge pull request #1794 from spinza/issue-1793
Remove milliseconds from datetime in poller-service queries to avoid triggering MySQLdb bug
2015-08-29 05:17:49 +00:00
Louis Rossouw
408b8dd855 Fix to avoid triggering this bug: http://sourceforge.net/p/mysql-python/bugs/325/
We remove miliseconds from datetime.
2015-08-29 02:41:47 +02:00
Daniel Preussker
88fbb6ecc9 Merge pull request #1791 from richardlawley/fixdefaultconfig
Fix broken repeated RRA config
2015-08-28 13:48:45 +00:00
Richard Lawley
1384505d1c Fix broken repeated RRA config
Since d8693f0 the RRA config section repeats in the file - the second contains MAX instead of the first MIN definition.
2015-08-28 14:38:57 +01:00
Daniel Preussker
2688fdbf7b Merge pull request #1781 from laf/docs1
Added docs for device groups and tried to make sure old alerting docs are clear
2015-08-28 09:03:23 +00:00
laf
950b58ba65 Removed strikethrough 2015-08-28 09:02:36 +00:00
Daniel Preussker
8e19a57f15 Merge pull request #1782 from laf/issue-1779
Added dnos to this, does not seem worth duplicating the code for another os
2015-08-28 09:00:14 +00:00
Neil Lathwood
1574e1884d Merge pull request #1787 from vitalisator/issue-1754
add arrows to edges
2015-08-28 09:59:41 +01:00
laf
813b518abf Renamed file 2015-08-28 08:58:06 +00:00
laf
08368f92f2 Moved strikeout to outside code block 2015-08-28 08:55:46 +00:00
Neil Lathwood
3df786c500 Merge pull request #1788 from f0o/issue-1785
Added option to display errored ports in device summary
2015-08-28 09:53:56 +01:00
f0o
a1f9fe19fa
Added option to display errored ports in device summary 2015-08-28 09:24:08 +01:00
vitalisator
5fe78afec6 add arrows to edges 2015-08-28 08:54:35 +02:00
Daniel Preussker
5d337e593f Merge pull request #1784 from laf/issue-1761
Added check for zywall using OID
2015-08-27 21:07:41 +00:00
laf
2dc98ce2f7 Added check for zywall using OID 2015-08-27 21:01:31 +00:00