diff options
Diffstat (limited to 'packaging/installer/install-required-packages.sh')
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 55 |
1 files changed, 19 insertions, 36 deletions
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 7bfbeaaf..8855aceb 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -18,7 +18,6 @@ fi # These options control which packages we are going to install # They can be pre-set, but also can be controlled with command line options PACKAGES_NETDATA=${PACKAGES_NETDATA-1} -PACKAGES_NETDATA_NODEJS=${PACKAGES_NETDATA_NODEJS-0} PACKAGES_NETDATA_PYTHON=${PACKAGES_NETDATA_PYTHON-0} PACKAGES_NETDATA_PYTHON3=${PACKAGES_NETDATA_PYTHON3-1} PACKAGES_NETDATA_PYTHON_MYSQL=${PACKAGES_NETDATA_PYTHON_MYSQL-0} @@ -103,10 +102,7 @@ Supported packages (you can append many of them): node.js, python, sensors, etc - netdata minimum packages required to install netdata - (no mysql client, no nodejs, includes python) - - - nodejs install nodejs - (required for monitoring named and SNMP) + (no mysql client, includes python) - python install python @@ -664,6 +660,8 @@ declare -A pkg_autogen=( # exceptions ['centos-6']="WARNING|" ['rhel-6']="WARNING|" + ['centos-9']="NOTREQUIRED|" + ['rhel-9']="NOTREQUIRED|" ) declare -A pkg_automake=( @@ -930,20 +928,6 @@ declare -A pkg_nginx=( ['default']="nginx" ) -declare -A pkg_nodejs=( - ['gentoo']="net-libs/nodejs" - ['clearlinux']="nodejs-basic" - ['freebsd']="node" - ['default']="nodejs" - - # exceptions - ['rhel-6']="WARNING|To install nodejs check: https://nodejs.org/en/download/package-manager/" - ['rhel-7']="WARNING|To install nodejs check: https://nodejs.org/en/download/package-manager/" - ['centos-6']="WARNING|To install nodejs check: https://nodejs.org/en/download/package-manager/" - ['debian-6']="WARNING|To install nodejs check: https://nodejs.org/en/download/package-manager/" - ['debian-7']="WARNING|To install nodejs check: https://nodejs.org/en/download/package-manager/" -) - declare -A pkg_postfix=( ['gentoo']="mail-mta/postfix" ['macos']="WARNING|" @@ -1448,13 +1432,6 @@ packages() { fi # ------------------------------------------------------------------------- - # scripting interpreters for netdata plugins - - if [ "${PACKAGES_NETDATA_NODEJS}" -ne 0 ]; then - require_cmd nodejs node js || suitable_package nodejs - fi - - # ------------------------------------------------------------------------- # python2 if [ "${PACKAGES_NETDATA_PYTHON}" -ne 0 ]; then @@ -1626,7 +1603,21 @@ validate_tree_centos() { echo >&2 " > CentOS Version: ${version} ..." - if [[ "${version}" =~ ^8(\..*)?$ ]]; then + if [[ "${version}" =~ ^9(\..*)?$ ]]; then + echo >&2 " > Checking for config-manager ..." + if ! run ${sudo} dnf config-manager --help; then + if prompt "config-manager not found, shall I install it?"; then + run ${sudo} dnf ${opts} install 'dnf-command(config-manager)' + fi + fi + + echo >&2 " > Checking for CRB ..." + if ! run dnf ${sudo} repolist | grep CRB; then + if prompt "CRB not found, shall I install it?"; then + run ${sudo} dnf ${opts} config-manager --set-enabled crb + fi + fi + elif [[ "${version}" =~ ^8(\..*)?$ ]]; then echo >&2 " > Checking for config-manager ..." if ! run ${sudo} yum config-manager --help; then if prompt "config-manager not found, shall I install it?"; then @@ -2001,7 +1992,7 @@ EOF remote_log() { # log success or failure on our system # to help us solve installation issues - curl > /dev/null 2>&1 -Ss --max-time 3 "https://registry.my-netdata.io/log/installer?status=${1}&error=${2}&distribution=${distribution}&version=${version}&installer=${package_installer}&tree=${tree}&detection=${detection}&netdata=${PACKAGES_NETDATA}&nodejs=${PACKAGES_NETDATA_NODEJS}&python=${PACKAGES_NETDATA_PYTHON}&python3=${PACKAGES_NETDATA_PYTHON3}&mysql=${PACKAGES_NETDATA_PYTHON_MYSQL}&postgres=${PACKAGES_NETDATA_PYTHON_POSTGRES}&pymongo=${PACKAGES_NETDATA_PYTHON_MONGO}&sensors=${PACKAGES_NETDATA_SENSORS}&database=${PACKAGES_NETDATA_DATABASE}&ebpf=${PACKAGES_NETDATA_EBPF}&firehol=${PACKAGES_FIREHOL}&fireqos=${PACKAGES_FIREQOS}&iprange=${PACKAGES_IPRANGE}&update_ipsets=${PACKAGES_UPDATE_IPSETS}&demo=${PACKAGES_NETDATA_DEMO_SITE}" + curl > /dev/null 2>&1 -Ss --max-time 3 "https://registry.my-netdata.io/log/installer?status=${1}&error=${2}&distribution=${distribution}&version=${version}&installer=${package_installer}&tree=${tree}&detection=${detection}&netdata=${PACKAGES_NETDATA}&python=${PACKAGES_NETDATA_PYTHON}&python3=${PACKAGES_NETDATA_PYTHON3}&mysql=${PACKAGES_NETDATA_PYTHON_MYSQL}&postgres=${PACKAGES_NETDATA_PYTHON_POSTGRES}&pymongo=${PACKAGES_NETDATA_PYTHON_MONGO}&sensors=${PACKAGES_NETDATA_SENSORS}&database=${PACKAGES_NETDATA_DATABASE}&ebpf=${PACKAGES_NETDATA_EBPF}&firehol=${PACKAGES_FIREHOL}&fireqos=${PACKAGES_FIREQOS}&iprange=${PACKAGES_IPRANGE}&update_ipsets=${PACKAGES_UPDATE_IPSETS}&demo=${PACKAGES_NETDATA_DEMO_SITE}" } if [ -z "${1}" ]; then @@ -2062,7 +2053,6 @@ while [ -n "${1}" ]; do netdata-all) PACKAGES_NETDATA=1 - PACKAGES_NETDATA_NODEJS=1 if [ "${pv}" -eq 2 ]; then PACKAGES_NETDATA_PYTHON=1 PACKAGES_NETDATA_PYTHON_MYSQL=1 @@ -2124,12 +2114,6 @@ while [ -n "${1}" ]; do fi ;; - nodejs | netdata-nodejs) - PACKAGES_NETDATA=1 - PACKAGES_NETDATA_NODEJS=1 - PACKAGES_NETDATA_DATABASE=1 - ;; - sensors | netdata-sensors) PACKAGES_NETDATA=1 PACKAGES_NETDATA_PYTHON3=1 @@ -2147,7 +2131,6 @@ while [ -n "${1}" ]; do demo | all) PACKAGES_NETDATA=1 - PACKAGES_NETDATA_NODEJS=1 if [ "${pv}" -eq 2 ]; then PACKAGES_NETDATA_PYTHON=1 PACKAGES_NETDATA_PYTHON_MYSQL=1 |