New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 80 insertions, 51 deletions

diff --git a/LICENSE-REDISTRIBUTED.md b/REDISTRIBUTED.md
index caf411b6..ed30624f 100644
--- a/LICENSE-REDISTRIBUTED.md
+++ b/REDISTRIBUTED.md
@@ -1,24 +1,45 @@
 # Netdata
 
 Copyright 2016-2017, Costa Tsaousis.
+Copyright 2017-2018, Netdata Inc.
 Released under [GPL v3 or later](http://www.gnu.org/licenses/gpl-3.0.en.html).
 
+Netdata uses SPDX license tags to identify the license for its files.
+Individual licenses referenced in the tags are available on the [SPDX project site](http://spdx.org/licenses/).
+
 ---
 
 ## Re-distributed software
 
-Netdata re-distributes the following third party software.
-We decided to re-distribute all these, instead of using them
-through a CDN, to allow netdata work in cases where internet
+Netdata re-distributes the following third-party software.
+We have decided to re-distribute all these, instead of using them
+through a CDN, to allow netdata to work in cases where Internet
 connectivity is not available.
 
-
 - [Dygraphs](http://dygraphs.com/)
 
     Copyright 2009, Dan Vanderkam
     [MIT License](http://dygraphs.com/legal.html)
 
 
+- [Easy Pie Chart](https://rendro.github.io/easy-pie-chart/)
+
+    Copyright 2013, Robert Fleischmann
+    [MIT License](https://github.com/rendro/easy-pie-chart/blob/master/LICENSE)
+
+
+- [Gauge.js](http://bernii.github.io/gauge.js/)
+
+    Copyright, Bernard Kobos
+    [MIT License](http://bernii.github.io/gauge.js/)
+
+
+- [d3pie](https://github.com/benkeen/d3pie)
+
+    Copyright (c) 2014-2015 Benjamin Keen
+    [MIT License](https://github.com/benkeen/d3pie/blob/master/LICENSE)
+
+
 - [jQuery Sparklines](http://omnipotent.net/jquery.sparkline/)
 
     Copyright 2009-2012, Splunk Inc.
@@ -28,19 +49,31 @@ connectivity is not available.
 - [Peity](http://benpickles.github.io/peity/)
 
     Copyright 2009-2015, Ben Pickles
-    [MIT License](https://github.com/benpickles/peity/blob/master/MIT-LICENCE)
-    
+    [MIT License](https://github.com/benpickles/peity/blob/master/LICENCE)
 
-- [Easy Pie Chart](https://rendro.github.io/easy-pie-chart/)
 
-    Copyright 2013, Robert Fleischmann
-    [MIT License](https://github.com/rendro/easy-pie-chart/blob/master/LICENSE)
+- [morris.js](http://morrisjs.github.io/morris.js/)
 
+    Copyright 2013, Olly Smith
+    [Simplified BSD License](http://morrisjs.github.io/morris.js/)
 
-- [Guage.js](http://bernii.github.io/gauge.js/)
 
-    Copyright, Bernard Kobos
-    [MIT License](http://bernii.github.io/gauge.js/)
+- [Raphaël](http://dmitrybaranovskiy.github.io/raphael/)
+
+    Copyright 2008, Dmitry Baranovskiy
+    [MIT License](http://dmitrybaranovskiy.github.io/raphael/license.html)
+
+
+- [C3](http://c3js.org/)
+
+    Copyright 2013, Masayuki Tanaka
+    [MIT License](https://github.com/masayuki0812/c3/blob/master/LICENSE)
+
+
+- [D3](http://d3js.org/)
+
+    Copyright 2015, Mike Bostock
+    [BSD License](http://opensource.org/licenses/BSD-3-Clause)
 
 
 - [jQuery](https://jquery.org/)
@@ -54,10 +87,6 @@ connectivity is not available.
     Copyright 2015, Twitter
     [MIT License](http://getbootstrap.com/getting-started/#license-faqs)
 
-- [Bootstrap-slider](http://seiyria.com/bootstrap-slider/)
-
-    Copyright 2017 Kyle Kemp, Rohit Kalkur, and contributors
-    [MIT License](https://github.com/seiyria/bootstrap-slider/blob/master/LICENSE.md)
 
 - [Bootstrap Toggle](http://www.bootstraptoggle.com/)
 
@@ -65,6 +94,12 @@ connectivity is not available.
     [MIT License](https://github.com/minhur/bootstrap-toggle/blob/master/LICENSE)
 
 
+- [Bootstrap-slider](http://seiyria.com/bootstrap-slider/)
+
+    Copyright 2017 Kyle Kemp, Rohit Kalkur, and contributors
+    [MIT License](https://github.com/seiyria/bootstrap-slider/blob/master/LICENSE.md)
+
+
 - [bootstrap-table](http://bootstrap-table.wenzhixin.net.cn/)
 
     Copyright (c) 2012-2016 Zhixin Wen <wenzhixin2010@gmail.com>
@@ -87,7 +122,8 @@ connectivity is not available.
 
     Created by Dave Gandy
     Font license: [SIL OFL 1.1](http://scripts.sil.org/OFL)
-    CSS license: [MIT License](http://opensource.org/licenses/mit-license.html)
+    Icon license [Creative Commons Attribution 4.0 (CC-BY 4.0)](https://creativecommons.org/licenses/by/4.0/)
+    Code license: [MIT License](http://opensource.org/licenses/mit-license.html)
 
 
 - [IconsDB.com Icons](http://www.iconsdb.com/soylent-red-icons/seo-performance-icon.html)
@@ -95,86 +131,79 @@ connectivity is not available.
     Icons provided as CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 
 
-- [morris.js](http://morrisjs.github.io/morris.js/)
-
-    Copyright 2013, Olly Smith
-    [Simplified BSD License](http://morrisjs.github.io/morris.js/)
-
-
-- [Raphaël](http://raphaeljs.com/)
-
-    Copyright 2008, Dmitry Baranovskiy
-    [MIT License](http://raphaeljs.com/license.html)
-    
-
-- [C3](http://c3js.org/)
-
-    Copyright 2013, Masayuki Tanaka
-    [MIT License](https://github.com/masayuki0812/c3/blob/master/LICENSE)
-    
-
-- [D3](http://d3js.org/)
-
-    Copyright 2015, Mike Bostock
-    [BSD License](http://opensource.org/licenses/BSD-3-Clause)
-    
-    
 - [node-extend](https://github.com/justmoon/node-extend)
 
     Copyright 2014, Stefan Thomas
     [MIT License](https://github.com/justmoon/node-extend/blob/master/LICENSE)
-    
+
 
 - [node-net-snmp](https://github.com/stephenwvickers/node-net-snmp)
 
     Copyright 2013, Stephen Vickers
     [MIT License](https://github.com/stephenwvickers/node-net-snmp)
-    
+
 
 - [node-asn1-ber](https://github.com/stephenwvickers/node-asn1-ber)
 
     Copyright 2017, Stephen Vickers
     Copyright 2011, Mark Cavage
     [MIT License](https://github.com/stephenwvickers/node-asn1-ber)
-    
+
 
 - [pixl-xml](https://github.com/jhuckaby/pixl-xml)
 
     Copyright 2015, Joseph Huckaby
     [MIT License](https://github.com/jhuckaby/pixl-xml)
-    
+
+
 - [sensors](https://github.com/paroj/sensors.py)
 
     Copyright 2014, Pavel Rojtberg
     [LGPL 2.1 License](http://opensource.org/licenses/LGPL-2.1)
 
+
 - [PyYAML](https://bitbucket.org/blackjack/pysensors)
 
     Copyright 2006, Kirill Simonov
-    [MIT License](http://pyyaml.org)
+    [MIT License](https://github.com/yaml/pyyaml)
+
 
 - [urllib3](https://github.com/shazow/urllib3)
 
     Copyright 2008-2016 Andrey Petrov and [contributors](https://github.com/shazow/urllib3/blob/master/CONTRIBUTORS.txt)
     [MIT License](https://github.com/shazow/urllib3/blob/master/LICENSE.txt)
 
+
 - [lz-string](http://pieroxy.net/blog/pages/lz-string/index.html)
 
     Copyright 2013 Pieroxy
     [WTFPL License](http://pieroxy.net/blog/pages/lz-string/index.html#inline_menu_10)
 
+
 - [pako](http://nodeca.github.io/pako/)
 
     Copyright 2014-2017 Vitaly Puzrin and Andrei Tuputcyn
     [MIT License](https://github.com/nodeca/pako/blob/master/LICENSE)
 
+
 - [clipboard-polyfill](https://github.com/lgarron/clipboard-polyfill)
 
     Copyright (c) 2014 Lucas Garron
     [MIT License](https://github.com/lgarron/clipboard-polyfill/blob/master/LICENSE.md)
-    
-- [d3pie](https://github.com/benkeen/d3pie)
 
-    Copyright (c) 2014-2015 Benjamin Keen
-    [MIT License](https://github.com/benkeen/d3pie/blob/master/LICENSE)
-    
\ No newline at end of file
+
+- [Utilities for writing code that runs on Python 2 and 3](https://github.com/netdata/netdata/blob/master/python.d/python_modules/urllib3/packages/six.py)
+
+    Copyright (c) 2010-2015 Benjamin Peterson
+    [MIT License](https://github.com/netdata/netdata/blob/master/python.d/python_modules/urllib3/packages/six.py)
+
+
+- [mcrcon](https://github.com/barneygale/MCRcon)
+
+    Copyright (C) 2015 Barnaby Gale
+    [MIT License](https://raw.githubusercontent.com/barneygale/MCRcon/master/COPYING.txt)
+
+- [monotonic](https://github.com/atdt/monotonic)
+
+    Copyright 2014, 2015, 2016 Ori Livneh <ori@wikimedia.org>
+    [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0)