Commit Graph

5987 Commits

Author SHA1 Message Date
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
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
Neil Lathwood
ec4b379fba Merge pull request #1500 from trick77/master
Contributor Agreement
2015-07-20 15:31:44 +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
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
laf
0788f8893c Fixed formatting and quotes 2015-07-19 23:10:45 +01:00
Neil Lathwood
cac95d3581 Merge pull request #1486 from spinza/fixzeromac
Ignore links based on 'unreal' mac addresses.
2015-07-19 22:03:08 +01:00
Neil Lathwood
7c0516a2ba Merge pull request #1485 from laf/map-array
Initialise two arrays needed for merge
2015-07-19 21:55:08 +01:00
Louis Rossouw
b9cb02057a Ignore links based on 'unreal' mac adresses. 2015-07-19 22:54:16 +02:00
laf
59990d2258 Initialise arrays needed for merge 2015-07-19 21:45:56 +01:00
laf
545a67cc58 Merge branch 'master' of https://github.com/librenms/librenms 2015-07-19 21:40:32 +01:00
Neil Lathwood
85d1df4e7f Merge pull request #1483 from librenms/revert-1482-fixzeromac
Revert "Ignore links based on 'unreal' mac addresses."
2015-07-19 21:04:25 +01:00
Neil Lathwood
e948db4e8c Revert "Ignore links based on 'unreal' mac addresses." 2015-07-19 22:04:18 +01:00
Neil Lathwood
b786e89f16 Merge pull request #1482 from spinza/fixzeromac
Ignore links based on 'unreal' mac addresses.
2015-07-19 20:59:18 +01:00
Louis Rossouw
00bbd02b1d Ignore links based on 'unreal' mac adresses. 2015-07-19 21:08:11 +02:00
Daniel Preussker
9908eb2e37 Merge pull request #1479 from laf/issue-1361
ifAlias is now derived from ifDescr if NULL
2015-07-19 20:04:04 +02:00
laf
6c67b05624 Merge branch 'master' of https://github.com/librenms/librenms 2015-07-19 18:52:53 +01:00
laf
dde4ac0db6 Initial work on tooltips 2015-07-19 18:52:39 +01:00
Daniel Preussker
fe8ead7e0e Merge pull request #1481 from trick77/issue-1480
Add Boxcar transport
2015-07-19 19:47:49 +02:00
trick77
a71c2a9a04 Added Boxcar support to the docs. 2015-07-19 19:30:59 +02:00
trick77
32c1fa561c Added support for Boxcar.io push notifications for alerts 2015-07-19 19:21:09 +02:00
Daniel Preussker
1dde9f87d4 Merge pull request #1476 from laf/issue-1466
Added basic detection of Netonix
2015-07-19 18:52:38 +02:00
laf
a60191e745 Removed bad file: mibs/netonix/.NETONIX-SWITCH-MIB.swp 2015-07-19 17:44:58 +01:00
laf
a41bcf29da Added config option to rewrite ifAlias 2015-07-19 17:35:11 +01:00
laf
827b0346a6 ifAlias is now derived from ifDescr if NULL 2015-07-19 17:27:12 +01:00
laf
1265fc44b8 Fall back to using snmpEngineTime rather than be the default 2015-07-19 16:02:56 +01:00
laf
7ca862ec43 Actually added detection for netonix! 2015-07-19 12:00:21 +01:00
laf
d427008eaf added debug 2015-07-19 11:43:54 +01:00
laf
43f121d7ae Added standard misb dir 2015-07-19 11:36:31 +01:00
laf
894a96c72a Use snmpEngineTime as primary uptime value 2015-07-19 11:03:43 +01:00
laf
b87a62e06e Removed empty file 2015-07-19 10:20:37 +01:00
laf
a862da4da0 Added basic detection of Netonix 2015-07-18 21:10:24 +01:00
Daniel Preussker
6efe5b086c Merge pull request #1370 from travishegner/lazyload
Lazyload
2015-07-18 22:02:13 +02:00
Daniel Preussker
18c2b57cbe Merge pull request #1472 from laf/issue-1468
Fixed clicking anywhere now takes you to where you should go
2015-07-18 22:01:25 +02:00
Daniel Preussker
2170af6a48 Merge pull request #1470 from laf/network-map-updates
Network map updates
2015-07-18 22:00:36 +02:00