Merging upstream version 1.34.0.

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

10 files changed, 14 insertions, 901 deletions

diff --git a/contrib/README.md b/contrib/README.md
index e253efa9..36abd3b1 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -58,4 +58,4 @@ source is to remove the current package from your system, then
 install the new package. Upgrading on wheezy is known to not
 work cleanly; Jessie may behave as expected.
 
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcontrib%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
+
diff --git a/contrib/debian/compat b/contrib/debian/compat
index ec635144..f599e28b 100644
--- a/contrib/debian/compat
+++ b/contrib/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/contrib/debian/netdata.postinst b/contrib/debian/netdata.postinst
index f26c94f9..a6bd2996 100644
--- a/contrib/debian/netdata.postinst
+++ b/contrib/debian/netdata.postinst
@@ -50,9 +50,7 @@ case "$1" in
 
     dpkg-statoverride --force --update --add root netdata 0775 /var/lib/netdata/registry > /dev/null 2>&1
 
-    chown -R root:netdata /usr/share/netdata
     chown -R root:netdata /usr/libexec/netdata/plugins.d
-    chown -R root:netdata /var/lib/netdata/www
     setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/libexec/netdata/plugins.d/apps.plugin
     setcap cap_dac_read_search+ep /usr/libexec/netdata/plugins.d/slabinfo.plugin
     capsh --supports=cap_perfmon 2>/dev/null && setcap cap_perfmon+ep /usr/libexec/netdata/plugins.d/perf.plugin || setcap cap_sys_admin+ep /usr/libexec/netdata/plugins.d/perf.plugin
@@ -65,6 +63,7 @@ case "$1" in
 
     # Workaround for other plugins not installed directly by this package
     chmod -f 4750 /usr/libexec/netdata/plugins.d/freeipmi.plugin || true
+    chmod -f 4750 /usr/libexec/netdata/plugins.d/ioping || true
 
     ;;
 esac
diff --git a/contrib/debian/rules b/contrib/debian/rules
index f36e995f..cbf4a837 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -23,26 +23,20 @@ HAVE_EBPF = 1
 endif
 
 %:
-	# For jessie and beyond
-	#
-	dh $@ --with autoreconf,systemd
-
-	# For wheezy or other non-systemd distributions use the following. You
-	# should also see contrib/README.md which gives details of updates to
-	# make to debian/control.
-	#
-	#dh $@ --with autoreconf
+	dh $@
 
 override_dh_installinit:
 	echo "SystemD Version: $(SYSTEMD_VERSION)"
 	echo "Using SystemD Unit: $(SYSTEMD_UNIT)"
 	cp -v $(SYSTEMD_UNIT) debian/netdata.service
 
+	dh_systemd_enable
 	dh_installinit
 
 override_dh_auto_configure:
 	if [ $(HAVE_EBPF) -eq 1 ]; then \
 		packaging/bundle-libbpf.sh . ${TOP}/usr/libexec/netdata/plugins.d; \
+		packaging/bundle-ebpf-co-re.sh . ${TOP}/usr/libexec/netdata/plugins.d; \
 	fi
 	autoreconf -ivf
 	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
@@ -75,6 +69,10 @@ override_dh_install:
 	mkdir -p "$(TOP)/var/cache/netdata"
 	mkdir -p "$(TOP)/var/run/netdata"
 
+	# Copy the updater script
+	#
+	cp -v packaging/installer/netdata-updater.sh $(TOP)/usr/libexec/netdata/netdata-updater.sh
+
 	# Move files that local user shouldn't be editing to /usr/share/netdata
 	#
 	mkdir -p "$(TOP)/usr/share/netdata/www"
@@ -108,6 +106,10 @@ override_dh_installdocs:
 override_dh_fixperms:
 	dh_fixperms
 
+	# Updater script should be executable
+	#
+	chmod 0755 $(TOP)/usr/libexec/netdata/netdata-updater.sh
+
 	# apps.plugin should only be runnable by the netdata user. It will be
 	# given extra capabilities in the postinst script.
 	#
diff --git a/contrib/sles11/README.md b/contrib/sles11/README.md
deleted file mode 100644
index 4cdf7e9f..00000000
--- a/contrib/sles11/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-title: "Spec to build Netdata RPM for sles 11"
-custom_edit_url: https://github.com/netdata/netdata/edit/master/contrib/sles11/README.md
--->
-
-# Spec to build Netdata RPM for sles 11
-
-Based on [openSUSE rpm spec](https://build.opensuse.org/package/show/network/netdata) with some 
-changes and additions for sles 11 backport, namely:
-
--   init.d script 
--   run-time dependency on python ordereddict backport
--   patch for Netdata python.d plugin to work with older python
--   crude hack of notification script to work with bash 3 (email and syslog only, one destination,
-    see comments at the top)
-
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcontrib%2Fsles11%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
diff --git a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh
deleted file mode 100755
index df382923..00000000
--- a/contrib/sles11/alarm-notify-basic.bash3.sh
+++ /dev/null
@@ -1,755 +0,0 @@
-#!/usr/bin/env bash
-
-# basic version of netdata notifier to work with bash3
-# only mail and syslog destinations are supported, one recipient each
-# - email: DEFAULT_RECIPIENT_EMAIL, "root" by default
-# - syslog: "netdata" with local6 facility; disabled by default
-# - also: setting recipient to "disabled" or "silent" stops notifications for this alert
-
-# in /etc/netdata/health_alarm_notify.conf set something like
-# EMAIL_SENDER="netdata@gesdev-vm.m0.maxidom.ru"
-# SEND_EMAIL="YES"
-# DEFAULT_RECIPIENT_EMAIL="root"
-# SEND_SYSLOG="YES"
-# SYSLOG_FACILITY="local6"
-# DEFAULT_RECIPIENT_SYSLOG="netdata"
-
-# netdata
-# real-time performance and health monitoring, done right!
-# (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# GPL v3+
-#
-# Script to send alarm notifications for netdata
-#
-# Supported notification methods:
-#  - emails by @ktsaou
-#  - syslog messages by @Ferroin
-#  - all the rest is pruned :)
-
-# -----------------------------------------------------------------------------
-# testing notifications
-
-if [ \( "${1}" = "test" -o "${2}" = "test" \) -a "${#}" -le 2 ]
-then
-    if [ "${2}" = "test" ]
-    then
-        recipient="${1}"
-    else
-        recipient="${2}"
-    fi
-
-    [ -z "${recipient}" ] && recipient="sysadmin"
-
-    id=1
-    last="CLEAR"
-    test_res=0
-    for x in "WARNING" "CRITICAL"  "CLEAR"
-    do
-        echo >&2
-        echo >&2 "# SENDING TEST ${x} ALARM TO ROLE: ${recipient}"
-
-        "${0}" "${recipient}" "$(hostname)" 1 1 "${id}" "$(date +%s)" "test_alarm" "test.chart" "test.family" "${x}" "${last}" 100 90 "${0}" 1 $((0 + id)) "units" "this is a test alarm to verify notifications work" "new value" "old value"
-        if [ $? -ne 0 ]
-        then
-            echo >&2 "# FAILED"
-            test_res=1
-        else
-            echo >&2 "# OK"
-        fi
-
-        last="${x}"
-        id=$((id + 1))
-    done
-
-    exit $test_res
-fi
-
-export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
-export LC_ALL=C
-
-# -----------------------------------------------------------------------------
-
-PROGRAM_NAME="$(basename "${0}")"
-
-logdate() {
-    date "+%Y-%m-%d %H:%M:%S"
-}
-
-log() {
-    local status="${1}"
-    shift
-
-    echo >&2 "$(logdate): ${PROGRAM_NAME}: ${status}: ${*}"
-
-}
-
-warning() {
-    log WARNING "${@}"
-}
-
-error() {
-    log ERROR "${@}"
-}
-
-info() {
-    log INFO "${@}"
-}
-
-fatal() {
-    log FATAL "${@}"
-    exit 1
-}
-
-debug=${NETDATA_ALARM_NOTIFY_DEBUG-0}
-debug() {
-    [ "${debug}" = "1" ] && log DEBUG "${@}"
-}
-
-docurl() {
-    if [ -z "${curl}" ]
-        then
-        error "\${curl} is unset."
-        return 1
-    fi
-
-    if [ "${debug}" = "1" ]
-        then
-        echo >&2 "--- BEGIN curl command ---"
-        printf >&2 "%q " ${curl} "${@}"
-        echo >&2
-        echo >&2 "--- END curl command ---"
-
-        local out=$(mktemp /tmp/netdata-health-alarm-notify-XXXXXXXX)
-        local code=$(${curl} ${curl_options} --write-out %{http_code} --output "${out}" --silent --show-error "${@}")
-        local ret=$?
-        echo >&2 "--- BEGIN received response ---"
-        cat >&2 "${out}"
-        echo >&2
-        echo >&2 "--- END received response ---"
-        echo >&2 "RECEIVED HTTP RESPONSE CODE: ${code}"
-        rm "${out}"
-        echo "${code}"
-        return ${ret}
-    fi
-
-    ${curl} ${curl_options} --write-out %{http_code} --output /dev/null --silent --show-error "${@}"
-    return $?
-}
-
-# -----------------------------------------------------------------------------
-# this is to be overwritten by the config file
-
-custom_sender() {
-    info "not sending custom notification for ${status} of '${host}.${chart}.${name}'"
-}
-
-
-# -----------------------------------------------------------------------------
-
-# check for BASH v4+ (required for associative arrays)
-[ $(( ${BASH_VERSINFO[0]} )) -lt 3 ] && \
-    fatal "BASH version 3 or later is required (this is ${BASH_VERSION})."
-
-# -----------------------------------------------------------------------------
-# defaults to allow running this script by hand
-
-[ -z "${NETDATA_CONFIG_DIR}"   ] && NETDATA_CONFIG_DIR="$(dirname "${0}")/../../../../etc/netdata"
-[ -z "${NETDATA_CACHE_DIR}"    ] && NETDATA_CACHE_DIR="$(dirname "${0}")/../../../../var/cache/netdata"
-[ -z "${NETDATA_REGISTRY_URL}" ] && NETDATA_REGISTRY_URL="https://registry.my-netdata.io"
-
-# -----------------------------------------------------------------------------
-# parse command line parameters
-
-roles="${1}"               # the roles that should be notified for this event
-host="${2}"                # the host generated this event
-unique_id="${3}"           # the unique id of this event
-alarm_id="${4}"            # the unique id of the alarm that generated this event
-event_id="${5}"            # the incremental id of the event, for this alarm id
-when="${6}"                # the timestamp this event occurred
-name="${7}"                # the name of the alarm, as given in netdata health.d entries
-chart="${8}"               # the name of the chart (type.id)
-family="${9}"              # the family of the chart
-status="${10}"             # the current status : REMOVED, UNINITIALIZED, UNDEFINED, CLEAR, WARNING, CRITICAL
-old_status="${11}"         # the previous status: REMOVED, UNINITIALIZED, UNDEFINED, CLEAR, WARNING, CRITICAL
-value="${12}"              # the current value of the alarm
-old_value="${13}"          # the previous value of the alarm
-src="${14}"                # the line number and file the alarm has been configured
-duration="${15}"           # the duration in seconds of the previous alarm state
-non_clear_duration="${16}" # the total duration in seconds this is/was non-clear
-units="${17}"              # the units of the value
-info="${18}"               # a short description of the alarm
-value_string="${19}"       # friendly value (with units)
-old_value_string="${20}"   # friendly old value (with units)
-
-# -----------------------------------------------------------------------------
-# find a suitable hostname to use, if netdata did not supply a hostname
-
-this_host=$(hostname -s 2>/dev/null)
-[ -z "${host}" ] && host="${this_host}"
-
-# -----------------------------------------------------------------------------
-# screen statuses we don't need to send a notification
-
-# don't do anything if this is not WARNING, CRITICAL or CLEAR
-if [ "${status}" != "WARNING" -a "${status}" != "CRITICAL" -a "${status}" != "CLEAR" ]
-then
-    info "not sending notification for ${status} of '${host}.${chart}.${name}'"
-    exit 1
-fi
-
-# don't do anything if this is CLEAR, but it was not WARNING or CRITICAL
-if [ "${old_status}" != "WARNING" -a "${old_status}" != "CRITICAL" -a "${status}" = "CLEAR" ]
-then
-    info "not sending notification for ${status} of '${host}.${chart}.${name}' (last status was ${old_status})"
-    exit 1
-fi
-
-# -----------------------------------------------------------------------------
-# load configuration
-
-# By default fetch images from the global public registry.
-# This is required by default, since all notification methods need to download
-# images via the Internet, and private registries might not be reachable.
-# This can be overwritten at the configuration file.
-images_base_url="https://registry.my-netdata.io"
-
-# curl options to use
-curl_options=
-
-# needed commands
-# if empty they will be searched in the system path
-curl=
-sendmail=
-
-# enable / disable features
-SEND_EMAIL="YES"
-SEND_SYSLOG="YES"
-
-# syslog configs
-SYSLOG_FACILITY="local6"
-
-# email configs
-EMAIL_SENDER=
-DEFAULT_RECIPIENT_EMAIL="root"
-EMAIL_CHARSET=$(locale charmap 2>/dev/null)
-
-# load the user configuration
-# this will overwrite the variables above
-if [ -f "${NETDATA_CONFIG_DIR}/health_alarm_notify.conf" ]
-    then
-    source "${NETDATA_CONFIG_DIR}/health_alarm_notify.conf"
-else
-    error "Cannot find file ${NETDATA_CONFIG_DIR}/health_alarm_notify.conf. Using internal defaults."
-fi
-
-# If we didn't autodetect the character set for e-mail and it wasn't
-# set by the user, we need to set it to a reasonable default.  UTF-8
-# should be correct for almost all modern UNIX systems.
-if [ -z ${EMAIL_CHARSET} ]
-    then
-    EMAIL_CHARSET="UTF-8"
-fi
-
-# disable if role = silent or disabled
-if [[ "${role}" = "silent" || "${role}" = "disabled" ]]; then
-    SEND_EMAIL="NO"
-    SEND_SYSLOG="NO"
-fi
-
-if [[ "SEND_EMAIL" != "NO" ]]; then
-    to_email=$DEFAULT_RECIPIENT_EMAIL
-else
-    to_email=''
-fi
-
-if [[ "SEND_SYSLOG" != "NO" ]]; then
-    to_syslog=$DEFAULT_RECIPIENT_SYSLOG
-else
-    to_syslog=''
-fi
-
-# if we need sendmail, check for the sendmail command
-if [ "${SEND_EMAIL}" = "YES" -a -z "${sendmail}" ]
-    then
-    sendmail="$(which sendmail 2>/dev/null || command -v sendmail 2>/dev/null)"
-    if [ -z "${sendmail}" ]
-        then
-        debug "Cannot find sendmail command in the system path. Disabling email notifications."
-        SEND_EMAIL="NO"
-    fi
-fi
-
-# if we need logger, check for the logger command
-if [ "${SEND_SYSLOG}" = "YES" -a -z "${logger}" ]
-    then
-    logger="$(which logger 2>/dev/null || command -v logger 2>/dev/null)"
-    if [ -z "${logger}" ]
-        then
-        debug "Cannot find logger command in the system path. Disabling syslog notifications."
-        SEND_SYSLOG="NO"
-    fi
-fi
-
-# check that we have at least a method enabled
-if [   "${SEND_EMAIL}"          != "YES" \
-    -a "${SEND_SYSLOG}"         != "YES" \
-    ]
-    then
-    fatal "All notification methods are disabled. Not sending notification for host '${host}', chart '${chart}' to '${roles}' for '${name}' = '${value}' for status '${status}'."
-fi
-
-# -----------------------------------------------------------------------------
-# get the date the alarm happened
-
-date=$(date --date=@${when} "${DATE_FORMAT}" 2>/dev/null)
-[ -z "${date}" ] && date=$(date "${DATE_FORMAT}" 2>/dev/null)
-[ -z "${date}" ] && date=$(date --date=@${when} 2>/dev/null)
-[ -z "${date}" ] && date=$(date 2>/dev/null)
-
-# -----------------------------------------------------------------------------
-# function to URL encode a string
-
-urlencode() {
-    local string="${1}" strlen encoded pos c o
-
-    strlen=${#string}
-    for (( pos=0 ; pos<strlen ; pos++ ))
-    do
-        c=${string:${pos}:1}
-        case "${c}" in
-            [-_.~a-zA-Z0-9])
-                o="${c}"
-                ;;
-
-            *)
-                printf -v o '%%%02x' "'${c}"
-                ;;
-        esac
-        encoded+="${o}"
-    done
-
-    REPLY="${encoded}"
-    echo "${REPLY}"
-}
-
-# -----------------------------------------------------------------------------
-# function to convert a duration in seconds, to a human readable duration
-# using DAYS, MINUTES, SECONDS
-
-duration4human() {
-    local s="${1}" d=0 h=0 m=0 ds="day" hs="hour" ms="minute" ss="second" ret
-    d=$(( s / 86400 ))
-    s=$(( s - (d * 86400) ))
-    h=$(( s / 3600 ))
-    s=$(( s - (h * 3600) ))
-    m=$(( s / 60 ))
-    s=$(( s - (m * 60) ))
-
-    if [ ${d} -gt 0 ]
-    then
-        [ ${m} -ge 30 ] && h=$(( h + 1 ))
-        [ ${d} -gt 1 ] && ds="days"
-        [ ${h} -gt 1 ] && hs="hours"
-        if [ ${h} -gt 0 ]
-        then
-            ret="${d} ${ds} and ${h} ${hs}"
-        else
-            ret="${d} ${ds}"
-        fi
-    elif [ ${h} -gt 0 ]
-    then
-        [ ${s} -ge 30 ] && m=$(( m + 1 ))
-        [ ${h} -gt 1 ] && hs="hours"
-        [ ${m} -gt 1 ] && ms="minutes"
-        if [ ${m} -gt 0 ]
-        then
-            ret="${h} ${hs} and ${m} ${ms}"
-        else
-            ret="${h} ${hs}"
-        fi
-    elif [ ${m} -gt 0 ]
-    then
-        [ ${m} -gt 1 ] && ms="minutes"
-        [ ${s} -gt 1 ] && ss="seconds"
-        if [ ${s} -gt 0 ]
-        then
-            ret="${m} ${ms} and ${s} ${ss}"
-        else
-            ret="${m} ${ms}"
-        fi
-    else
-        [ ${s} -gt 1 ] && ss="seconds"
-        ret="${s} ${ss}"
-    fi
-
-    REPLY="${ret}"
-    echo "${REPLY}"
-}
-
-# -----------------------------------------------------------------------------
-# email sender
-
-send_email() {
-    local ret= opts=
-    if [[ "${SEND_EMAIL}" == "YES" ]]
-        then
-
-        if [[ ! -z "${EMAIL_SENDER}" ]]
-            then
-            if [[ "${EMAIL_SENDER}" =~ \".*\"\ \<.*\> ]]
-                then
-                # the name includes single quotes
-                opts=" -f $(echo "${EMAIL_SENDER}" | cut -d '<' -f 2 | cut -d '>' -f 1) -F $(echo "${EMAIL_SENDER}" | cut -d '<' -f 1)"
-            elif [[ "${EMAIL_SENDER}" =~ \'.*\'\ \<.*\> ]]
-                then
-                # the name includes double quotes
-                opts=" -f $(echo "${EMAIL_SENDER}" | cut -d '<' -f 2 | cut -d '>' -f 1) -F $(echo "${EMAIL_SENDER}" | cut -d '<' -f 1)"
-            elif [[ "${EMAIL_SENDER}" =~ .*\ \<.*\> ]]
-                then
-                # the name does not have any quotes
-                opts=" -f $(echo "${EMAIL_SENDER}" | cut -d '<' -f 2 | cut -d '>' -f 1) -F '$(echo "${EMAIL_SENDER}" | cut -d '<' -f 1)'"
-            else
-                # no name at all
-                opts=" -f ${EMAIL_SENDER}"
-            fi
-        fi
-
-        if [[ "${debug}" = "1" ]]
-            then
-            echo >&2 "--- BEGIN sendmail command ---"
-            printf >&2 "%q " "${sendmail}" -t ${opts}
-            echo >&2
-            echo >&2 "--- END sendmail command ---"
-        fi
-
-        "${sendmail}" -t ${opts}
-        ret=$?
-
-        if [ ${ret} -eq 0 ]
-        then
-            info "sent email notification for: ${host} ${chart}.${name} is ${status} to '${to_email}'"
-            return 0
-        else
-            error "failed to send email notification for: ${host} ${chart}.${name} is ${status} to '${to_email}' with error code ${ret}."
-            return 1
-        fi
-    fi
-
-    return 1
-}
-
-# -----------------------------------------------------------------------------
-# syslog sender
-
-send_syslog() {
-    local facility=${SYSLOG_FACILITY:-"local6"} level='info' targets="${1}"
-    local priority='' message='' host='' port='' prefix=''
-    local temp1='' temp2=''
-
-    [[ "${SEND_SYSLOG}" == "YES" ]] || return 1
-
-    if [[ "${status}" == "CRITICAL" ]] ; then
-        level='crit'
-    elif [[ "${status}" == "WARNING" ]] ; then
-        level='warning'
-    fi
-
-    for target in ${targets} ; do
-        priority="${facility}.${level}"
-        message=''
-        host=''
-        port=''
-        prefix=''
-        temp1=''
-        temp2=''
-
-        prefix=$(echo ${target} | cut -d '/' -f 2)
-        temp1=$(echo ${target} | cut -d '/' -f 1)
-
-        if [[ ${prefix} != ${temp1} ]] ; then
-            if (echo ${temp1} | grep -q '@' ) ; then
-                temp2=$(echo ${temp1} | cut -d '@' -f 1)
-                host=$(echo ${temp1} | cut -d '@' -f 2)
-
-                if [ ${temp2} != ${host} ] ; then
-                    priority=${temp2}
-                fi
-
-                port=$(echo ${host} | rev | cut -d ':' -f 1 | rev)
-
-                if ( echo ${host} | grep -E -q '\[.*\]' ) ; then
-                    if ( echo ${port} | grep -q ']' ) ; then
-                        port=''
-                    else
-                        host=$(echo ${host} | rev | cut -d ':' -f 2- | rev)
-                    fi
-                else
-                    if [ ${port} = ${host} ] ; then
-                        port=''
-                    else
-                        host=$(echo ${host} | cut -d ':' -f 1)
-                    fi
-                fi
-            else
-                priority=${temp1}
-            fi
-        fi
-
-        # message="${prefix} ${status} on ${host} at ${date}: ${chart} ${value_string}"
-
-        message="${prefix} ${status}: ${chart} ${value_string}"
-
-        if [ ${host} ] ; then
-            logger_options="${logger_options} -n ${host}"
-            if [ ${port} ] ; then
-                logger_options="${logger_options} -P ${port}"
-            fi
-        fi
-
-        ${logger} -p ${priority} ${logger_options} "${message}"
-    done
-
-    return $?
-}
-
-
-# -----------------------------------------------------------------------------
-# prepare the content of the notification
-
-# the url to send the user on click
-urlencode "${host}" >/dev/null; url_host="${REPLY}"
-urlencode "${chart}" >/dev/null; url_chart="${REPLY}"
-urlencode "${family}" >/dev/null; url_family="${REPLY}"
-urlencode "${name}" >/dev/null; url_name="${REPLY}"
-goto_url="${NETDATA_REGISTRY_URL}/goto-host-from-alarm.html?host=${url_host}&chart=${url_chart}&family=${url_family}&alarm=${url_name}&alarm_unique_id=${unique_id}&alarm_id=${alarm_id}&alarm_event_id=${event_id}"
-
-# the severity of the alarm
-severity="${status}"
-
-# the time the alarm was raised
-duration4human ${duration} >/dev/null; duration_txt="${REPLY}"
-duration4human ${non_clear_duration} >/dev/null; non_clear_duration_txt="${REPLY}"
-raised_for="(was ${old_status} for ${duration_txt})"
-
-# the key status message
-status_message="status unknown"
-
-# the color of the alarm
-color="grey"
-
-# the alarm value
-alarm="${name//_/ } = ${value_string}"
-
-# the image of the alarm
-image="${images_base_url}/images/seo-performance-128.png"
-
-# prepare the title based on status
-case "${status}" in
-	CRITICAL)
-        image="${images_base_url}/images/alert-128-red.png"
-        status_message="is critical"
-        color="#ca414b"
-        ;;
-
-    WARNING)
-        image="${images_base_url}/images/alert-128-orange.png"
-        status_message="needs attention"
-        color="#ffc107"
-		;;
-
-	CLEAR)
-        image="${images_base_url}/images/check-mark-2-128-green.png"
-    	status_message="recovered"
-		color="#77ca6d"
-		;;
-esac
-
-if [ "${status}" = "CLEAR" ]
-then
-    severity="Recovered from ${old_status}"
-    if [ ${non_clear_duration} -gt ${duration} ]
-    then
-        raised_for="(alarm was raised for ${non_clear_duration_txt})"
-    fi
-
-    # don't show the value when the status is CLEAR
-    # for certain alarms, this value might not have any meaning
-    alarm="${name//_/ } ${raised_for}"
-
-elif [ "${old_status}" = "WARNING" -a "${status}" = "CRITICAL" ]
-then
-    severity="Escalated to ${status}"
-    if [ ${non_clear_duration} -gt ${duration} ]
-    then
-        raised_for="(alarm is raised for ${non_clear_duration_txt})"
-    fi
-
-elif [ "${old_status}" = "CRITICAL" -a "${status}" = "WARNING" ]
-then
-    severity="Demoted to ${status}"
-    if [ ${non_clear_duration} -gt ${duration} ]
-    then
-        raised_for="(alarm is raised for ${non_clear_duration_txt})"
-    fi
-
-else
-    raised_for=
-fi
-
-# prepare HTML versions of elements
-info_html=
-[ ! -z "${info}" ] && info_html=" <small><br/>${info}</small>"
-
-raised_for_html=
-[ ! -z "${raised_for}" ] && raised_for_html="<br/><small>${raised_for}</small>"
-
-
-# -----------------------------------------------------------------------------
-# send the syslog message
-
-send_syslog ${to_syslog}
-
-SENT_SYSLOG=$?
-
-# -----------------------------------------------------------------------------
-# send the email
-
-send_email <<EOF
-To: ${to_email}
-Subject: ${host} ${status_message} - ${name//_/ } - ${chart}
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="multipart-boundary"
-
-This is a MIME-encoded multipart message
-
---multipart-boundary
-Content-Type: text/plain; encoding=${EMAIL_CHARSET}
-Content-Disposition: inline
-Content-Transfer-Encoding: 8bit
-
-${host} ${status_message}
-
-${alarm} ${info}
-${raised_for}
-
-Chart   : ${chart}
-Family  : ${family}
-Severity: ${severity}
-URL     : ${goto_url}
-Source  : ${src}
-Date    : ${date}
-Value   : ${value_string}
-Notification generated on ${this_host}
-
---multipart-boundary
-Content-Type: text/html; encoding=${EMAIL_CHARSET}
-Content-Disposition: inline
-Content-Transfer-Encoding: 8bit
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
-<body style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; width: 100% !important; min-height: 100%; line-height: 1.6; background: #f6f6f6; margin:0; padding: 0;">
-<table>
-    <tbody>
-    <tr>
-        <td style="vertical-align: top;" valign="top"></td>
-        <td width="700" style="vertical-align: top; display: block !important; max-width: 700px !important; clear: both !important; margin: 0 auto; padding: 0;" valign="top">
-            <div style="max-width: 700px; display: block; margin: 0 auto; padding: 20px;">
-                <table width="100%" cellpadding="0" cellspacing="0" style="background: #fff; border: 1px solid #e9e9e9;">
-                    <tbody>
-                    <tr>
-                        <td bgcolor="#eee" style="padding: 5px 20px 5px 20px; background-color: #eee;">
-                            <div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 20px; color: #777; font-weight: bold;">netdata notification</div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td bgcolor="${color}" style="font-size: 16px; vertical-align: top; font-weight: 400; text-align: center; margin: 0; padding: 10px; color: #ffffff; background: ${color} !important; border: 1px solid ${color}; border-top-color: ${color};" align="center" valign="top">
-                            <h1 style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 400; margin: 0;">${host} ${status_message}</h1>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: top;" valign="top">
-                            <div style="margin: 0; padding: 20px; max-width: 700px;">
-                                <table width="100%" cellpadding="0" cellspacing="0" style="max-width:700px">
-                                    <tbody>
-                                    <tr>
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding:0 0 20px;" align="left" valign="top">
-                                            <span>${chart}</span>
-                                            <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Chart</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;" align="left" valign="top">
-                                            <span>${value_string}</span>
-                                            <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Value</span>
-                                        </td>
-                                    </tr>
-                                    <tr style="margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;" align="left" valign="top">
-                                            <span><b>${alarm}</b>${info_html}</span>
-                                            <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Alarm</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;" align="left" valign="top">
-                                            <span>${family}</span>
-                                            <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Family</span>
-                                        </td>
-                                    </tr>
-                                    <tr style="margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;" align="left" valign="top">
-                                            <span>${severity}</span>
-                                            <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Severity</span>
-                                        </td>
-                                    </tr>
-                                    <tr style="margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;" align="left" valign="top"><span>${date}</span>
-                                            <span>${raised_for_html}</span> <span style="display: block; color: #666666; font-size: 12px; font-weight: 300; line-height: 1; text-transform: uppercase;">Time</span>
-                                        </td>
-                                    </tr>
-                                    <tr style="margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; vertical-align: top; margin: 0; padding: 0 0 20px;">
-                                            <a href="${goto_url}" style="font-size: 14px; color: #ffffff; text-decoration: none; line-height: 1.5; font-weight: bold; text-align: center; display: inline-block; text-transform: capitalize; background: #35568d; border-width: 1px; border-style: solid; border-color: #2b4c86; margin: 0; padding: 10px 15px;" target="_blank">View Netdata</a>
-                                        </td>
-                                    </tr>
-                                    <tr style="text-align: center; margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 11px; vertical-align: top; margin: 0; padding: 10px 0 0 0; color: #666666;" align="center" valign="bottom">The source of this alarm is line <code>${src}</code><br/>(alarms are configurable, edit this file to adapt the alarm to your needs)
-                                        </td>
-                                    </tr>
-                                    <tr style="text-align: center; margin: 0; padding: 0;">
-                                        <td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; vertical-align: top; margin:0; padding: 20px 0 0 0; color: #666666; border-top: 1px solid #f0f0f0;" align="center" valign="bottom">Sent by
-                                            <a href="https://mynetdata.io/" target="_blank">netdata</a>, the real-time performance and health monitoring, on <code>${this_host}</code>.
-                                        </td>
-                                    </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
---multipart-boundary--
-EOF
-
-SENT_EMAIL=$?
-
-# -----------------------------------------------------------------------------
-# let netdata know
-
-if [   ${SENT_EMAIL}        -eq 0 \
-    -o ${SENT_SYSLOG}       -eq 0 \
-    ]
-    then
-    # we did send something
-    exit 0
-fi
-
-# we did not send anything
-exit 1
diff --git a/contrib/sles11/netdata-alarms-bash3.patch b/contrib/sles11/netdata-alarms-bash3.patch
deleted file mode 100644
index 142659ba..00000000
--- a/contrib/sles11/netdata-alarms-bash3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- system/netdata.conf.orig    2018-05-10 19:44:49.000000000 +0300
-+++ system/netdata.conf 2018-05-10 19:45:14.000000000 +0300
-@@ -22,3 +22,7 @@
- [web]
-     web files owner = root
-     web files group = netdata
-+
-+[health]
-+    # script for sles 11, mail notifications only
-+    script to execute on alarm = /usr/lib64/netdata/plugins.d/alarm-notify.bash3.sh
diff --git a/contrib/sles11/netdata-automake-no-dist-xz.patch b/contrib/sles11/netdata-automake-no-dist-xz.patch
deleted file mode 100644
index d373efac..00000000
--- a/contrib/sles11/netdata-automake-no-dist-xz.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u netdata-1.6.0.orig/Makefile.am netdata-1.6.0/Makefile.am
---- netdata-1.6.0.orig/Makefile.am  2017-03-20 19:32:47.000000000 +0100
-+++ netdata-1.6.0/Makefile.am 2017-06-25 23:46:14.403426661 +0200
-@@ -1,7 +1,7 @@
- #
- # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
- #
--AUTOMAKE_OPTIONS=foreign dist-bzip2 dist-xz 1.10
-+AUTOMAKE_OPTIONS=foreign dist-bzip2 1.10
- ACLOCAL_AMFLAGS = -I m4
- 
- MAINTAINERCLEANFILES= \
-
diff --git a/contrib/sles11/netdata-python-plugin-sles11.patch b/contrib/sles11/netdata-python-plugin-sles11.patch
deleted file mode 100644
index d2e8f6b6..00000000
--- a/contrib/sles11/netdata-python-plugin-sles11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u netdata-1.10.0.orig/plugins.d/python.d.plugin netdata-1.10.0/plugins.d/python.d.plugin
---- netdata-1.10.0.orig/plugins.d/python.d.plugin	2018-05-08 20:01:40.000000000 +0300
-+++ netdata-1.10.0/plugins.d/python.d.plugin	2018-05-08 20:06:57.000000000 +0300
-@@ -15,10 +15,8 @@
- from sys import version_info, argv
- from time import sleep
- 
--try:
--    from time import monotonic as time
--except ImportError:
--    from time import time
-+#   from time import monotonic as time
-+from time import time
- 
- PY_VERSION = version_info[:2]
- PLUGIN_CONFIG_DIR = os.getenv('NETDATA_CONFIG_DIR', os.path.dirname(__file__) + '/../../../../etc/netdata') + '/'
-@@ -32,10 +30,7 @@
- from bases.loggers import PythonDLogger
- from bases.collection import setdefault_values, run_and_exit
- 
--try:
--    from collections import OrderedDict
--except ImportError:
--    from third_party.ordereddict import OrderedDict
-+from ordereddict import OrderedDict
- 
- BASE_CONFIG = {'update_every': os.getenv('NETDATA_UPDATE_EVERY', 1),
-                'retries': 60,
diff --git a/contrib/sles11/netdata.init b/contrib/sles11/netdata.init
deleted file mode 100755
index 3081c427..00000000
--- a/contrib/sles11/netdata.init
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:          netdata
-# Required-Start:    $all
-# Should-Start:      
-# Required-Stop:     $all
-# Should-Stop:       
-# Default-Start:     2 3 5
-# Default-Stop:
-# Short-Description: Start and stop the netdata real-time monitoring server daemon
-# Description:       Controls the main netdata monitoring server daemon "netdata".
-### END INIT INFO
-
-DAEMON="netdata"
-DAEMON_BIN="/usr/sbin/${DAEMON}"
-DAEMON_PID="/var/run/${DAEMON}.pid"
-DAEMON_ARGS=""
-
-. /etc/rc.status
-rc_reset
-
-if [ ! -x $DAEMON_BIN ]; then
-    echo -n >&2 "${DAEMON} binary is not installed. "
-    rc_status -s
-    exit 5
-fi
-
-case "$1" in
-  start)
-    echo -n "Starting $DAEMON"
-    /sbin/startproc $DAEMON_BIN $DAEMON_ARGS 
-    rc_status -v 
-    ;;
-
-  stop)
-    echo -n "Stopping $DAEMON"
-    /sbin/killproc $DAEMON_BIN
-    rc_status -v
-    ;;
-
-  reload)
-    # netdata: HUP reopen log files, USR1 save DB, USR2 reload health config
-    echo -n "Reloading $DAEMON config"
-    /sbin/killproc -USR2 $DAEMON_BIN
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  status)
-    echo -n "Checking $DAEMON"
-    /sbin/checkproc $DAEMON_BIN
-    rc_status -v
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|status|reload|restart}"
-    exit 1
-    ;;
-
-esac
-rc_exit