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

Merge pull request #562 from WordOps/updating-configuration

Browse Source 
Fix netdata install/upgrade
This commit is contained in:
VirtuBox
2023-08-13 12:27:32 +02:00
committed by GitHub
parent 809aba1671 813eb392a9
commit 9281509c81
2 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1160,26 +1160,28 @@ def post_pref(self, apt_packages, packages, upgrade=False):
Log.wait(self, "Installing Netdata")
WOShellExec.cmd_exec(
self, "bash /var/lib/wo/tmp/kickstart.sh "
"--dont-wait --no-updates --static-only",
"--dont-wait --no-updates --stable-channel "
"--reinstall-even-if-unsafe",
errormsg='', log=False)
Log.valide(self, "Installing Netdata")
if os.path.isdir('/etc/netdata'):
wo_netdata = "/"
elif os.path.isdir('/opt/netdata'):
wo_netdata = "/opt/netdata/"
# disable mail notifications
if os.path.isdir('/usr/lib/netdata/conf.d/health_alarm_notify.conf'):
WOFileUtils.searchreplace(
self, "{0}etc/netdata/orig/health_alarm_notify.conf"
.format(wo_netdata),
self, "/usr/lib/netdata/conf.d/health_alarm_notify.conf",
'SEND_EMAIL="YES"',
'SEND_EMAIL="NO"')
if os.path.isdir('/opt/netdata/etc/netdata/health_alarm_notify.conf'):
WOFileUtils.searchreplace(
self, "/opt/netdata/etc/netdata/health_alarm_notify.conf",
'SEND_EMAIL="YES"',
'SEND_EMAIL="NO"')
WOFileUtils.searchreplace(
self, "{0}etc/netdata/orig/health_alarm_notify.conf",
'SEND_EMAIL="YES"',
'SEND_EMAIL="NO"')
# make changes persistant
WOFileUtils.copyfile(
self, "{0}etc/netdata/orig/"
"health_alarm_notify.conf"
.format(wo_netdata),
"{0}etc/netdata/health_alarm_notify.conf"
.format(wo_netdata))
# check if mysql credentials are available
if WOShellExec.cmd_exec(self, "mysqladmin ping"):
try:
@@ -1202,11 +1204,6 @@ def post_pref(self, apt_packages, packages, upgrade=False):
Log.debug(self, "{0}".format(e))
Log.info(
self, "fail to setup mysql user for netdata")
WOFileUtils.chown(self, '{0}etc/netdata'
.format(wo_netdata),
'netdata',
'netdata',
recursive=True)
WOService.restart_service(self, 'netdata')
# WordOps Dashboard

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

@@ -362,16 +362,8 @@ class WOStackUpgradeController(CementBaseController):
WOShellExec.cmd_exec(
self,
"bash /var/lib/wo/tmp/kickstart.sh "
"--dont-wait --no-updates --stable-channel",
errormsg='', log=False)
if (os.path.exists('/opt/netdata') and
not os.path.exists(
'/opt/netdata/var/run/netdata/netdata.pid')):
WOShellExec.cmd_exec(
self,
'bash /var/lib/wo/tmp/kickstart.sh '
'--dont-wait --no-updates '
'--stable-channel --reinstall-even-if-unsafe',
"--dont-wait --no-updates --stable-channel "
"--reinstall-even-if-unsafe",
errormsg='', log=False)
Log.valide(self, "Upgrading Netdata")