chore: remove python-mysql from install-required-packages.sh (#13288)
Ilya Mashchenko committed
Jul 5, 2022 at 09:48 UTC
3cc42724aec923d52056254b99be76f1022ef59f
1 file changed
+3
-73
packaging/installer/install-required-packages.sh
+3
-73
@@ -20,7 +20,6 @@ fi
20
PACKAGES_NETDATA=${PACKAGES_NETDATA-1}
21
PACKAGES_NETDATA_PYTHON=${PACKAGES_NETDATA_PYTHON-0}
22
PACKAGES_NETDATA_PYTHON3=${PACKAGES_NETDATA_PYTHON3-1}
23
-PACKAGES_NETDATA_PYTHON_MYSQL=${PACKAGES_NETDATA_PYTHON_MYSQL-0}
23
PACKAGES_NETDATA_PYTHON_POSTGRES=${PACKAGES_NETDATA_PYTHON_POSTGRES-0}
24
PACKAGES_NETDATA_PYTHON_MONGO=${PACKAGES_NETDATA_PYTHON_MONGO-0}
25
PACKAGES_DEBUG=${PACKAGES_DEBUG-0}
@@ -98,20 +97,16 @@ Supported installers (IN):
97
Supported packages (you can append many of them):
98
99
- netdata-all all packages required to install netdata
101
- including mysql client, postgres client,
100
+ including postgres client,
101
node.js, python, sensors, etc
102
103
- netdata minimum packages required to install netdata
105
- (no mysql client, includes python)
104
+ (includes python)
105
106
- python install python
107
108
- python3 install python3
109
111
- - python-mysql install MySQLdb
112
- (for monitoring mysql, will install python3 version
113
- if python3 is enabled or detected)
114
-
110
- python-postgres install psycopg2
111
(for monitoring postgres, will install python3 version
112
if python3 is enabled or detected)
@@ -960,55 +955,6 @@ declare -A pkg_python=(
955
['centos-8']="python2"
956
)
957
963
-declare -A pkg_python_mysqldb=(
964
- ['alpine']="py-mysqldb"
965
- ['arch']="mysql-python"
966
- ['centos']="MySQL-python"
967
- ['debian']="python-mysqldb"
968
- ['gentoo']="dev-python/mysqlclient"
969
- ['sabayon']="dev-python/mysqlclient"
970
- ['rhel']="MySQL-python"
971
- ['suse']="python-PyMySQL"
972
- ['clearlinux']="WARNING|"
973
- ['default']="python-mysql"
974
-
975
- # exceptions
976
- ['fedora-24']="python2-mysql"
977
- ['ol-8']="WARNING|"
978
-)
979
-
980
-declare -A pkg_python3_mysqldb=(
981
- ['alpine']="WARNING|"
982
- ['arch']="WARNING|"
983
- ['centos']="WARNING|"
984
- ['debian']="python3-mysqldb"
985
- ['gentoo']="dev-python/mysqlclient"
986
- ['sabayon']="dev-python/mysqlclient"
987
- ['rhel']="WARNING|"
988
- ['ol']="WARNING|"
989
- ['suse']="WARNING|"
990
- ['clearlinux']="WARNING|"
991
- ['macos']="WARNING|"
992
- ['default']="WARNING|"
993
-
994
- # exceptions
995
- ['debian-6']="WARNING|"
996
- ['debian-7']="WARNING|"
997
- ['debian-8']="WARNING|"
998
- ['ubuntu-12.04']="WARNING|"
999
- ['ubuntu-12.10']="WARNING|"
1000
- ['ubuntu-13.04']="WARNING|"
1001
- ['ubuntu-13.10']="WARNING|"
1002
- ['ubuntu-14.04']="WARNING|"
1003
- ['ubuntu-14.10']="WARNING|"
1004
- ['ubuntu-15.04']="WARNING|"
1005
- ['ubuntu-15.10']="WARNING|"
1006
- ['centos-7']="python36-mysql"
1007
- ['centos-8']="python38-mysql"
1008
- ['rhel-7']="python36-mysql"
1009
- ['rhel-8']="python38-mysql"
1010
-)
1011
-
958
declare -A pkg_python_psycopg2=(
959
['alpine']="py-psycopg2"
960
['arch']="python2-psycopg2"
@@ -1441,7 +1387,6 @@ packages() {
1387
# suitable_package python-requests
1388
# suitable_package python-pip
1389
1444
- [ "${PACKAGES_NETDATA_PYTHON_MYSQL}" -ne 0 ] && suitable_package python-mysqldb
1390
[ "${PACKAGES_NETDATA_PYTHON_POSTGRES}" -ne 0 ] && suitable_package python-psycopg2
1391
fi
1392
@@ -1455,7 +1400,6 @@ packages() {
1400
# suitable_package python3-requests
1401
# suitable_package python3-pip
1402
1458
- [ "${PACKAGES_NETDATA_PYTHON_MYSQL}" -ne 0 ] && suitable_package python3-mysqldb
1403
[ "${PACKAGES_NETDATA_PYTHON_POSTGRES}" -ne 0 ] && suitable_package python3-psycopg2
1404
fi
1405
@@ -1992,7 +1936,7 @@ EOF
1936
remote_log() {
1937
# log success or failure on our system
1938
# to help us solve installation issues
1995
- 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}"
1939
+ 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}&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}"
1940
}
1941
1942
if [ -z "${1}" ]; then
@@ -2055,12 +1999,10 @@ while [ -n "${1}" ]; do
1999
PACKAGES_NETDATA=1
2000
if [ "${pv}" -eq 2 ]; then
2001
PACKAGES_NETDATA_PYTHON=1
2058
- PACKAGES_NETDATA_PYTHON_MYSQL=1
2002
PACKAGES_NETDATA_PYTHON_POSTGRES=1
2003
PACKAGES_NETDATA_PYTHON_MONGO=1
2004
else
2005
PACKAGES_NETDATA_PYTHON3=1
2063
- PACKAGES_NETDATA_PYTHON3_MYSQL=1
2006
PACKAGES_NETDATA_PYTHON3_POSTGRES=1
2007
PACKAGES_NETDATA_PYTHON3_MONGO=1
2008
fi
@@ -2084,16 +2026,6 @@ while [ -n "${1}" ]; do
2026
PACKAGES_NETDATA_PYTHON3=1
2027
;;
2028
2087
- python-mysql | mysql-python | mysqldb | netdata-mysql)
2088
- if [ "${pv}" -eq 2 ]; then
2089
- PACKAGES_NETDATA_PYTHON=1
2090
- PACKAGES_NETDATA_PYTHON_MYSQL=1
2091
- else
2092
- PACKAGES_NETDATA_PYTHON3=1
2093
- PACKAGES_NETDATA_PYTHON3_MYSQL=1
2094
- fi
2095
- ;;
2096
-
2029
python-postgres | postgres-python | psycopg2 | netdata-postgres)
2030
if [ "${pv}" -eq 2 ]; then
2031
PACKAGES_NETDATA_PYTHON=1
@@ -2133,12 +2065,10 @@ while [ -n "${1}" ]; do
2065
PACKAGES_NETDATA=1
2066
if [ "${pv}" -eq 2 ]; then
2067
PACKAGES_NETDATA_PYTHON=1
2136
- PACKAGES_NETDATA_PYTHON_MYSQL=1
2068
PACKAGES_NETDATA_PYTHON_POSTGRES=1
2069
PACKAGES_NETDATA_PYTHON_MONGO=1
2070
else
2071
PACKAGES_NETDATA_PYTHON3=1
2141
- PACKAGES_NETDATA_PYTHON3_MYSQL=1
2072
PACKAGES_NETDATA_PYTHON3_POSTGRES=1
2073
PACKAGES_NETDATA_PYTHON3_MONGO=1
2074
fi