Merge branch 'master' into ab-debian

* master: (38 commits)
  python readme update: web_log
  python readme update: smartd_log
  python readme update: nginx_log removed, postgres added
  allow the installer to check configs signatures when the BASH is older than v4
  disable /var/lib/docker/* by default
  disable by default monitoring /snap/*; disable also ram* and loop* block devices
  fix gauge gradient colors; fixes #1136
  UrlService: custom_url support for _get_data and minor fixes
  elasticsearch_plugin: "python-requests" requirement removed
  prevent cpufreq messages flood; fixes #1933
  gitignore freeipmi.plugin
  allow custom defined information on the dashboard; fixes #1936
  database size for mirrored hosts is now aligned to page size
  add backwards compatibility for http listen backlog setting
  make sure disconnected_time is updated before decrementing senders
  automatic naming for libvirtd virtual machines; fixes #1045
  prevents hosts from being removed during initialization
  added compile option NETDATA_VERIFY_LOCKS to enable the locks
  added compile option NETDATA_VERIFY_LOCKS to enable the locks
  print the lock pointer in debug mode
  ...

diff --git a/.gitignore b/.gitignore
index 0169e931658a55d00642570ae8ce02ad1d4029b7..22960709551dd91b310f60a673742cb69e67800b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -88,7 +88,7 @@ cmake_install.cmake
 
 .DS_Store
 
-contrib/debian/changelog
+/debian
 profile/benchmark-dictionary
 profile/benchmark-registry
 

diff --git a/contrib/debian/.gitignore b/contrib/debian/.gitignore
new file mode 100644 (file)
index 0000000..053ab63
--- /dev/null
+++ b/contrib/debian/.gitignore
@@ -0,0 +1,12 @@
+autoreconf.after
+autoreconf.before
+debhelper-build-stamp
+files
+netdata.conffiles
+netdata.debhelper.log
+netdata.logrotate
+netdata.postinst
+netdata.postinst.debhelper
+netdata.postrm.debhelper
+netdata.prerm.debhelper
+netdata.substvars

diff --git a/contrib/debian/build-new-package.sh b/contrib/debian/build-new-package.sh
new file mode 100755 (executable)
index 0000000..0218bf7
--- /dev/null
+++ b/contrib/debian/build-new-package.sh
@@ -0,0 +1,63 @@
+#!/bin/sh -ex
+
+[ -r LICENSE.md ]
+[ -e debian ] || ln -fs contrib/debian debian
+[ -r debian/changelog ]
+[ -d .git ]
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+
+git checkout master
+
+old_descr=$(git describe)
+
+git fetch --all --tags
+git pull --ff-only origin master
+
+descr=$(git describe)
+
+COMMIT_ID=$(git rev-parse HEAD)
+export COMMIT_ID
+
+git checkout "$branch"
+
+if [ "$old_descr" = "$descr" ]; then
+       if ! head -n 1 debian/changelog | fgrep " UNRELEASED;" >/dev/null; then
+               set +x
+               echo; echo "Nothing to do."; echo
+               exit 0
+       fi
+fi
+
+git merge master
+
+date=$(date +%Y%m%d)
+rev="01"
+suffix="0ab1"
+
+last_date=$(head -n 1 debian/changelog | cut -d'.' -f2 | cut -d'.' -f1)
+last_rev=$(head -n 1 debian/changelog | cut -d'.' -f3 | cut -d'-' -f1)
+last_suffix=$(head -n 1 debian/changelog | cut -d'-' -f2 | cut -d')' -f1)
+
+if head -n 1 debian/changelog | fgrep " UNRELEASED;" >/dev/null; then
+       if [ "$last_date" = "$date" ]; then
+               rev=$last_rev
+               suffix=$last_suffix
+       fi
+else
+       if [ "$last_date" = "$date" ]; then
+               rev=$(printf "%02d" $((last_rev+1)))
+       fi
+fi
+
+version="0.$date.$rev-$suffix"
+
+dch -v "$version" "Pulled upstream Git version $descr"
+dch -r ""
+
+git add contrib/debian/changelog
+git commit -m "${branch} ${version}, upstream $descr"
+git tag "${branch}_${version}"
+
+dpkg-buildpackage -rfakeroot -b
+

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
new file mode 100644 (file)
index 0000000..71cd15d
--- /dev/null
+++ b/contrib/debian/changelog
@@ -0,0 +1,86 @@
+netdata (0.20170311.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-573-g0fba967b
+
+ -- Alexander Barton <alex@barton.de>  Sat, 11 Mar 2017 22:28:34 +0100
+
+netdata (0.20170301.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-485-g360b3624
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Mar 2017 22:43:54 +0100
+
+netdata (0.20170227.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-463-g1d0c1b2c
+
+ -- Alexander Barton <alex@barton.de>  Mon, 27 Feb 2017 14:34:11 +0100
+
+netdata (0.20170225.02-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-338-g155d0e6f
+
+ -- Alexander Barton <alex@barton.de>  Sat, 25 Feb 2017 21:14:09 +0100
+
+netdata (0.20170225.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-334-g27ef89e
+
+ -- Alexander Barton <alex@barton.de>  Sat, 25 Feb 2017 00:27:15 +0100
+
+netdata (0.20170221.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-330-gb5b241f
+
+ -- Alexander Barton <alex@barton.de>  Tue, 21 Feb 2017 11:59:55 +0100
+
+netdata (0.20170213.02-0ab1) unstable; urgency=medium
+
+  * Revert upstream change to version check logic, use the information from
+    the installed version.txt file.
+  * Pulled upstream Git version v1.5.0-267-g6632e53
+
+ -- Alexander Barton <alex@barton.de>  Mon, 13 Feb 2017 14:58:20 +0100
+
+netdata (0.20170213.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-267-g6632e53
+
+ -- Alexander Barton <alex@barton.de>  Mon, 13 Feb 2017 14:23:07 +0100
+
+netdata (0.20170204.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-146-g1881345
+
+ -- Alexander Barton <alex@barton.de>  Sat, 04 Feb 2017 16:57:24 +0100
+
+netdata (0.20170203.01-0ab1) unstable; urgency=medium
+
+  * Pulled upstream Git version v1.5.0-135-g21feb71
+
+ -- Alexander Barton <alex@barton.de>  Fri, 03 Feb 2017 23:57:54 +0100
+
+netdata (0.20170201.01-0ab3) unstable; urgency=medium
+
+  * Correctly save the version (Git commit id) when building with the
+    contrib/debian/build-new-package.sh script.
+  * Pulled upstream Git version v1.5.0-123-g2cb7e08
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Feb 2017 23:41:57 +0100
+
+netdata (0.20170201.01-0ab2) unstable; urgency=medium
+
+  * contrib/debian/build-new-package.sh
+     - Correctly get upstream Git commit description.
+     - Enhance own Git log message, add upstream commit description.
+     - Don't create new release when no changes were made.
+  * Pulled upstream Git version v1.5.0-123-g2cb7e08
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Feb 2017 23:24:49 +0100
+
+netdata (0.20170201.01-0ab1) unstable; urgency=medium
+
+  * Initial release.
+  * Pulled upstream Git version v1.5.0-124-gfc7680f
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Feb 2017 22:59:20 +0100

diff --git a/contrib/debian/rules b/contrib/debian/rules
index ec4ec41821b9b58e8bb487fc519b06915c59e803..6b417d33088ac6604cc62175b6591d5adf9b2d6e 100755 (executable)
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -25,6 +25,11 @@ debian/%.postinst: debian/%.postinst.in
 override_dh_install: debian/netdata.postinst
        dh_install
 
+       # Set correct version (Git commit id) when called by the
+       # contrib/debian/build-new-package.sh script:
+       #
+       [ -z "$$COMMIT_ID" ] || echo "$$COMMIT_ID" >$(TOP)/var/lib/netdata/www/version.txt
+
        # Remove unneeded .keep files
        #
        find "$(TOP)" -name .keep -exec rm '{}' ';'

diff --git a/web/index.html b/web/index.html
index 250dbfed32c69a35d8729836fcf4f0c57a54b4a4..b62306a2655ae56069a26e1bb909d0a1b94ee4e1 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2384,14 +2384,12 @@
             })
             .done(function(data) {
                 data = data.replace(/(\r\n|\n|\r| |\t)/gm,"");
-
-                var c = getNetdataCommitIdFromVersion();
-                if(c !== null && data.length === 40 && data.substring(0, 7) !== c) {
-                    versionLog('Installed files commit id and internal netdata git commit id do not match');
-                    data = c;
+                if(data.length !== 40) {
+                    var c = getNetdataCommitIdFromVersion();
+                    if(c === null) versionLog('Cannot find the git commit id of netdata.');
+                    callback(c);
                 }
-
-                if(data.length >= 7) {
+                else {
                     versionLog('Installed git commit id of netdata is ' + data);
                     document.getElementById('netdataCommitId').innerHTML = data.substring(0, 7);
                     callback(data);