Commit Graph

4728 Commits

Author SHA1 Message Date
f0o
00954ff4d6 Force device_id of 0 for new alert-rules to use the maps. 2015-04-03 18:31:32 +00:00
f0o
ba99eb25a2 Device-Groups Draft 2015-04-03 18:22:29 +00:00
laf
ac4eba78e4 Added support for AirOS and AirFibre from UBNT 2015-04-03 18:59:58 +01:00
Daniel Preussker
dc6c166804 Merge pull request #720 from f0o/ack-hotfix
Hotfixes Alert-Acks for Worse/Better situations.
2015-04-03 14:20:40 +00:00
f0o
373243a19e Hotfixes Alert-Acks for Worse/Better situations. 2015-04-03 13:14:01 +00:00
Neil Lathwood
7f4c988391 Merge pull request #709 from Rosiak/master
FortiGate Minor Change
2015-04-02 21:36:24 +01:00
Søren Rosiak
eff1c34d8f Update fortigate.inc.php
-Another correction.
2015-04-02 22:17:53 +02:00
Daniel Preussker
11a107ea63 Merge pull request #717 from laf/css-fix
Fix for bad alignment in input boxes.
2015-04-02 20:09:11 +00:00
Daniel Preussker
fcd01254a1 Merge pull request #716 from laf/bootgrid-inventory
Updated inventory table to use bootgrid
2015-04-02 20:08:53 +00:00
laf
94d1c03ca9 Fix for bad alignment in input boxes. This is a hangup from an the old stylesheet. Not needed with bootstrap 2015-04-02 21:01:45 +01:00
laf
0b95062c88 Updated search box to fit in with design 2015-04-02 19:28:39 +01:00
laf
7b7165b876 Fixed scrut issues 2015-04-02 18:34:52 +01:00
laf
ca6c436cb7 Updated inventory table to use bootgrid 2015-04-02 18:05:24 +01:00
Daniel Preussker
1a8c76268c Merge pull request #713 from laf/apc-mib
Updated APC powernet mib
2015-04-02 16:47:39 +00:00
Daniel Preussker
9d457a5293 Merge pull request #715 from laf/alert-rule-fix
Updated the way the rule loop works
2015-04-02 16:47:21 +00:00
laf
469f5aa629 Updated the way the rule loop works 2015-04-02 16:19:30 +01:00
laf
9889ae5759 Updated APC powernet mib 2015-04-02 15:24:40 +01:00
Neil Lathwood
49babf77b8 Merge pull request #707 from Ultra2D/master
Add support for LDAP directories using member ...
2015-04-02 12:24:37 +01:00
Daniel Preussker
b0494dca9a Merge pull request #710 from Ultra2D/patch1
I agree to the conditions of the Contributor Agreement
2015-04-01 21:25:42 +02:00
Ultra2D
33f0290439 I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2015-04-01 21:03:41 +02:00
Søren Rosiak
a60eb07608 Update fortigate.inc.php
- Re-add the some of the old code to ensure backwards compatibility
2015-04-01 20:38:53 +02:00
Søren Rosiak
b689f7952d FortiGate Minor Change
- Add serial and hardware recognition
- Clean up code
2015-04-01 19:17:24 +02:00
Neil Lathwood
e2fe20b07a Merge pull request #708 from Rosiak/master
Detect Cisco ASA HW and OS Ver
2015-04-01 17:27:47 +01:00
Søren Rosiak
cda227bd51 Detect Cisco ASA HW and OS Ver
- Now detects Cisco ASA HW and OS Ver, somehow this went missing
- Code used from ciscowlc.inc.php, Copyright information included
- Tested against various 5505 and 5515 OS Versions.
2015-04-01 18:06:42 +02:00
Ultra2D
0ab454fefc Add support for LDAP directories using member in stead of memberUid and dn in stead of username for group members.
Used the same variables as Observium, see http://www.observium.org/wiki/Authentication_modules#OpenLDAP
2015-04-01 16:10:50 +02:00
Daniel Preussker
74badf86de Merge pull request #706 from laf/bootgrid-alert-log
Updated alertlog to use bootgrid
2015-04-01 10:24:54 +02:00
laf
272b8fc4ba Updated alertlog to use bootgrid 2015-04-01 00:21:56 +01:00
Paul Gear
ad5a6d9306 Merge pull request #705 from laf/snmp-fix
Added a hard limit for explode on oid
2015-04-01 08:01:06 +10:00
laf
192d1be102 Added a hard limit for explode on oid 2015-03-31 21:18:43 +01:00
Daniel Preussker
ff8308c2d8 Merge pull request #704 from laf/scrut
Always wondered why scrut complains about this code still!!
2015-03-31 20:48:19 +02:00
Daniel Preussker
9cb859f7c1 Merge pull request #693 from laf/bootgrid-alerts
Converted alerts table to use bootgrid
2015-03-31 20:47:55 +02:00
laf
33930376d9 Always wondered why scrut complains about this code still!! 2015-03-31 19:44:08 +01:00
Daniel Preussker
9bc3f0a350 Merge pull request #702 from laf/docs
Updated old email alerting doc to tell people to use new alerting doc
2015-03-31 20:17:57 +02:00
laf
2aa9f720bf Updated old email alerting doc to tell people to use new alerting doc 2015-03-31 19:04:28 +01:00
laf
85e83f5775 Updated alerts table to show status messages 2015-03-31 18:47:10 +01:00
Daniel Preussker
0cba57ee32 Merge pull request #701 from laf/themes
Added mono theme - dark nav with white icons
2015-03-31 19:12:30 +02:00
laf
9e18ce34d2 Added mono theme - dark nav with white icons 2015-03-31 18:08:13 +01:00
Daniel Preussker
7764bddd91 Merge pull request #700 from laf/footer
Updated footer link to use variable
2015-03-31 18:58:29 +02:00
Daniel Preussker
137ee99575 Merge pull request #699 from laf/makefile
Updated Makefile for font-awesome and vis
2015-03-31 18:57:25 +02:00
laf
689f404d47 Updated footer link to use variable 2015-03-31 17:45:28 +01:00
laf
213b261908 Updated Makefile for font-awesome and vis 2015-03-31 17:33:42 +01:00
Daniel Preussker
7fdd267bfc Merge pull request #698 from Rosiak/master
Fix BGP Internal Icon
2015-03-31 17:26:08 +02:00
Neil Lathwood
70ca7f9a43 Merge pull request #696 from paulgear/master
Add separate Makefile entries for subtree merges
2015-03-31 14:05:12 +01:00
Søren Rosiak
debf396081 Fix BGP Internal Icon
- Make black instead of white, icon is not visible when white.
2015-03-31 15:03:39 +02:00
Paul Gear
f4fa655846 Merge branch 'master' of git://github.com/librenms/librenms 2015-03-31 22:34:12 +10:00
Paul Gear
1c4326111f Split out subtree merges into their own Makefile entries 2015-03-31 22:34:04 +10:00
Neil Lathwood
6b2e11dca7 Merge pull request #682 from laf/font-awesome-2-lib
Added Font awesome to lib via subtree
2015-03-31 13:32:25 +01:00
Paul Gear
dc5cfda4ad Merge pull request #683 from laf/font-awesome-2-webui
WebUI update to support dark / light theme - dark is default
2015-03-31 22:25:56 +10:00
Daniel Preussker
3db6596330 Merge pull request #690 from laf/issue-666
Made poller message box a link to /poll-log/
2015-03-31 14:14:47 +02:00
Daniel Preussker
a62256311a Merge pull request #691 from laf/issue-667
Updated ipsec polling to clean up data and check before inserting
2015-03-31 14:14:06 +02:00