Refresh patches

4 files changed, 33 insertions, 81 deletions

diff --git a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch
index 0bdfad7e..917f39b8 100644
--- a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch
+++ b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch
@@ -6,11 +6,9 @@ Subject: linked js/css/fonts removed from make
  web/Makefile.am | 27 ---------------------------
  1 file changed, 27 deletions(-)
 
-diff --git a/web/Makefile.am b/web/Makefile.am
-index 0432f8a..8078e67 100644
 --- a/web/Makefile.am
 +++ b/web/Makefile.am
-@@ -21,59 +21,32 @@ dist_web_DATA = \
+@@ -23,27 +23,14 @@
  	version.txt \
  	$(NULL)
  
@@ -25,33 +23,29 @@ index 0432f8a..8078e67 100644
 -
  weblibdir=$(webdir)/lib
  dist_weblib_DATA = \
- 	lib/dygraph-combined.js \
- 	lib/dygraph-smooth-plotter.js \
--	lib/jquery-1.12.0.min.js \
- 	lib/jquery.peity.min.js \
- 	lib/jquery.sparkline.min.js \
- 	lib/morris.min.js \
--	lib/raphael-min.js \
- 	lib/jquery.easypiechart.min.js \
- 	lib/jquery.nanoscroller.min.js \
--	lib/bootstrap.min.js \
- 	lib/ElementQueries.js \
- 	lib/ResizeSensor.js \
- 	lib/bootstrap-toggle.min.js \
- 	lib/c3.min.js \
--	lib/d3.min.js \
- 	lib/gauge.min.js \
- 	$(NULL)
- 
+-	lib/bootstrap-3.3.7.min.js \
+ 	lib/bootstrap-table-1.11.0.min.js \
+ 	lib/bootstrap-table-export-1.11.0.min.js \
+ 	lib/bootstrap-toggle-2.2.2.min.js \
+-	lib/c3-0.4.11.min.js \
+-	lib/d3-3.5.17.min.js \
+ 	lib/dygraph-combined-dd74404.js \
+ 	lib/dygraph-smooth-plotter-dd74404.js \
+ 	lib/gauge-d5260c3.min.js \
+-	lib/jquery-2.2.4.min.js \
+ 	lib/jquery.easypiechart-97b5824.min.js \
+ 	lib/jquery.nanoscroller-0.8.7.min.js \
+ 	lib/jquery.peity-3.2.0.min.js \
+@@ -56,27 +43,13 @@
  webcssdir=$(webdir)/css
  dist_webcss_DATA = \
- 	css/morris.css \
--	css/bootstrap.min.css \
--	css/bootstrap-theme.min.css \
+ 	css/morris-0.5.1.css \
+-	css/bootstrap-3.3.7.min.css \
+-	css/bootstrap-theme-3.3.7.min.css \
  	css/bootstrap.slate.min.css \
+ 	css/bootstrap-toggle-2.2.2.min.css \
 -	css/font-awesome.min.css \
- 	css/bootstrap-toggle.min.css \
- 	css/c3.min.css \
+ 	css/c3-0.4.11.min.css \
  	$(NULL)
  
  webfontsdir=$(webdir)/fonts
diff --git a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch
index ecf97b65..9b607044 100644
--- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch
+++ b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch
@@ -6,11 +6,9 @@ Subject: remove file serve restrictions for symlinks
  src/web_client.c | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/src/web_client.c b/src/web_client.c
-index 4036d4c..a7cc424 100644
 --- a/src/web_client.c
 +++ b/src/web_client.c
-@@ -325,33 +325,33 @@ int mysendfile(struct web_client *w, char *filename)
+@@ -325,33 +325,33 @@
      snprintfz(webfilename, FILENAME_MAX, "%s/%s", web_dir, filename);
  
      // check if the file exists
@@ -52,7 +50,7 @@ index 4036d4c..a7cc424 100644
          error("%llu: File '%s' is not a regular file. Access Denied.", w->id, webfilename);
          buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
          return 403;
-@@ -399,14 +399,14 @@ int mysendfile(struct web_client *w, char *filename)
+@@ -399,14 +399,14 @@
      else if(strstr(filename, ".icns") != NULL)  w->response.data->contenttype = CT_IMAGE_ICNS;
      else w->response.data->contenttype = CT_APPLICATION_OCTET_STREAM;
  
@@ -67,6 +65,6 @@ index 4036d4c..a7cc424 100644
 -    w->response.data->date = stat.st_mtim.tv_sec;
 +    w->response.rlen = wstat.st_size;
 +    w->response.data->date = wstat.st_mtim.tv_sec;
+     buffer_cacheable(w->response.data);
  
      return 200;
- }
diff --git a/debian/patches/0003-hide-update-button.patch b/debian/patches/0003-hide-update-button.patch
index 5395dc47..979c878e 100644
--- a/debian/patches/0003-hide-update-button.patch
+++ b/debian/patches/0003-hide-update-button.patch
@@ -6,16 +6,14 @@ Subject: hide update button
  web/index.html | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/web/index.html b/web/index.html
-index 3e6c221..0026f94 100644
 --- a/web/index.html
 +++ b/web/index.html
-@@ -579,7 +579,7 @@
-                     <li class="hidden-sm"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal" title="alarms"><i class="fa fa-bell"></i><span id="alarms_count_badge" class="badge"></span></a></li>
-                     <li class="hidden-sm"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal" title="dashboard settings"><i class="fa fa-cog"></i></a></li>
-                     <li class="hidden-sm"><a href="https://github.com/firehol/netdata/wiki" class="btn" target="_blank" title="netdata community"><i class="fa fa-github"></i></a></li>
--                    <li class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span></a></li>
-+                    <li class="hidden-sm" id="updateButton" style="display:none;"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span></a></li>
-                     <li class="hidden-sm"><a href="#" class="btn" data-toggle="modal" data-target="#helpModal" title="dashboard help"><i class="fa fa-question-circle"></i></a></li>
+@@ -2527,7 +2527,7 @@
+                     <li><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal" title="alarms"><i class="fa fa-bell"></i></span>&nbsp;<span class="hidden-sm">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></a></li>
+                     <li><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal" title="dashboard settings"><i class="fa fa-sliders"></i>&nbsp;<span class="hidden-sm">Settings</span></a></li>
+                     <li><a href="https://github.com/firehol/netdata/wiki" class="btn" target="_blank" title="netdata community"><i class="fa fa-github"></i>&nbsp;<span class="hidden-sm hidden-md">Community</span></a></li>
+-                    <li class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span>&nbsp;<span class="hidden-sm hidden-md">Update</span></a></li>
++                    <li class="hidden-sm" id="updateButton" style="display:none;"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span>&nbsp;<span class="hidden-sm hidden-md">Update</span></a></li>
+                     <li class="hidden-sm"><a href="#" class="btn" data-toggle="modal" data-target="#helpModal" title="dashboard help"><i class="fa fa-question-circle"></i>&nbsp;<span class="hidden-sm hidden-md">Help</span></a></li>
+                     <!--
                      <li class="dropdown hidden-md hidden-lg hidden-xs">
-                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="current_view">Menu <strong class="caret"></strong></a>
diff --git a/debian/patches/0004-readd-shebang-to-chart-scripts.patch b/debian/patches/0004-readd-shebang-to-chart-scripts.patch
index fcd23ac2..54b1c969 100644
--- a/debian/patches/0004-readd-shebang-to-chart-scripts.patch
+++ b/debian/patches/0004-readd-shebang-to-chart-scripts.patch
@@ -24,8 +24,6 @@ Subject: re-add shebang to chart scripts
  plugins.d/loopsleepms.sh.inc   | 2 +-
  19 files changed, 19 insertions(+), 19 deletions(-)
 
-diff --git a/charts.d/ap.chart.sh b/charts.d/ap.chart.sh
-index 7b4f690..ebd4808 100755
 --- a/charts.d/ap.chart.sh
 +++ b/charts.d/ap.chart.sh
 @@ -1,4 +1,4 @@
@@ -34,8 +32,6 @@ index 7b4f690..ebd4808 100755
  
  # _update_every is a special variable - it holds the number of seconds
  # between the calls of the _update() function
-diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
-index 2d68d43..14af66b 100755
 --- a/charts.d/apache.chart.sh
 +++ b/charts.d/apache.chart.sh
 @@ -1,4 +1,4 @@
@@ -44,8 +40,6 @@ index 2d68d43..14af66b 100755
  
  # the URL to download apache status info
  apache_url="http://127.0.0.1:80/server-status?auto"
-diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
-index 6b2513d..1237a7b 100755
 --- a/charts.d/cpu_apps.chart.sh
 +++ b/charts.d/cpu_apps.chart.sh
 @@ -1,4 +1,4 @@
@@ -54,8 +48,6 @@ index 6b2513d..1237a7b 100755
  
  # THIS PLUGIN IS OBSOLETE
  # USE apps.plugin INSTEAD
-diff --git a/charts.d/cpufreq.chart.sh b/charts.d/cpufreq.chart.sh
-index 06f692f..a17b235 100755
 --- a/charts.d/cpufreq.chart.sh
 +++ b/charts.d/cpufreq.chart.sh
 @@ -1,4 +1,4 @@
@@ -64,8 +56,6 @@ index 06f692f..a17b235 100755
  
  # if this chart is called X.chart.sh, then all functions and global variables
  # must start with X_
-diff --git a/charts.d/example.chart.sh b/charts.d/example.chart.sh
-index 1f020de..dab22ba 100755
 --- a/charts.d/example.chart.sh
 +++ b/charts.d/example.chart.sh
 @@ -1,4 +1,4 @@
@@ -74,8 +64,6 @@ index 1f020de..dab22ba 100755
  
  # if this chart is called X.chart.sh, then all functions and global variables
  # must start with X_
-diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
-index c60ae94..9cf5950 100644
 --- a/charts.d/exim.chart.sh
 +++ b/charts.d/exim.chart.sh
 @@ -1,4 +1,4 @@
@@ -84,8 +72,6 @@ index c60ae94..9cf5950 100644
  
  exim_command=
  
-diff --git a/charts.d/hddtemp.chart.sh b/charts.d/hddtemp.chart.sh
-index 41c3e24..fea9f80 100755
 --- a/charts.d/hddtemp.chart.sh
 +++ b/charts.d/hddtemp.chart.sh
 @@ -1,4 +1,4 @@
@@ -94,8 +80,6 @@ index 41c3e24..fea9f80 100755
  
  # if this chart is called X.chart.sh, then all functions and global variables
  # must start with X_
-diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
-index e6790d8..c829064 100755
 --- a/charts.d/load_average.chart.sh
 +++ b/charts.d/load_average.chart.sh
 @@ -1,4 +1,4 @@
@@ -104,8 +88,6 @@ index e6790d8..c829064 100755
  
  load_average_update_every=5
  load_priority=100
-diff --git a/charts.d/mem_apps.chart.sh b/charts.d/mem_apps.chart.sh
-index ab95b36..2a1669b 100755
 --- a/charts.d/mem_apps.chart.sh
 +++ b/charts.d/mem_apps.chart.sh
 @@ -1,4 +1,4 @@
@@ -114,8 +96,6 @@ index ab95b36..2a1669b 100755
  
  mem_apps_apps=
  
-diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
-index 120fec6..e2392c2 100755
 --- a/charts.d/mysql.chart.sh
 +++ b/charts.d/mysql.chart.sh
 @@ -1,4 +1,4 @@
@@ -124,8 +104,6 @@ index 120fec6..e2392c2 100755
  
  # http://dev.mysql.com/doc/refman/5.0/en/server-status-variables.html
  #
-diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
-index a2a9b32..a082c57 100755
 --- a/charts.d/nginx.chart.sh
 +++ b/charts.d/nginx.chart.sh
 @@ -1,4 +1,4 @@
@@ -134,8 +112,6 @@ index a2a9b32..a082c57 100755
  
  # if this chart is called X.chart.sh, then all functions and global variables
  # must start with X_
-diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
-index 3c8e1c9..a472084 100755
 --- a/charts.d/nut.chart.sh
 +++ b/charts.d/nut.chart.sh
 @@ -1,4 +1,4 @@
@@ -144,8 +120,6 @@ index 3c8e1c9..a472084 100755
  
  # a space separated list of UPS names
  # if empty, the list returned by 'upsc -l' will be used
-diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
-index ce42ccd..5792c6e 100755
 --- a/charts.d/opensips.chart.sh
 +++ b/charts.d/opensips.chart.sh
 @@ -1,4 +1,4 @@
@@ -154,8 +128,6 @@ index ce42ccd..5792c6e 100755
  
  opensips_opts="fifo get_statistics all"
  opensips_cmd=
-diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
-index 976ce91..7cd7726 100755
 --- a/charts.d/phpfpm.chart.sh
 +++ b/charts.d/phpfpm.chart.sh
 @@ -1,4 +1,4 @@
@@ -164,8 +136,6 @@ index 976ce91..7cd7726 100755
  
  # if this chart is called X.chart.sh, then all functions and global variables
  # must start with X_
-diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
-index 7f07a18..8669fda 100755
 --- a/charts.d/postfix.chart.sh
 +++ b/charts.d/postfix.chart.sh
 @@ -1,4 +1,4 @@
@@ -174,8 +144,6 @@ index 7f07a18..8669fda 100755
  
  # the postqueue command
  # if empty, it will use the one found in the system path
-diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
-index 9652f89..c697268 100755
 --- a/charts.d/sensors.chart.sh
 +++ b/charts.d/sensors.chart.sh
 @@ -1,4 +1,4 @@
@@ -184,8 +152,6 @@ index 9652f89..c697268 100755
  
  # sensors docs
  # https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
-diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
-index 3e72ba6..231b2a9 100755
 --- a/charts.d/squid.chart.sh
 +++ b/charts.d/squid.chart.sh
 @@ -1,4 +1,4 @@
@@ -194,8 +160,6 @@ index 3e72ba6..231b2a9 100755
  
  squid_host=
  squid_port=
-diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
-index cc6baea..50a17e2 100755
 --- a/charts.d/tomcat.chart.sh
 +++ b/charts.d/tomcat.chart.sh
 @@ -1,4 +1,4 @@
@@ -204,13 +168,11 @@ index cc6baea..50a17e2 100755
  
  # Description: Tomcat netdata charts.d plugin
  # Author: Jorge Romero
-diff --git a/plugins.d/loopsleepms.sh.inc b/plugins.d/loopsleepms.sh.inc
-index 02ab694..14ba64e 100644
 --- a/plugins.d/loopsleepms.sh.inc
 +++ b/plugins.d/loopsleepms.sh.inc
 @@ -1,4 +1,4 @@
 -# no need for shebang - this file is included from other scripts
 +#!/bin/bash
  
- # this function is used to sleep a fraction of a second
- # it calculates the difference between every time is called
+ LOOPSLEEP_DATE="$(which date)"
+ if [ -z "$LOOPSLEEP_DATE" ]