Commit Graph

5824 Commits

Author SHA1 Message Date
Will Jones
1a5f98ac14 Create merakimr.inc.php
OS detection module for Meraki MR
2015-07-06 02:08:19 +01:00
Neil Lathwood
d413e67d5c Merge pull request #1392 from arnoldthebat/issue-1390
Issue 1390 - added missing load and state icons for Synology output
2015-07-05 23:28:54 +01:00
Neil Lathwood
462d3503c3 Merge pull request #1384 from vitalisator/issue-1382
Add support fo PBN CPE device"
2015-07-05 22:35:15 +01:00
Neil Lathwood
7803a33fa4 Merge pull request #1393 from laf/changelog
Missing pr number
2015-07-05 21:18:33 +01:00
laf
ea5cc4b1fb Missing pr number 2015-07-05 21:18:11 +01:00
Neil Lathwood
1cb7dfeafd Merge pull request #1391 from laf/changelog
Updated changelog 2015-07-05
2015-07-05 21:14:58 +01:00
Tony Ditchfield
01eea6a31a Merge branch 'master' of https://github.com/arnoldthebat/librenms into issue-1390
Added load and state icons from silk icons
2015-07-05 21:01:53 +01:00
Tony Ditchfield
23fdc03ded Added load and state icons from silkicons set 2015-07-05 20:58:56 +01:00
laf
06c0803b7b Updated changelog 05/07/2015 2015-07-05 20:58:01 +01:00
Neil Lathwood
7f8fb89987 Merge pull request #1388 from spinza/addserviceircd
Add service monitoring for IRCd
2015-07-05 20:38:38 +01:00
Louis Rossouw
90f2201084 Fix up formatting to http://docs.librenms.org/Developing/Code-Guidelines/ 2015-07-05 21:31:11 +02:00
Louis Rossouw
c050ff374f Add IRCd service. 2015-07-05 21:12:59 +02:00
Neil Lathwood
ae72cfd978 Merge pull request #1389 from dontforget/patch-1
fix nginx config file location
2015-07-05 19:54:12 +01:00
Neil Lathwood
7bc3ec2962 Merge pull request #1387 from spinza/addntpservice
Add ntp service monitoring.
2015-07-05 19:52:43 +01:00
Neil Lathwood
f442cd650a Merge pull request #1386 from spinza/checkmysql
Accept MySQL OK as the service active.
2015-07-05 19:51:30 +01:00
Neil Lathwood
f0f924c7a9 Merge pull request #1385 from spinza/fixssh
Pass service parameters to check_ssh.
2015-07-05 19:51:05 +01:00
Neil Lathwood
c8fcce1ed3 Merge pull request #1381 from sthen/more-ups
Support additional UPS
2015-07-05 19:50:04 +01:00
Neil Lathwood
50338c2b8d Merge pull request #1377 from clinta/patch-2
Do not allow the master to join twice
2015-07-05 19:43:53 +01:00
Neil Lathwood
1380230ad3 Merge pull request #1376 from travishegner/datepicker
Fix datepicker timezone issue(s) #1374, #1239, #1241
2015-07-05 19:42:18 +01:00
dontforget
33e8723840 fix nginx config file location
fix nginx config file location
2015-07-05 17:14:50 +03:00
Louis Rossouw
abe773c1c3 Update docs to reflect ntp service being added. 2015-07-05 15:24:58 +02:00
Louis Rossouw
96f70b1b9b Add ntp service monitoring. 2015-07-05 15:24:37 +02:00
Louis Rossouw
01714ed03b When check_mysql is run with -n option it returns MySQL OK. Also accept that as an status=1 indication. 2015-07-05 00:47:51 +02:00
Louis Rossouw
bf8df0fbe2 Pass service parameters to check_ssh allowing one to specify alternative port for ssh for example using -p flag. 2015-07-05 00:35:33 +02:00
vitalisator
049fd54beb Add support fo PBN CPE device"
Fixes #1382
2015-07-04 23:22:26 +02:00
sthen
75704eba87 Use correct divisor for frequencies on Huawei UPS 2015-07-04 20:47:46 +01:00
sthen
ffbe06f64b Check netmanplus UPS by OID as well as descr, tested with Netman 204 2015-07-04 20:22:34 +01:00
sthen
69e9929ddb Support Huawei UPS, tested with UPS5000 2015-07-04 20:22:29 +01:00
Clint Armstrong
fd0617acca Do not allow the master to join twice
If the poller master doesn't complete in time and ends up with overlapping jobs, neither job will ever complete because both running jobs will think they are the master and wait for the remaining node to exit.
2015-07-02 15:30:57 -04:00
Travis Hegner
67257f868b Merge remote-tracking branch 'upstream/master' into datepicker 2015-07-02 15:30:00 -04:00
Travis Hegner
6314aaddd4 removing commented code 2015-07-02 15:12:42 -04:00
Travis Hegner
6878e380b3 using moment.js since we have it anyway 2015-07-02 15:10:49 -04:00
Travis Hegner
d3aea6757b trying a more universal (perhaps not standard) format 2015-07-02 15:05:05 -04:00
Travis Hegner
01e4a6650e putting the T back with Z this time 2015-07-02 14:59:11 -04:00
Travis Hegner
0ab00ba0fb debug output 2015-07-02 14:55:42 -04:00
Travis Hegner
0fbcc0d1b6 ff failing to parse 2015-07-02 14:54:36 -04:00
Travis Hegner
29244a49dc js syntax error 2015-07-02 14:39:28 -04:00
Travis Hegner
a9fa366415 js syntax error 2015-07-02 14:34:40 -04:00
Travis Hegner
054022346e prevent form submission from converting to UTC 2015-07-02 14:33:19 -04:00
Travis Hegner
f11262eb9d formatting date with javascript, so it auto converts to localtime 2015-07-02 14:30:43 -04:00
Travis Hegner
9a99af06c8 debug output 2015-07-02 14:24:37 -04:00
Travis Hegner
4655143167 debug output 2015-07-02 14:23:03 -04:00
Travis Hegner
48a380ff7e debug output 2015-07-02 14:21:10 -04:00
Travis Hegner
2a7eb47437 debug output 2015-07-02 14:12:33 -04:00
Travis Hegner
5ac243f731 debug output 2015-07-02 14:10:16 -04:00
Travis Hegner
abeb015e33 debug output 2015-07-02 14:09:23 -04:00
Travis Hegner
a2e248cf4b trying to set the date from js 2015-07-02 14:06:02 -04:00
Travis Hegner
dbb256d431 change the order to see if it shows date immediatly 2015-07-02 13:56:28 -04:00
Travis Hegner
f2fe24c602 use js to convert 2015-07-02 13:54:27 -04:00
Travis Hegner
8d49395b10 test static TZ parse 2015-07-02 13:41:54 -04:00