Merging upstream version 1.11.1+dfsg

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

4 files changed, 487 insertions, 4 deletions

diff --git a/installer/README.md b/installer/README.md
new file mode 100644
index 00000000..cbcefab0
--- /dev/null
+++ b/installer/README.md
@@ -0,0 +1,366 @@
+# Installation
+![image10](https://cloud.githubusercontent.com/assets/2662304/14253729/534c6f9c-fa95-11e5-8243-93eb0df719aa.gif)
+
+## Linux package managers
+
+You can install the latest release of netdata, using your package manager in
+
+   - Arch Linux (`sudo pacman -S netdata`)
+   - Alpine Linux (`sudo apk add netdata`)
+   - Debian Linux (`sudo apt install netdata`)
+   - Gentoo Linux (`sudo emerge --ask netdata`)
+   - OpenSUSE (`sudo zypper install netdata`)
+   - Solus Linux (`sudo eopkg install netdata`)
+   - Ubuntu Linux >= 18.04 (`sudo apt install netdata`)
+
+Please note that the particular packages are not build by netdata.
+
+## Docker
+
+You can [Install netdata with Docker](../docker/#install-netdata-with-docker)
+
+## Linux one liner
+
+![](https://registry.my-netdata.io/api/v1/badge.svg?chart=web_log_nginx.requests_per_url&options=unaligned&dimensions=kickstart&group=sum&after=-3600&label=last+hour&units=installations&value_color=orange&precision=0) ![](https://registry.my-netdata.io/api/v1/badge.svg?chart=web_log_nginx.requests_per_url&options=unaligned&dimensions=kickstart&group=sum&after=-86400&label=today&units=installations&precision=0)
+
+To install netdata from source to your systems and keep it up to date automatically, run the following:
+
+:hash:**`bash <(curl -Ss https://my-netdata.io/kickstart.sh)`**
+
+(do not `sudo` this command, it will do it by itself as needed)
+
+The command:
+
+1. detects the distro and **installs the required system packages** for building netdata (will ask for confirmation)
+2. downloads the latest netdata source tree to `/usr/src/netdata.git`.
+3. installs netdata by running `./netdata-installer.sh` from the source tree.
+4. installs `netdata-updater.sh` to `cron.daily`, so your netdata installation will be updated daily (you will get a message from cron only if the update fails).
+
+The `kickstart.sh` script passes all its parameters to `netdata-installer.sh`, so you can add more parameters to change the installation directory, enable/disable plugins, etc (check below).
+
+For automated installs, append a space + `--dont-wait` to the command line. You can also append `--dont-start-it` to prevent the installer from starting netdata. Example:
+
+```sh
+bash <(curl -Ss https://my-netdata.io/kickstart.sh) all --dont-wait --dont-start-it
+```
+
+## Linux 64bit pre-built static binary 
+
+You can install a pre-compiled static binary of netdata for any Intel/AMD 64bit Linux system (even those that don't have a package manager, like CoreOS, CirrOS, busybox systems, etc). You can also use these packages on systems with broken or unsupported package managers.
+
+<br/>![](https://registry.my-netdata.io/api/v1/badge.svg?chart=web_log_nginx.requests_per_url&options=unaligned&dimensions=kickstart64&group=sum&after=-3600&label=last+hour&units=installations&value_color=orange&precision=0) ![](https://registry.my-netdata.io/api/v1/badge.svg?chart=web_log_nginx.requests_per_url&options=unaligned&dimensions=kickstart64&group=sum&after=-86400&label=today&units=installations&precision=0)
+
+To install netdata with a binary package on any Linux distro, any kernel version - for **Intel/AMD 64bit** hosts, run the following:
+
+:hash:&nbsp; **`bash <(curl -Ss https://my-netdata.io/kickstart-static64.sh)`**
+
+(do not `sudo` this command, it will do it by itself as needed; the target system does not need `bash` installed, check below for instructions to run it without `bash`)
+
+*Note: The static builds install netdata at `/opt/netdata`*
+
+For automated installs, append a space + `--dont-wait` to the command line. You can also append `--dont-start-it` to prevent the installer from starting netdata. Example:
+
+```sh
+bash <(curl -Ss https://my-netdata.io/kickstart-static64.sh) --dont-wait --dont-start-it
+```
+
+If your shell fails to handle the above one liner, do this:
+
+```sh
+# download the script with curl
+curl https://my-netdata.io/kickstart-static64.sh >/tmp/kickstart-static64.sh
+
+# or, download the script with wget
+wget -O /tmp/kickstart-static64.sh https://my-netdata.io/kickstart-static64.sh
+
+# run the downloaded script (any sh is fine, no need for bash)
+sh /tmp/kickstart-static64.sh
+```
+
+The static binary files are kept in repo [binary-packages](https://github.com/netdata/binary-packages). You can download any of the `.run` files, and run it. These files are self-extracting shell scripts built with [makeself](https://github.com/megastep/makeself). The target system does **not** need to have bash installed. The same files can be used for updates too.
+
+## Other installation methods
+
+- **Linux manual installation from source**
+
+    Semi-automatic, with more details about the steps involved and actions taken [here](#install-netdata-on-linux-manually)
+
+- **Non-Linux installation**
+    - [Install from package or source, on FreeBSD](#freebsd)
+    - [Install from package, on pfSense](#pfsense)
+    - [Enable netdata on FreeNAS Corral](#freenas)
+    - [Install from package or source, on macOS (OS X)](#macos)
+
+    See also the list of netdata [package maintainers](../packaging/maintainers) for ASUSTOR NAS, OpenWRT, ReadyNAS, etc.
+ 
+## Install netdata on Linux manually
+
+To install the latest git version of netdata, please follow these 2 steps:
+
+1. [Prepare your system](#prepare-your-system)
+
+   Install the required packages on your system.
+
+2. [Install netdata](#install-netdata)
+
+   Download and install netdata. You can also update it the same way.
+
+---
+
+### Prepare your system
+
+Try our experimental automatic requirements installer (no need to be root). This will try to find the packages that should be installed on your system to build and run netdata. It supports most major Linux distributions released after 2010:
+
+- **Alpine** Linux and its derivatives (you have to install `bash` yourself, before using the installer)
+- **Arch** Linux and its derivatives
+- **Gentoo** Linux and its derivatives
+- **Debian** Linux and its derivatives (including **Ubuntu**, **Mint**)
+- **Fedora** and its derivatives (including **Red Hat Enterprise Linux**, **CentOS**, **Amazon Machine Image**)
+- **SuSe** Linux and its derivatives (including **openSuSe**)
+- **SLE12** Must have your system registered with Suse Customer Center or have the DVD. See [#1162](https://github.com/netdata/netdata/issues/1162)
+
+Install the packages for having a **basic netdata installation** (system monitoring and many applications, without  `mysql` / `mariadb`, `postgres`, `named`, hardware sensors and `SNMP`):
+
+```sh
+curl -Ss 'https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh' >/tmp/kickstart.sh && bash /tmp/kickstart.sh -i netdata
+```
+
+Install all the required packages for **monitoring everything netdata can monitor**:
+
+```sh
+curl -Ss 'https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh' >/tmp/kickstart.sh && bash /tmp/kickstart.sh -i netdata-all
+```
+
+If the above do not work for you, please [open a github issue](https://github.com/netdata/netdata/issues/new?title=packages%20installer%20failed&labels=installation%20help&body=The%20experimental%20packages%20installer%20failed.%0A%0AThis%20is%20what%20it%20says:%0A%0A%60%60%60txt%0A%0Aplease%20paste%20your%20screen%20here%0A%0A%60%60%60) with a copy of the message you get on screen. We are trying to make it work everywhere (this is also why the script [reports back](https://github.com/netdata/netdata/issues/2054) success or failure for all its runs).
+
+---
+
+This is how to do it by hand:
+
+```sh
+# Debian / Ubuntu
+apt-get install zlib1g-dev uuid-dev libmnl-dev gcc make git autoconf autoconf-archive autogen automake pkg-config curl
+
+# Fedora
+dnf install zlib-devel libuuid-devel libmnl-devel gcc make git autoconf autoconf-archive autogen automake pkgconfig curl findutils
+
+# CentOS / Red Hat Enterprise Linux
+yum install autoconf automake curl gcc git libmnl-devel libuuid-devel lm_sensors make MySQL-python nc pkgconfig python python-psycopg2 PyYAML zlib-devel
+
+```
+
+Please note that for RHEL/CentOS you might need [EPEL](http://www.tecmint.com/how-to-enable-epel-repository-for-rhel-centos-6-5/).
+
+Once netdata is compiled, to run it the following packages are required (already installed using the above commands):
+
+package|description
+:-----:|-----------
+`libuuid`|part of `util-linux` for GUIDs management
+`zlib`|gzip compression for the internal netdata web server
+
+*netdata will fail to start without the above.*
+
+netdata plugins and various aspects of netdata can be enabled or benefit when these are installed (they are optional):
+
+package|description
+:-----:|-----------
+`bash`|for shell plugins and **alarm notifications**
+`curl`|for shell plugins and **alarm notifications**
+`iproute` or `iproute2`|for monitoring **Linux traffic QoS**<br/>use `iproute2` if `iproute` reports as not available or obsolete
+`python`|for most of the external plugins
+`python-yaml`|used for monitoring **beanstalkd**
+`python-beanstalkc`|used for monitoring **beanstalkd**
+`python-dnspython`|used for monitoring DNS query time
+`python-ipaddress`|used for monitoring **DHCPd**<br/>this package is required only if the system has python v2. python v3 has this functionality embedded
+`python-mysqldb`<br/>or<br/>`python-pymysql`|used for monitoring **mysql** or **mariadb** databases<br/>`python-mysqldb` is a lot faster and thus preferred
+`python-psycopg2`|used for monitoring **postgresql** databases
+`python-pymongo`|used for monitoring **mongodb** databases
+`nodejs`|used for `node.js` plugins for monitoring **named** and **SNMP** devices
+`lm-sensors`|for monitoring **hardware sensors**
+`libmnl`|for collecting netfilter metrics
+`netcat`|for shell plugins to collect metrics from remote systems
+
+*netdata will greatly benefit if you have the above packages installed, but it will still work without them.*
+
+---
+
+### Install netdata
+
+Do this to install and run netdata:
+
+```sh
+
+# download it - the directory 'netdata' will be created
+git clone https://github.com/netdata/netdata.git --depth=1
+cd netdata
+
+# run script with root privileges to build, install, start netdata
+./netdata-installer.sh
+
+```
+
+* If you don't want to run it straight-away, add `--dont-start-it` option.
+
+* If you don't want to install it on the default directories, you can run the installer like this: `./netdata-installer.sh --install /opt`. This one will install netdata in `/opt/netdata`.
+
+Once the installer completes, the file `/etc/netdata/netdata.conf` will be created (if you changed the installation directory, the configuration will appear in that directory too).
+
+You can edit this file to set options. One common option to tweak is `history`, which controls the size of the memory database netdata will use. By default is `3600` seconds (an hour of data at the charts) which makes netdata use about 10-15MB of RAM (depending on the number of charts detected on your system). Check **[[Memory Requirements]]**.
+
+To apply the changes you made, you have to restart netdata.
+
+---
+
+## Other Systems
+
+
+
+##### FreeBSD
+
+You can install netdata from ports or packages collection.
+
+This is how to install the latest netdata version from sources on FreeBSD:
+
+```sh
+# install required packages
+pkg install bash e2fsprogs-libuuid git curl autoconf automake pkgconf pidof
+
+# download netdata
+git clone https://github.com/netdata/netdata.git --depth=1
+
+# install netdata in /opt/netdata
+cd netdata
+./netdata-installer.sh --install /opt
+```
+
+##### pfSense
+To install netdata on pfSense run the following commands (within a shell or under Diagnostics/Command Prompt within the pfSense web interface).
+
+Change platform (i386/amd64, etc) and FreeBSD versions (10/11, etc) according to your environment and change netdata version (1.10.0 in example) according to latest version present within the FreeSBD repository:-
+
+Note first three packages are downloaded from the pfSense repository for maintaining compatibility with pfSense, netdata is downloaded from the FreeBSD repository.
+```
+pkg install pkgconf
+pkg install bash
+pkg install e2fsprogs-libuuid
+pkg add http://pkg.freebsd.org/FreeBSD:11:amd64/latest/All/netdata-1.11.0.txz
+```
+To start netdata manually run `service netdata onestart`
+
+To start netdata automatically at each boot add `service netdata start` as a Shellcmd within the pfSense web interface (under **Services/Shellcmd**, which you need to install beforehand under **System/Package Manager/Available Packages**).
+Shellcmd Type should be set to `Shellcmd`. 
+![](https://user-images.githubusercontent.com/36808164/36930790-4db3aa84-1f0d-11e8-8752-cdc08bb7207c.png)
+Alternatively more information can be found in https://doc.pfsense.org/index.php/Installing_FreeBSD_Packages, for achieving the same via the command line and scripts.  
+
+If you experience an issue with `/usr/bin/install` absense on pfSense 2.3 or earlier, update pfSense or use workaround from [https://redmine.pfsense.org/issues/6643](https://redmine.pfsense.org/issues/6643)
+
+##### FreeNAS
+On FreeNAS-Corral-RELEASE (>=10.0.3), netdata is pre-installed. 
+
+To use netdata, the service will need to be enabled and started from the FreeNAS **[CLI](https://github.com/freenas/cli)**.
+
+To enable the netdata service:
+```
+service netdata config set enable=true
+```
+
+To start the netdata service:
+```
+service netdata start
+```
+
+##### macOS
+
+netdata on macOS still has limited charts, but external plugins do work.
+
+You can either install netdata with [Homebrew](https://brew.sh/)
+
+```sh
+brew install netdata
+```
+
+or from source:
+
+```sh
+# install Xcode Command Line Tools
+xcode-select --install
+```
+click `Install` in the software update popup window, then
+```sh
+# install HomeBrew package manager
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+# install required packages
+brew install ossp-uuid autoconf automake pkg-config
+
+# download netdata
+git clone https://github.com/netdata/netdata.git --depth=1
+
+# install netdata in /usr/local/netdata
+cd netdata
+sudo ./netdata-installer.sh --install /usr/local
+```
+
+The installer will also install a startup plist to start netdata when your Mac boots.
+
+##### Alpine 3.x
+
+Execute these commands to install netdata in Alpine Linux 3.x:
+
+```
+# install required packages
+apk add alpine-sdk bash curl zlib-dev util-linux-dev libmnl-dev gcc make git autoconf automake pkgconfig python logrotate
+
+# if you plan to run node.js netdata plugins
+apk add nodejs
+
+# download netdata - the directory 'netdata' will be created
+git clone https://github.com/netdata/netdata.git --depth=1
+cd netdata
+
+
+# build it, install it, start it
+./netdata-installer.sh
+
+
+# make netdata start at boot
+echo -e "#!/usr/bin/env bash\n/usr/sbin/netdata" >/etc/local.d/netdata.start
+chmod 755 /etc/local.d/netdata.start
+
+# make netdata stop at shutdown
+echo -e "#!/usr/bin/env bash\nkillall netdata" >/etc/local.d/netdata.stop
+chmod 755 /etc/local.d/netdata.stop
+
+# enable the local service to start automatically
+rc-update add local
+```
+
+##### Synology
+
+The documentation previously recommended installing the Debian Chroot package from the Synology community package sources and then running netdata from within the chroot. This does not work, as the chroot environment does not have access to `/proc`, and therefore exposes very few metrics to netdata. Additionally, [this issue](https://github.com/SynoCommunity/spksrc/issues/2758), still open as of 2018/06/24, indicates that the Debian Chroot package is not suitable for DSM versions greater than version 5 and may corrupt system libraries and render the NAS unable to boot. 
+
+The good news is that the 64-bit static installer works fine if your NAS is one that uses the amd64 architecture. It will install the content into `/opt/netdata`, making future removal safe and simple.
+
+###### Additional Work
+
+When netdata is first installed, it will run as _root_. This may or may not be acceptable for you, and since other installations run it as the _netdata_ user, you might wish to do the same. This requires some extra work:
+
+1. Creat a group `netdata` via the Synology group interface. Give it no access to anything.
+2. Create a user `netdata` via the Synology user interface. Give it no access to anything and a random password. Assign the user to the `netdata` group. Netdata will chuid to this user when running.
+3. Change ownership of the following directories, as defined in [Netdata Security](../doc/netdata-security.md#netdata-security):
+
+```
+$ chown -R root:netdata /opt/netdata/usr/share/netdata
+$ chown -R netdata:netdata /opt/netdata/var/lib/netdata /opt/netdata/var/cache/netdata
+$ chown -R netdata:root /opt/netdata/var/log/netdata
+```
+
+Additionally, as of 2018/06/24, the netdata installer doesn't recognize DSM as an operating system, so no init script is installed. You'll have to do this manually:
+
+1. Add [this file](https://gist.github.com/oskapt/055d474d7bfef32c49469c1b53e8225f) as `/etc/rc.netdata`. Make it executable with `chmod 0755 /etc/rc.netdata`.
+2. Edit `/etc/rc.local` and add a line calling `/etc/rc.netdata` to have it start on boot:
+
+```
+# Netdata startup
+[ -x /etc/rc.netdata ] && /etc/rc.netdata start
+```
diff --git a/installer/UNINSTALL.md b/installer/UNINSTALL.md
new file mode 100644
index 00000000..4f9a84d0
--- /dev/null
+++ b/installer/UNINSTALL.md
@@ -0,0 +1,36 @@
+# Uninstalling netdata
+
+## netdata was installed from source (or `kickstart.sh`)
+
+The script `netdata-installer.sh` generates another script called `netdata-uninstaller.sh`.
+
+To uninstall netdata, run:
+
+```
+cd /path/to/netdata.git
+./netdata-uninstaller.sh --force
+```
+
+The uninstaller will ask you to confirm all deletions.
+
+## netdata was installed with `kickstart-static64.sh` package
+
+Stop netdata with one of the following:
+
+- `service netdata stop` (non-systemd systems)
+- `systemctl stop netdata` (systemd systems)
+
+Disable running netdata at startup, with one of the following (based on your distro):
+
+- `rc-update del netdata`
+- `update-rc.d netdata disable`
+- `chkconfig netdata off`
+- `systemctl disable netdata`
+
+Delete the netdata files:
+
+1. `rm -rf /opt/netdata`
+2. `groupdel netdata`
+3. `userdel netdata`
+4. `rm /etc/logrotate.d/netdata`
+5. `rm /etc/systemd/system/netdata.service` or `rm /etc/init.d/netdata`, depending on the distro.
diff --git a/installer/UPDATE.md b/installer/UPDATE.md
new file mode 100644
index 00000000..cda21fc0
--- /dev/null
+++ b/installer/UPDATE.md
@@ -0,0 +1,71 @@
+# Updating netdata after its installation
+
+![image8](https://cloud.githubusercontent.com/assets/2662304/14253735/536f4580-fa95-11e5-9f7b-99112b31a5d7.gif)
+
+
+We suggest to keep your netdata updated. We are actively developing it and you should always update to the latest version.
+
+The update procedure depends on how you installed it:
+
+## You downloaded it from github using git
+
+### Manual update
+
+The installer `netdata-installer.sh` generates a `netdata-updater.sh` script in the directory you downloaded netdata. 
+You can use this script to update your netdata installation with the same options you used to install it in the first place.
+Just run it and it will download and install the latest version of netdata. The same script can be put in a cronjob to update your netdata at regular intervals.
+
+```sh
+# go to the git downloaded directory
+cd /path/to/git/downloaded/netdata
+
+# run the updater
+./netdata-updater.sh
+```
+
+_Netdata will be restarted with the new version._
+
+If you don't have this script (e.g. you deleted the directory where you downloaded netdata), just follow the **[[Installation]]** instructions again. The installer preserves your configuration. You can also update netdata to the latest version by hand, using this:
+
+```sh
+# go to the git downloaded directory
+cd /path/to/git/downloaded/netdata
+
+# download the latest version
+git pull
+
+# rebuild it, install it, run it
+./netdata-installer.sh
+```
+
+_Netdata will be restarted with the new version._
+
+Keep in mind, netdata may now have new features, or certain old features may now behave differently. So pay some attention to it after updating.
+
+### Auto-update
+
+_Please, consider the risks of running an auto-update. Something can always go wrong. Keep an eye on your installation, and run a manual update if something ever fails._
+
+You can call `netdata-updater.sh` from a cron-job. A successful update will not trigger an email from cron. 
+
+```sh
+# Edit your cron-jobs
+crontab -e
+
+# add a cron-job at the bottom. This one will update netdata every day at 6:00AM:
+# update netdata
+0 6 * * * /path/to/git/downloaded/netdata/netdata-updater.sh
+```
+
+## You downloaded a binary package
+
+If you installed it from a binary package, the best way is to **obtain a newer copy** from the source you got it in the first place.
+
+If a newer version of netdata is not available from the source you got it, we suggest to uninstall the version you have and follow the **[[Installation]]** instructions for installing a fresh version of netdata.
+
+
+
+
+
+
+
diff --git a/installer/functions.sh b/installer/functions.sh
index dc283331..155edd79 100644
--- a/installer/functions.sh
+++ b/installer/functions.sh
@@ -441,8 +441,8 @@ iscontainer() {
 issystemd() {
     local pids p myns ns systemctl
 
-    # if the directory /lib/systemd/system does not exit, it is not systemd
-    [ ! -d /lib/systemd/system ] && return 1
+    # if the directory /lib/systemd/system OR /usr/lib/systemd/system (SLES 12.x) does not exit, it is not systemd
+    [ ! -d /lib/systemd/system -a ! -d /usr/lib/systemd/system ] && return 1
 
     # if there is no systemctl command, it is not systemd
     # shellcheck disable=SC2230
@@ -563,15 +563,25 @@ install_netdata_service() {
             NETDATA_START_CMD="systemctl start netdata"
             NETDATA_STOP_CMD="systemctl stop netdata"
 
+            SYSTEMD_DIRECTORY=""
+
             if [ -d "/lib/systemd/system" ]
             then
+                SYSTEMD_DIRECTORY="/lib/systemd/system"
+            elif [ -d "/usr/lib/systemd/system" ]
+            then
+                SYSTEMD_DIRECTORY="/usr/lib/systemd/system"
+            fi
+
+            if [ "${SYSTEMD_DIRECTORY}x" != "x" ]
+            then
                 echo >&2 "Installing systemd service..."
-                run cp system/netdata.service /lib/systemd/system/netdata.service && \
+                run cp system/netdata.service "${SYSTEMD_DIRECTORY}/netdata.service" && \
                     run systemctl daemon-reload && \
                     run systemctl enable netdata && \
                     return 0
             else
-                echo >&2 "no '/lib/systemd/system' directory; cannot install netdata.service"
+                echo >&2 "no systemd directory; cannot install netdata.service"
             fi
         else
             install_non_systemd_init