Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix netdata

Browse Source
This commit is contained in:
VirtuBox
2020-01-14 16:26:25 +01:00
parent 2cdec042b5
commit 937898bfd6
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -17,12 +17,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Improved WordOps performance by removing useless imports in `wo site` code - Improved WordOps performance by removing useless imports in `wo site` code
- Improved opcache cleaning with `wo clean --opcache` - Improved opcache cleaning with `wo clean --opcache`
- Force php imagick extension to be enabled after php-fpm install - Force php imagick extension to be enabled after php-fpm install
- Netdata upgrade is now performed with fresh install script downloaded from github
#### Fixed #### Fixed
- Domain IP validation when using CNAME before issuing SSL certificate - Domain IP validation when using CNAME before issuing SSL certificate
- Netdata stack purge/remove not working properly - Netdata stack purge/remove not working properly
- Do not backup all databases when purging `--mysql` stack with remote MySQL server - Do not backup all databases when purging `--mysql` stack with remote MySQL server
- Netdata upgrade failure due to missing arguments
### v3.11.2 - 2019-12-07 ### v3.11.2 - 2019-12-07

2
wo/cli/plugins/stack_pref.py
View File

@@ -1381,7 +1381,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
Log.wait(self, "Installing Netdata") Log.wait(self, "Installing Netdata")
WOShellExec.cmd_exec( WOShellExec.cmd_exec(
self, "bash /var/lib/wo/tmp/kickstart.sh " self, "bash /var/lib/wo/tmp/kickstart.sh "
"--dont-wait", errormsg='', log=False) "--dont-wait --no-updates", errormsg='', log=False)
Log.valide(self, "Installing Netdata") Log.valide(self, "Installing Netdata")
if os.path.isdir('/etc/netdata'): if os.path.isdir('/etc/netdata'):
wo_netdata = "/" wo_netdata = "/"

28
wo/cli/plugins/stack_upgrade.py
View File

@@ -11,6 +11,7 @@ from wo.core.fileutils import WOFileUtils
from wo.core.logging import Log from wo.core.logging import Log
from wo.core.shellexec import WOShellExec from wo.core.shellexec import WOShellExec
from wo.core.variables import WOVar from wo.core.variables import WOVar
from wo.core.services import WOService
class WOStackUpgradeController(CementBaseController): class WOStackUpgradeController(CementBaseController):
@@ -360,29 +361,14 @@ class WOStackUpgradeController(CementBaseController):
# Netdata # Netdata
if WOAptGet.is_selected(self, 'Netdata', packages): if WOAptGet.is_selected(self, 'Netdata', packages):
WOService.stop_service(self, 'netdata')
Log.wait(self, "Upgrading Netdata") Log.wait(self, "Upgrading Netdata")
# detect static binaries install # detect static binaries install
if os.path.isdir('/opt/netdata'): WOShellExec.cmd_exec(
if os.path.exists( self,
'/opt/netdata/usr/libexec/' "bash /var/lib/wo/tmp/kickstart.sh "
'netdata/netdata-updater.sh'): "--dont-wait --no-updates",
WOShellExec.cmd_exec( errormsg='', log=False)
self, "bash /opt/netdata/usr/"
"libexec/netdata/netdata-"
"updater.sh")
else:
WOShellExec.cmd_exec(
self, "bash /var/lib/wo/tmp/kickstart.sh")
# detect install from source
elif os.path.isdir('/etc/netdata'):
if os.path.exists(
'/usr/libexec/netdata/netdata-updater.sh'):
WOShellExec.cmd_exec(
self,
'bash /usr/libexec/netdata/netdata-updater.sh')
else:
WOShellExec.cmd_exec(
self, "bash /var/lib/wo/tmp/kickstart.sh")
Log.valide(self, "Upgrading Netdata") Log.valide(self, "Upgrading Netdata")
if WOAptGet.is_selected(self, 'WordOps Dashboard', packages): if WOAptGet.is_selected(self, 'WordOps Dashboard', packages):