Commit Graph

5434 Commits

Author SHA1 Message Date
Mike Rostermund
fe8453b404 Fix use of check_valid_sensors for load sensors 2015-06-11 20:29:14 +02:00
Paul Gear
9096fdc75d Merge pull request #1237 from Calvario/master
I agree to the conditions of the Contributor Agreement
2015-06-11 16:23:43 +10:00
Calvario
3948751f84 I agree to the conditions of the Contributor Agreement
I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2015-06-11 08:05:15 +02:00
Neil Lathwood
9712897672 Merge pull request #1235 from Calvario/master
Improved Temp Support for Synology and States for varying items
2015-06-10 21:41:48 +01:00
Calvario
7e2755dca3 System Status Support for Synology
It work with but need to change the management of status because it
isn't interessant actualy.
It will be good to chose a message for the display. Exemple "Ok",
"Failed", "On battery" etc..
2015-06-10 19:49:48 +02:00
Neil Lathwood
86978e2a14 Merge pull request #1234 from f0o/issue-1233
Added robots.txt
2015-06-10 18:23:44 +01:00
Calvario
0150982fe9 Temperature Support for Synology
The poller return now the correct value for the System temperature.

Check in my Synology.
2015-06-10 18:02:32 +02:00
f0o
3f39f8af88
Added robots.txt 2015-06-10 15:05:21 +00:00
Paul Gear
a3ddceb954 Merge pull request #1231 from f0o/globe-frontpage-docs
Add docs for the globe-frontpage
2015-06-10 20:59:34 +10:00
f0o
78a86b7700
Add docs for the globe-frontpage 2015-06-10 10:46:00 +00:00
Paul Gear
ee1242380e Merge pull request #1227 from laf/issue-1213
Updated hpilo temp discovery to test for current value
2015-06-10 18:52:13 +10:00
Paul Gear
f348a878b6 Merge pull request #1229 from SaaldjorMike/devices-load
Add additional graphs to devices page
2015-06-10 16:40:31 +10:00
Mike Rostermund
5f36149f8a Add ping to /devices/ graphs 2015-06-10 08:11:11 +02:00
Mike Rostermund
2e82965f08 Add poller time graphs to /devices/ 2015-06-10 08:02:22 +02:00
Daniel Preussker
00f6f6938f Merge pull request #1226 from laf/issue-1214
Alter Windows CPU descr when unknown
2015-06-10 06:01:22 +00:00
Mike Rostermund
c2c33e603a Add Load graphs to devices page 2015-06-10 00:47:26 +02:00
laf
c78a22d8a6 Updated hpilo temp discovery to test for current value 2015-06-09 22:28:12 +01:00
laf
4ee0b6f1f4 Alter Windows CPU descr when unknown 2015-06-09 20:07:32 +01:00
Neil Lathwood
666de1a3de Merge pull request #1225 from f0o/issue-1224
Minor fixes in html/install.php
2015-06-09 18:13:13 +01:00
f0o
afded4f6d2
Minor fixes in html/install.php 2015-06-09 16:12:53 +00:00
Neil Lathwood
fa33239513 Merge pull request #1222 from f0o/issue-1220
Move `mergecnf` to own file.
2015-06-09 17:07:05 +01:00
Neil Lathwood
5c644d872f Merge pull request #1221 from f0o/issue-1218
Fix type fatal on reload
2015-06-09 15:09:31 +01:00
f0o
2759008de6
Move mergecnf to own file. 2015-06-09 14:06:03 +00:00
f0o
8c670f1d9e
Fix type fatal on reload 2015-06-09 14:00:16 +00:00
Neil Lathwood
56a53c98b3 Merge pull request #1219 from librenms/f0o-patch-syslog-includes
Update syslog.php
2015-06-09 14:29:04 +01:00
Daniel Preussker
0ca2b393f6 Update syslog.php
Include_Once all files that define functions
2015-06-09 11:56:11 +00:00
Neil Lathwood
fe95301f43 Merge pull request #1217 from laf/changelog
Updated changelog 08/06/15
2015-06-08 21:17:53 +01:00
laf
51f50861fc Updated changelog 08/06/15 2015-06-08 21:18:31 +01:00
Neil Lathwood
29a60c882c Merge pull request #1215 from vitalisator/issue-1212
Added Basic OS Support for Multimatic USV
2015-06-08 21:17:07 +01:00
laf
802d1466a9 Updated changelog 08/06/15 2015-06-08 21:16:52 +01:00
vitalisator
a059ed1809 Added Basic OS Support for Multimatic USV 2015-06-08 21:46:36 +02:00
Daniel Preussker
225a84d597 Merge pull request #1210 from SaaldjorMike/fix-memory
Fixed entry count on memory page
2015-06-08 14:03:48 +00:00
Daniel Preussker
d89525f3dd Merge pull request #1209 from SaaldjorMike/fix-storage
Fixed entry count on storage page
2015-06-08 14:03:43 +00:00
Neil Lathwood
21d2846212 Merge pull request #1211 from vitalisator/issue-1206
Added Basic Support für Enterasys Devices
2015-06-08 14:39:37 +01:00
vitalisator
267f07e1b2 Added Basic Support für Enterasys Devices 2015-06-08 14:27:33 +02:00
Mike Rostermund
f1c13d1e3d Fixed entry count on memory page 2015-06-08 13:19:40 +02:00
Mike Rostermund
ed86171d0a Fixed entry count on storage page 2015-06-08 13:14:39 +02:00
Daniel Preussker
f3cebbcfba Merge pull request #1208 from SaaldjorMike/fix-bills
Fixed percentagebar on /bills/
2015-06-08 10:56:36 +00:00
Mike Rostermund
3489476ad6 Fixed percentagebar on /bills/ 2015-06-08 12:52:38 +02:00
Neil Lathwood
aa6ffa137b Merge pull request #1207 from SaaldjorMike/typo1
Fixed typo in changelog
2015-06-08 11:05:46 +01:00
Mike Rostermund
8fc70931ae Fixed typo in changelog 2015-06-08 12:02:49 +02:00
Neil Lathwood
70c9d13544 Merge pull request #1205 from SaaldjorMike/syslog-name
Fix heading of syslog table for devices
2015-06-07 21:32:33 +01:00
Mike Rostermund
516bc43234 Fix heading of syslog table for devices 2015-06-07 22:07:36 +02:00
f0o
c64345bd5d
Merge branch 'laf-issue-laf-110-new' 2015-06-07 10:44:47 +00:00
f0o
2467b11290 Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new
Conflicts:
	html/pages/health/mempool.inc.php
	includes/defaults.inc.php
2015-06-07 10:44:39 +00:00
Daniel Preussker
d121fed936 Merge pull request #1202 from paulgear/minor-tidies
Minor tidies
2015-06-07 07:32:04 +00:00
Daniel Preussker
a80e4cd87b Merge pull request #1203 from librenms/f0o-hotfix-1
Fix fatal in scripts/shoutcast.php
2015-06-06 17:55:54 +00:00
Daniel Preussker
0a9d8c92c3 Fix fatal in scripts/shoutcast.php
[lint] PHP Fatal error:  Call-time pass-by-reference has been removed in /var/lib/jenkins/jobs/librenms/workspace/scripts/shoutcast.php on line 43
2015-06-06 17:55:40 +00:00
Paul Gear
49833273e7 Make comment reflect code 2015-06-06 07:50:23 +10:00
Paul Gear
c149b0f47c Remove unused os type 2015-06-06 07:47:14 +10:00