5840 Commits

Author SHA1 Message Date
76dee75612 Update definitions.inc.php
removed conflict.
2015-07-07 10:04:10 +01:00
7ab690f45e Meraki Logo. Source = Meraki Partner Portal 2015-07-06 21:49:13 +01:00
93c0e8ae9c Delete meraki.png 2015-07-06 21:37:18 +01:00
f1eeb988cc Added Meraki OS discovery and polling 2015-07-06 21:21:56 +01:00
016b759858 Added Meraki OS discovery and polling 2015-07-06 21:17:50 +01:00
e9aa9a2ae9 fix nginx and php 2015-07-06 17:26:58 +03:00
5d80beeeb5 fix install for epel
Install epel release using yum
2015-07-06 17:21:48 +03:00
a584c08bab fix chkconfig command
Defining level is not needed for chkconfig according to official documentation https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/sect-System_Monitoring_Tools-Net-SNMP-Running.html
2015-07-06 17:14:52 +03:00
8b9323852c Merge pull request #1 from willjones/meraki-discovery
issue-1396
2015-07-06 10:41:54 +01:00
e818236f84 Merge pull request #1395 from willjones/authors
adding Will Jones
2015-07-06 11:38:00 +10:00
a015db74d9 add Will Jones
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-07-06 02:21:40 +01:00
f6f4a40c73 Adding Meraki devices
Definitions for Meraki MX. MR and MS hardware.
2015-07-06 02:13:50 +01:00
be69210591 Create merakimx.inc.php
OS Detection module for Meraki MX
2015-07-06 02:10:25 +01:00
f8b6038c9d Create merakims.inc.php
OS Detection module for Meraki MS
2015-07-06 02:09:40 +01:00
1a5f98ac14 Create merakimr.inc.php
OS detection module for Meraki MR
2015-07-06 02:08:19 +01:00
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
462d3503c3 Merge pull request #1384 from vitalisator/issue-1382
Add support fo PBN CPE device"
2015-07-05 22:35:15 +01:00
7803a33fa4 Merge pull request #1393 from laf/changelog
Missing pr number
201507
2015-07-05 21:18:33 +01:00
laf
ea5cc4b1fb Missing pr number 2015-07-05 21:18:11 +01:00
1cb7dfeafd Merge pull request #1391 from laf/changelog
Updated changelog 2015-07-05
2015-07-05 21:14:58 +01:00
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
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
7f8fb89987 Merge pull request #1388 from spinza/addserviceircd
Add service monitoring for IRCd
2015-07-05 20:38:38 +01:00
90f2201084 Fix up formatting to http://docs.librenms.org/Developing/Code-Guidelines/ 2015-07-05 21:31:11 +02:00
c050ff374f Add IRCd service. 2015-07-05 21:12:59 +02:00
ae72cfd978 Merge pull request #1389 from dontforget/patch-1
fix nginx config file location
2015-07-05 19:54:12 +01:00
7bc3ec2962 Merge pull request #1387 from spinza/addntpservice
Add ntp service monitoring.
2015-07-05 19:52:43 +01:00
f442cd650a Merge pull request #1386 from spinza/checkmysql
Accept MySQL OK as the service active.
2015-07-05 19:51:30 +01:00
f0f924c7a9 Merge pull request #1385 from spinza/fixssh
Pass service parameters to check_ssh.
2015-07-05 19:51:05 +01:00
c8fcce1ed3 Merge pull request #1381 from sthen/more-ups
Support additional UPS
2015-07-05 19:50:04 +01:00
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
1380230ad3 Merge pull request #1376 from travishegner/datepicker
Fix datepicker timezone issue(s) #1374, #1239, #1241
2015-07-05 19:42:18 +01:00
33e8723840 fix nginx config file location
fix nginx config file location
2015-07-05 17:14:50 +03:00
abe773c1c3 Update docs to reflect ntp service being added. 2015-07-05 15:24:58 +02:00
96f70b1b9b Add ntp service monitoring. 2015-07-05 15:24:37 +02:00
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
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
049fd54beb Add support fo PBN CPE device"
Fixes #1382
2015-07-04 23:22:26 +02:00
75704eba87 Use correct divisor for frequencies on Huawei UPS 2015-07-04 20:47:46 +01:00
ffbe06f64b Check netmanplus UPS by OID as well as descr, tested with Netman 204 2015-07-04 20:22:34 +01:00
69e9929ddb Support Huawei UPS, tested with UPS5000 2015-07-04 20:22:29 +01:00
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
67257f868b Merge remote-tracking branch 'upstream/master' into datepicker 2015-07-02 15:30:00 -04:00
6314aaddd4 removing commented code 2015-07-02 15:12:42 -04:00
6878e380b3 using moment.js since we have it anyway 2015-07-02 15:10:49 -04:00
d3aea6757b trying a more universal (perhaps not standard) format 2015-07-02 15:05:05 -04:00
01e4a6650e putting the T back with Z this time 2015-07-02 14:59:11 -04:00
0ab00ba0fb debug output 2015-07-02 14:55:42 -04:00
0fbcc0d1b6 ff failing to parse 2015-07-02 14:54:36 -04:00