Merging upstream version 1.44.3.

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

11 files changed, 41 insertions, 6 deletions

diff --git a/packaging/installer/dependencies/alpine.sh b/packaging/installer/dependencies/alpine.sh
index 321d57707..ee0504b34 100755
--- a/packaging/installer/dependencies/alpine.sh
+++ b/packaging/installer/dependencies/alpine.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Package tree used for installing netdata on distribution:
 # << Alpine: [3.12] [3.13] [3.14] [3.15] [edge] >>
 
@@ -31,6 +31,9 @@ package_tree="
   util-linux-dev
   libmnl-dev
   json-c-dev
+  musl-fts-dev
+  bison
+  flex
   yaml-dev
   "
 
@@ -67,7 +70,8 @@ check_flags() {
   done
 
   if [ "${DONT_WAIT}" -eq 0 ] && [ "${NON_INTERACTIVE}" -eq 0 ]; then
-    read -r -p "Press ENTER to run it > " || exit 1
+    printf "Press ENTER to run it > " 
+    read -r || exit 1
   fi
 }
 
@@ -76,8 +80,18 @@ check_flags ${@}
 
 packages_to_install=
 
+handle_old_alpine() {
+  version="$(grep VERSION_ID /etc/os-release | cut -f 2 -d '=')"
+  major="$(echo "${version}" | cut -f 1 -d '.')"
+  minor="$(echo "${version}" | cut -f 2 -d '.')"
+
+  if [ "${major}" -le 3 ] && [ "${minor}" -le 16 ]; then
+    package_tree="$(echo "${package_tree}" | sed 's/musl-fts-dev/fts-dev/')"
+  fi
+}
+
 for package in $package_tree; do
-  if apk -e info "$package" &> /dev/null; then
+  if apk -e info "$package" > /dev/null 2>&1 ; then
     echo "Package '${package}' is installed"
   else
     echo "Package '${package}' is NOT installed"
@@ -85,7 +99,7 @@ for package in $package_tree; do
   fi
 done
 
-if [[ -z $packages_to_install ]]; then
+if [ -z "${packages_to_install}" ]; then
   echo "All required packages are already installed. Skipping .."
 else
   echo "packages_to_install:" "$packages_to_install"
diff --git a/packaging/installer/dependencies/arch.sh b/packaging/installer/dependencies/arch.sh
index c0890d925..30be834be 100755
--- a/packaging/installer/dependencies/arch.sh
+++ b/packaging/installer/dependencies/arch.sh
@@ -32,6 +32,8 @@ declare -a package_tree=(
   gzip
   python3
   binutils
+  bison
+  flex
 )
 
 usage() {
diff --git a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh
index e2599f0f6..532a0a71e 100755
--- a/packaging/installer/dependencies/centos.sh
+++ b/packaging/installer/dependencies/centos.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Package tree used for installing netdata on distribution:
-# << CentOS: [7] [8] >>
+# << CentOS: [7] [8] [9] >>
 
 set -e
 
@@ -8,9 +8,12 @@ declare -a package_tree=(
   autoconf
   autoconf-archive
   automake
+  bison
   cmake
+  cmake3
   curl
   elfutils-libelf-devel
+  flex
   findutils
   gcc
   gcc-c++
diff --git a/packaging/installer/dependencies/debian.sh b/packaging/installer/dependencies/debian.sh
index 09a5d6338..692a71191 100755
--- a/packaging/installer/dependencies/debian.sh
+++ b/packaging/installer/dependencies/debian.sh
@@ -12,8 +12,10 @@ package_tree="
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
+  flex
   g++
   gcc
   git
diff --git a/packaging/installer/dependencies/fedora.sh b/packaging/installer/dependencies/fedora.sh
index a457ef2e2..fc30b6113 100755
--- a/packaging/installer/dependencies/fedora.sh
+++ b/packaging/installer/dependencies/fedora.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Package tree used for installing netdata on distribution:
-# << Fedora: [24->35] >>
+# << Fedora: [24->38] >>
 
 set -e
 
@@ -28,10 +28,12 @@ declare -a package_tree=(
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
   elfutils-libelf-devel
   findutils
+  flex
   gcc
   gcc-c++
   git
diff --git a/packaging/installer/dependencies/freebsd.sh b/packaging/installer/dependencies/freebsd.sh
index 69a650a6e..eadbcfa98 100755
--- a/packaging/installer/dependencies/freebsd.sh
+++ b/packaging/installer/dependencies/freebsd.sh
@@ -26,6 +26,8 @@ package_tree="
   liblz4
   openssl
   python3
+  bison
+  flex
   "
 
 prompt() {
diff --git a/packaging/installer/dependencies/gentoo.sh b/packaging/installer/dependencies/gentoo.sh
index cbe8c8e51..9cf7f281a 100755
--- a/packaging/installer/dependencies/gentoo.sh
+++ b/packaging/installer/dependencies/gentoo.sh
@@ -31,6 +31,8 @@ package_tree="
   virtual/libelf
   dev-lang/python
   dev-libs/libuv
+  sys-devel/bison
+  sys-devel/flex
   "
 usage() {
   cat << EOF
diff --git a/packaging/installer/dependencies/ol.sh b/packaging/installer/dependencies/ol.sh
index f0d8341f1..2dc10cee5 100755
--- a/packaging/installer/dependencies/ol.sh
+++ b/packaging/installer/dependencies/ol.sh
@@ -12,9 +12,11 @@ declare -a package_tree=(
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
   elfutils-libelf-devel
+  flex
   gcc
   gcc-c++
   git
diff --git a/packaging/installer/dependencies/opensuse.sh b/packaging/installer/dependencies/opensuse.sh
index 3f14d58be..ecf1268fc 100755
--- a/packaging/installer/dependencies/opensuse.sh
+++ b/packaging/installer/dependencies/opensuse.sh
@@ -14,8 +14,10 @@ declare -a package_tree=(
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
+  flex
   gcc
   gcc-c++
   git
diff --git a/packaging/installer/dependencies/rockylinux.sh b/packaging/installer/dependencies/rockylinux.sh
index fc26c8beb..cc8d45204 100755
--- a/packaging/installer/dependencies/rockylinux.sh
+++ b/packaging/installer/dependencies/rockylinux.sh
@@ -12,10 +12,12 @@ declare -a package_tree=(
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
   elfutils-libelf-devel
   findutils
+  flex
   gcc
   gcc-c++
   git
diff --git a/packaging/installer/dependencies/ubuntu.sh b/packaging/installer/dependencies/ubuntu.sh
index a5dc2eae5..e223ca384 100755
--- a/packaging/installer/dependencies/ubuntu.sh
+++ b/packaging/installer/dependencies/ubuntu.sh
@@ -12,8 +12,10 @@ package_tree="
   autoconf-archive
   autogen
   automake
+  bison
   cmake
   curl
+  flex
   g++
   gcc
   git