8679 Commits

Author SHA1 Message Date
laf
c5d4c0a49f Add 'lib/gridster/' from commit 'a7ed9a4adec9f7c8361ad6f392993a1f0b9c1601'
git-subtree-dir: lib/gridster
git-subtree-mainline: 80f8419dac97766a22ded5fa86186ced2b704178
git-subtree-split: a7ed9a4adec9f7c8361ad6f392993a1f0b9c1601
2015-11-10 21:43:44 +00:00
laf
80f8419dac Updated gridster in makefile 2015-11-10 21:43:36 +00:00
Neil Lathwood
725fc56f41 Merge pull request #2412 from tuxis-ie/master
Add Ceph support
2015-11-10 08:08:17 -04:00
Mark Schouten
930d9b022d Move the ceph_rrd function to includes/common.inc.php 2015-11-10 12:33:52 +01:00
Mark Schouten
669eb872a5 Implement a function to fix the rrd path 2015-11-10 11:44:30 +01:00
Mark Schouten
24550b0c02 Fix if-then-else 2015-11-10 11:44:14 +01:00
Neil Lathwood
9682e8af8e Merge pull request #2405 from rkojedzinszky/master
FIX 95th percent lines in negative range
2015-11-10 06:23:52 -04:00
Neil Lathwood
ea8575ab92 Merge pull request #2411 from fstern/active_directory_auth
Adding active directory authentication to librenms
2015-11-10 06:19:35 -04:00
Mark Schouten
a4eb4391c5 Add Ceph support 2015-11-10 11:10:06 +01:00
Falk Stern
d326869675 Removed unused variables 2015-11-10 10:47:50 +01:00
Falk Stern
16df0fdd2e Coding style 2015-11-10 10:39:42 +01:00
Falk Stern
2326061e68 Removed unused variables and updated coding style 2015-11-10 10:38:42 +01:00
Falk Stern
0eeb4d2ef8 Fixed a bug from scrutinizer 2015-11-10 10:03:47 +01:00
Falk Stern
a785398492 Merge remote-tracking branch 'upstream/master' into active_directory_auth 2015-11-10 09:43:30 +01:00
Richard Kojedzinszky
ca595e1e9d FIX 95th percent lines in negative range 2015-11-08 18:27:19 +01:00
Richard Kojedzinszky
8196b19096 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md 2015-11-08 18:27:00 +01:00
Daniel Preussker
923990d451 Merge pull request #2401 from Rosiak/issue-2400
Add innodb config example to daily
2015-11-06 17:55:03 +01:00
Rosiak
3065781118 Add innodb config example to daily
Fix issue-2400
2015-11-06 17:48:50 +01:00
Neil Lathwood
02b7b0b0f3 Merge pull request #2195 from ciscoqid/master
Use official NET-SNMP-EXTEND-MIB first for running distro command
2015-11-06 03:50:03 -04:00
Daniel Preussker
b0ec65e80a Merge pull request #2385 from laf/issue-2360
Added ability to globally disable sending alerts
2015-11-05 21:38:32 +01:00
Daniel Preussker
e929c3acc2 Merge pull request #2397 from laf/issue-2395
Made status column sortable in the /devices/ page
2015-11-05 21:13:38 +01:00
Daniel Preussker
97392b1c1d Merge pull request #2214 from laf/nagios-plugins
Dynamic use of nagios-service checks
2015-11-05 21:13:15 +01:00
laf
7187117511 Made status sortable 2015-11-05 19:42:06 +00:00
Neil Lathwood
a69eedb704 Merge pull request #2396 from rgormley/master
Add MIBs for other Cisco SB switches (SG200 series)
2015-11-05 15:40:35 -04:00
Rob Gormley
1f323aea44 ```
I agree to the conditions of the Contributor Agreement
	contained in doc/General/Contributing.md.
```
2015-11-05 11:34:27 -08:00
Rob Gormley
fa5f5750da Add MIBs for other Cisco SB switches (SG200 series) 2015-11-05 10:34:51 -08:00
Daniel Preussker
343dd5103e Merge pull request #2389 from librenms/revert-2383-f0o-mapheight-patch
Revert 0402afe5f234741578995143d379d3071ad145f5
2015-11-05 10:50:04 +01:00
Daniel Preussker
1a5bf414c3 Revert 0402afe5f234741578995143d379d3071ad145f5 2015-11-05 09:49:24 +00:00
Daniel Preussker
73eaf5ebf6 Merge pull request #2386 from laf/issue-2217
Removed device_traffic_descr entry to resolv graphs
2015-11-05 07:35:39 +01:00
laf
cd1640fe9a Removed device_traffic_descr entry to resolv graphs 2015-11-04 20:54:54 +00:00
laf
64180fa9a8 Added ability to globally disable sending alerts 2015-11-04 20:29:02 +00:00
Neil Lathwood
0402afe5f2 Merge pull request #2383 from librenms/f0o-mapheight-patch
Patched styles.css to make leaflet resizeable
2015-11-04 15:42:08 -04:00
Neil Lathwood
5cfb8fea6d Merge pull request #2375 from Lupul/patch-5
Fix getRates should return in and out average rates
2015-11-04 15:29:18 -04:00
laf
d39f1d71a6 Few small changes 2015-11-04 19:23:39 +00:00
Mike Rostermund
ecc7215071 Merge pull request #2384 from Rosiak/fix-typo
Fix docs typo
2015-11-04 20:19:32 +01:00
Rosiak
ef83953a84 Fix docs typo 2015-11-04 20:18:36 +01:00
Daniel Preussker
2bd13d436f Resize WorldMap to widget canvas 2015-11-04 13:59:27 +00:00
Daniel Preussker
32cdf4fc1a Removed leaflet CSS 2015-11-04 13:58:43 +00:00
Daniel Preussker
b54e553efa Added padding 2015-11-04 13:00:10 +00:00
Daniel Preussker
21bcc86f38 Patched styles.css to make leaflet resizeable 2015-11-04 12:46:26 +00:00
Daniel Preussker
43c1ac96f0 Merge pull request #2382 from khobbits/patch-1
Quote column titles when sql building to avoid mysql keywords
2015-11-04 09:31:14 +00:00
KHobbits
a98085a9ee Quote column titles when sql building to avoid mysql keywords 2015-11-04 09:24:02 +00:00
KHobbits
e2532f4ab4 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-11-04 09:23:49 +00:00
Paul Gear
a32dc9bab8 Merge pull request #2380 from RichiH/fix/MIB-permissions
mibs/: Fix permissions
2015-11-04 14:14:24 +10:00
Paul Gear
7005f88ac2 Merge pull request #2379 from RichiH/fix/addhost-error
addhost.php: Fix indented prompt when erroring out
2015-11-04 14:14:03 +10:00
Paul Gear
58a4265f70 Merge pull request #2381 from RichiH/feature/sign_contributors_agreement
Richard Hartmann agrees to Contributor Agreement
2015-11-04 14:13:11 +10:00
Richard Hartmann
f6afc564da AUTHORS.md: Richard Hartmann agrees to Contributor Agreement
I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2015-11-03 16:51:15 +01:00
Richard Hartmann
5c0921da19 mibs/: Fix permissions
MIBs don't need to be executable.
2015-11-03 16:41:25 +01:00
Richard Hartmann
604620cb1c addhost.php: Fix indented prompt when erroring out 2015-11-03 13:58:12 +01:00
Zollner Robert
0a48338fe0 Fix getRates should return in and out average rates
/billing-calculate.php depends on these return values.
2015-11-02 03:48:12 +02:00