Commit Graph

4226 Commits

Author SHA1 Message Date
laf
814b289799 Small fix to get all triggered alerts and ui update 2015-02-26 12:24:37 +00:00
laf
d8cf061a30 Added alert details to alert page 2015-02-26 12:08:42 +00:00
Neil Lathwood
b9e37d44c3 Merge pull request #514 from laf/issue-laf-126
Clear out tags before adding current ones
2015-02-26 10:26:11 +00:00
Neil Lathwood
aa5d1e10a1 Clear out tags before adding current ones 2015-02-26 10:17:27 +00:00
Neil Lathwood
450467fa35 Merge pull request #513 from laf/issue-laf-125
This should not be zero by default as that means alerts will be triggered constantly. Defaulting to 300
2015-02-26 01:33:50 +00:00
Neil Lathwood
a1dad30faf Merge pull request #512 from laf/issue-laf-124
Added fix for <> being used in alert rules
2015-02-26 01:25:54 +00:00
Neil Lathwood
d15d228276 This should not be zero by default as that means alerts will be triggered constantly. Defaulting to 300 2015-02-26 01:25:25 +00:00
Neil Lathwood
afdc291970 Added fix for <> being used in alert rules 2015-02-26 01:14:52 +00:00
Neil Lathwood
e56a4af8f7 Merge pull request #510 from laf/issue-laf-123
Fixed event.Default which should be e.Default
2015-02-25 21:30:24 +00:00
Neil Lathwood
512334c7d2 Fixed event.Default which should be e.Default 2015-02-25 20:38:38 +00:00
Neil Lathwood
d7c86cfc40 Merge pull request #506 from laf/master
Fixed array setting
2015-02-23 16:48:30 +00:00
laf
7edd05d6d1 Fixed array setting 2015-02-23 16:47:34 +00:00
Neil Lathwood
1f82280a60 Merge pull request #504 from laf/issue-laf-122
Shrunk the print_optionbar wells so they take up less space
2015-02-22 21:50:10 +00:00
laf
4c77b9a7c0 Shrunk the print_optionbar wells so they take up less space 2015-02-22 21:39:00 +00:00
Neil Lathwood
ef43fc8459 Merge pull request #503 from laf/issue-laf-121
Added logout icon
2015-02-22 21:26:59 +00:00
laf
e34917977d Added logout icon 2015-02-22 21:15:09 +00:00
Neil Lathwood
8b719b6c9a Merge pull request #502 from laf/scrut-major
Fixed some scrut major issues
2015-02-22 19:50:58 +00:00
Neil Lathwood
cd43e11032 Fixed some scrut major issues 2015-02-22 19:28:09 +00:00
Neil Lathwood
2e7887f115 Merge pull request #501 from laf/scrut-performance
Fixed the performance issues in scrut
2015-02-22 18:16:10 +00:00
Neil Lathwood
ff3558e7b9 Fixed spelling mistake 2015-02-22 17:53:25 +00:00
Neil Lathwood
6b985a2e59 Merge pull request #495 from Rosiak/master
Alert Log Creation
2015-02-22 17:52:21 +00:00
Neil Lathwood
2ef0cf8b80 Fixed the performance issues in scrut 2015-02-22 17:27:22 +00:00
Neil Lathwood
63f7e761e9 Merge pull request #500 from nicearma/license
I agree to the conditions of the Contributor Agreement of LibreNMS
2015-02-22 17:10:51 +00:00
nicearma
360ba27d9d I agree to the conditions of the Contributor Agreement 2015-02-22 18:07:07 +01:00
Neil Lathwood
9a643b3a35 Merge pull request #498 from laf/scrut-coding-style
Fixed the scrut coding style issues
2015-02-22 16:58:50 +00:00
Neil Lathwood
a4d3c8709d Fixed the scrut coding style issues 2015-02-22 16:45:40 +00:00
Søren Rosiak
97c244433a Alert Log Creation
- Creation of a alert log page
- Code from html/pages/eventlog.inc.php
2015-02-22 10:49:26 +01:00
Neil Lathwood
3045835093 Merge pull request #494 from Rosiak/master
Alerts submenu change.
2015-02-22 09:25:55 +00:00
Søren Rosiak
b68cfec27b Alerts subment change.
- Make alerts submenu entry available for non-admins too.
2015-02-22 10:15:32 +01:00
Neil Lathwood
8bb84755fb Merge pull request #489 from Rosiak/master
Menubar Change - Make Alert Submenu
2015-02-21 19:09:55 +00:00
Søren Rosiak
82b5805643 Update print-menubar.php
Add alerts sub-menu entry, based on feedback from lafwood.
2015-02-21 19:47:52 +01:00
Neil Lathwood
c01cacaaea Merge pull request #493 from SaaldjorMike/typo-1
Fixed typo in UI
2015-02-21 16:37:15 +00:00
Neil Lathwood
df1cd30f8c Merge pull request #492 from SaaldjorMike/ciscosb-2
Added fetching of CPU usage on Cisco SB
2015-02-21 16:36:19 +00:00
Mike Rostermund
5ddf177103 Added fetching of CPU usage on Cisco SB 2015-02-21 05:09:07 -08:00
Mike Rostermund
def585b784 Fixed typo in UI 2015-02-21 04:51:53 -08:00
Neil Lathwood
8b556f3caa Merge pull request #491 from f0o/issue-490
Check if alert-rule is disabled prior dispatch.
2015-02-21 10:46:25 +00:00
f0o
f7ba23ecf0 Check if alert-rule is disabled prior dispatch.
Fixes #490
2015-02-21 06:58:15 +00:00
Søren Rosiak
a3edd69d54 Menubar Change - Make Alert Submenu
- Change the "overview" of alerts info, into a submenu in "overview".
2015-02-20 14:25:36 +01:00
Neil Lathwood
5de4083dad Merge pull request #488 from Rosiak/master
Change Default Page View
2015-02-20 08:04:29 +00:00
Rosiak
8c2f629e14 Change Default Page View
- Add print-alerts code
 - Change the view of the lower part of the front page from 12 columns
to 2 x 6 columns
 - Add alertlog entries to the new column
2015-02-20 00:33:49 +01:00
Neil Lathwood
cc60ea6ea2 Merge pull request #487 from SaaldjorMike/ciscosb-1
Added support for additional Cisco SB units
2015-02-19 22:24:39 +00:00
Neil Lathwood
9c6c61bef8 Merge pull request #486 from SaaldjorMike/accept-license
I agree to the conditions of the Contributor Agreement contained in doc/...
2015-02-19 22:18:26 +00:00
Mike Rostermund
a01721f1fb Added support for additional Cisco SB units 2015-02-19 23:05:10 +01:00
Mike Rostermund
9df9111f35 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-02-19 22:54:33 +01:00
Neil Lathwood
60560d1a3d Merge pull request #485 from Rosiak/master
Small visual change to print-alerts.php
2015-02-19 17:29:09 +00:00
Rosiak
c5e95baa9b Small visual change to print-alerts.php
- Prints a link to the device instead of just text.
- Prints rule name instead of definition. Definition will appear if you
hover the mouse over the rule name.
2015-02-19 17:50:41 +01:00
Neil Lathwood
909d16699d Merge pull request #482 from laf/issue-481
Updated files pointing to invalid tables
2015-02-19 00:50:23 +00:00
Neil Lathwood
2159fd48fe Updated files pointing to invalid tables 2015-02-18 21:31:01 +00:00
Neil Lathwood
5e9e859272 Merge pull request #480 from laf/issue-479
Move the $now variable to where it is needed
2015-02-18 18:46:01 +00:00
Neil Lathwood
a507ac2479 Move the \$now variable to where it is needed 2015-02-18 18:34:57 +00:00