root
20ea58d87f
Merge branch 'master' of https://github.com/librenms/librenms
2015-07-22 11:45:52 +03:00
Mikhail Bratchikov
2d8373729c
Merge remote-tracking branch 'upstream/master'
2015-07-22 10:41:50 +03:00
Paul Gear
9c9366eb54
Merge pull request #1515 from laf/nice
...
Extended array format is unused; to use existing format.
This commit does not constitute agreement with any claim of copyright violation made by Adam Armstrong.
2015-07-22 10:17:06 +10:00
laf
7f1f6b4ebf
Updated the way arrays are presented
2015-07-22 01:03:59 +01:00
Clint Armstrong
e6e17325bb
fix fanspeed thresholds
2015-07-21 16:40:17 -04:00
Clint Armstrong
ef758cb4b4
fix temps
2015-07-21 16:31:21 -04:00
Clint Armstrong
31816943c3
Revert "attempt fix"
...
This reverts commit 8479e7a133
2015-07-21 16:21:31 -04:00
Clint Armstrong
8479e7a133
attempt fix
2015-07-21 16:21:21 -04:00
Rasmus Aberg
bc79fb0731
fixed minor typo
2015-07-21 20:42:51 +02:00
Rasmus Aberg
9dae938d28
fixed formatting
2015-07-21 20:39:13 +02:00
Rasmus Aberg
2e95c1e194
fixed formatting
2015-07-21 20:30:02 +02:00
root
0a88c386b0
Add 'puredn' ldap authentication
2015-07-21 20:56:48 +03:00
Rasmus Aberg
d005b601b9
moved roundme function to common.php and enabled it to round to 10th/100th/1000th based on of 10/100/1000 input
2015-07-21 17:08:09 +02:00
Rasmus Aberg
80cdbfcb4f
fixed formatting
2015-07-21 16:14:38 +02:00
Rasmus Aberg
aae9ba806c
fixed formatting
2015-07-21 16:07:05 +02:00
Rasmus Aberg
75e9a0fb27
added a fix to round limit values to avoid limits being updated on every discovery since a change of 1rpm in current rpm would cause a new limit since limits are based on the current value
2015-07-21 13:39:53 +02:00
Rasmus Aberg
2ec76a01b1
Merge branch 'master' of https://github.com/rasssta/librenms into issue-1504
2015-07-21 13:04:21 +02:00
Rasmus Aberg
00bb6b0274
Added support for Extreme CPU usage + Memory, bug fix for Extreme Power, changes/additions in rewrites.inc.php and added support for some new Extreme platforms/features
2015-07-21 13:03:32 +02:00
Neil Lathwood
0e8e85e62e
Merge pull request #1496 from rasssta/issue-1492
...
Add Fan Speed for Extreme OS (xos)
2015-07-20 23:22:09 +01:00
laf
7951ad44d0
Stop updating device when override is set
2015-07-20 17:49:17 +01:00
laf
e9cabb908a
Update sql file
2015-07-20 17:16:44 +01:00
laf
f6967ef523
Actually add sql file
2015-07-20 17:07:13 +01:00
laf
b2b0d89a24
Fixed scrut issues
2015-07-20 16:53:06 +01:00
laf
031a818c77
Removed references to location override
2015-07-20 16:52:33 +01:00
laf
fbec75a265
Mapping should be complete
2015-07-20 15:59:44 +01:00
Neil Lathwood
ec4b379fba
Merge pull request #1500 from trick77/master
...
Contributor Agreement
2015-07-20 15:31:44 +01:00
laf
31ee67fbf9
Add 'lib/Leaflet.awesome-markers/' from commit '4dfeef6943d58bde2d8ea1213250f6e1aa49ef0f'
...
git-subtree-dir: lib/Leaflet.awesome-markers
git-subtree-mainline: f2b3dabcaa4dfeef6943
2015-07-20 15:11:45 +01:00
trick77
749d814dac
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-07-20 16:11:45 +02:00
laf
f2b3dabcaa
Add 'lib/Leaflet.markercluster/' from commit 'e96388d6cb2be12f113a20a9b40812f42f96d805'
...
git-subtree-dir: lib/Leaflet.markercluster
git-subtree-mainline: 1218d227bee96388d6cb
2015-07-20 15:11:37 +01:00
laf
1218d227be
Add 'lib/jquery-mousewheel/' from commit 'b1c062e93b44f473022297c386d57fa7e58b6aae'
...
git-subtree-dir: lib/jquery-mousewheel
git-subtree-mainline: 11c222ff06b1c062e93b
2015-07-20 15:11:29 +01:00
laf
11c222ff06
Add 'lib/mapael-maps/' from commit 'c76f53d1f89408927dc12cf13d1e8cda2b5ba17f'
...
git-subtree-dir: lib/mapael-maps
git-subtree-mainline: 2c2b60ead7c76f53d1f8
2015-07-20 15:11:16 +01:00
laf
2c2b60ead7
Add 'lib/jQuery-Mapael/' from commit 'd7a8ba46314d7e4aa11df79ff468b319f45f1447'
...
git-subtree-dir: lib/jQuery-Mapael
git-subtree-mainline: b3e14c9ed6d7a8ba4631
2015-07-20 15:11:02 +01:00
laf
b3e14c9ed6
Initial setup of new map system
2015-07-20 15:10:56 +01:00
laf
1e477a04a5
Added warning about bug
2015-07-20 14:10:40 +01:00
laf
57540aacbc
Added search and sorting support
2015-07-20 14:03:09 +01:00
laf
c579805292
Updated edit ports page to use bootstrap
2015-07-20 13:55:35 +01:00
Rasmus Aberg
b094d45e31
Added fan speed sensor
2015-07-20 12:46:44 +02:00
Rasmus Aberg
49fd6baa9e
Merge branch 'master' of https://github.com/rasssta/librenms into issue-1492
...
Adding fan speed script
2015-07-20 12:41:31 +02:00
Rasmus Aberg
46c8bf2b99
Added fan speed sensor
2015-07-20 12:41:02 +02:00
Neil Lathwood
26f137d822
Merge pull request #1494 from rasssta/issue-1492
...
Issue 1492
2015-07-20 11:04:16 +01:00
Rasmus Aberg
2f76485bcf
Merge branch 'master' of https://github.com/rasssta/librenms into issue-1492
2015-07-20 11:56:05 +02:00
Rasmus Aberg
406c48e988
added os check
2015-07-20 11:55:36 +02:00
Neil Lathwood
65785f3fda
Merge pull request #1493 from rasssta/issue-1492
...
Add power and temperature for Extreme OS (xos)
2015-07-20 10:37:12 +01:00
Rasmus Aberg
a97160b94f
Added power and temperature sensors for Extreme hardware (xos). I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-07-20 11:01:30 +02:00
Rasmus Aberg
0b880bff71
Added power and temperature sensors for Extreme hardware (xos)
2015-07-20 10:48:51 +02:00
Rasmus Aberg
81c4fc3244
Added power and temperature sensors for Extreme hardware (xos)
2015-07-20 10:46:35 +02:00
Neil Lathwood
7df1649bf4
Merge pull request #1491 from laf/changelog
...
Changelog update 20July2015
2015-07-20 09:36:23 +01:00
laf
82fd6f848c
Changelog update 20July2015
2015-07-20 09:35:48 +01:00
Daniel Preussker
1b4328751d
Merge pull request #1488 from laf/issue-1487
...
Fixed inventory formatting and quotes
2015-07-20 07:18:15 +02:00
Daniel Preussker
3fcfb40c1d
Merge pull request #1477 from laf/issue-1426
...
Use snmpEngineTime as a fallback for uptime
2015-07-20 07:17:26 +02:00
root