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

Fix Netdata on raspbian

Browse Source
This commit is contained in:
VirtuBox
2019-08-28 14:22:11 +02:00
parent f40d356875
commit 13a5cea8e2
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wo/cli/plugins/stack.py
View File

@@ -334,10 +334,16 @@ class WOStackController(CementBaseController):
if pargs.netdata: if pargs.netdata:
Log.debug(self, "Setting packages variable for Netdata") Log.debug(self, "Setting packages variable for Netdata")
if not os.path.exists('/opt/netdata'): if not os.path.exists('/opt/netdata'):
packages = packages + [['https://my-netdata.io/' if WOVariables.wo_distro == 'raspbian':
'kickstart-static64.sh', packages = packages + [['https://my-netdata.io/'
'/var/lib/wo/tmp/kickstart.sh', 'kickstart.sh',
'Netdata']] '/var/lib/wo/tmp/kickstart.sh',
'Netdata']]
else:
packages = packages + [['https://my-netdata.io/'
'kickstart-static64.sh',
'/var/lib/wo/tmp/kickstart.sh',
'Netdata']]
else: else:
Log.debug(self, "Netdata already installed") Log.debug(self, "Netdata already installed")
Log.info(self, "Netdata already installed") Log.info(self, "Netdata already installed")

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

@@ -1258,18 +1258,25 @@ def post_pref(self, apt_packages, packages, upgrade=False):
WOShellExec.cmd_exec(self, "bash /var/lib/wo/tmp/" WOShellExec.cmd_exec(self, "bash /var/lib/wo/tmp/"
"kickstart.sh " "kickstart.sh "
"--dont-wait") "--dont-wait")
if WOVariables.wo_distro == 'raspbian':
wo_netdata = "/"
else:
wo_netdata = "/opt/netdata/"
# disable mail notifications # disable mail notifications
WOFileUtils.searchreplace(self, "/opt/netdata/usr/" WOFileUtils.searchreplace(self, "{0}usr/"
"lib/netdata/conf.d/" "lib/netdata/conf.d/"
"health_alarm_notify.conf", "health_alarm_notify.conf"
.format(wo_netdata),
'SEND_EMAIL="YES"', 'SEND_EMAIL="YES"',
'SEND_EMAIL="NO"') 'SEND_EMAIL="NO"')
# make changes persistant # make changes persistant
WOFileUtils.copyfile(self, "/opt/netdata/usr/" WOFileUtils.copyfile(self, "{0}usr/"
"lib/netdata/conf.d/" "lib/netdata/conf.d/"
"health_alarm_notify.conf", "health_alarm_notify.conf"
"/opt/netdata/etc/netdata/" .format(wo_netdata),
"health_alarm_notify.conf") "{0}etc/netdata/"
"health_alarm_notify.conf"
.format(wo_netdata))
# check if mysql credentials are available # check if mysql credentials are available
if os.path.isfile('/etc/mysql/conf.d/my.cnf'): if os.path.isfile('/etc/mysql/conf.d/my.cnf'):
try: try:
@@ -1288,7 +1295,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
Log.info( Log.info(
self, "fail to setup mysql user for netdata") self, "fail to setup mysql user for netdata")
WOFileUtils.chown(self, '/opt/netdata', WOFileUtils.chown(self, '{0}etc/netdata'
.format(wo_netdata),
'netdata', 'netdata',
'netdata', 'netdata',
recursive=True) recursive=True)

15
wo/cli/plugins/stack_services.py
View File

@@ -89,7 +89,8 @@ class WOStackStatusController(CementBaseController):
# netdata # netdata
if pargs.netdata: if pargs.netdata:
if os.path.isdir("/opt/netdata"): if (os.path.isdir("/opt/netdata") or
os.path.isdir("/etc/netdata")):
services = services + ['netdata'] services = services + ['netdata']
else: else:
Log.info(self, "Netdata is not installed") Log.info(self, "Netdata is not installed")
@@ -177,7 +178,8 @@ class WOStackStatusController(CementBaseController):
# netdata # netdata
if pargs.netdata: if pargs.netdata:
if os.path.isdir("/opt/netdata"): if (os.path.isdir("/opt/netdata") or
os.path.isdir("/etc/netdata")):
services = services + ['netdata'] services = services + ['netdata']
else: else:
Log.info(self, "Netdata is not installed") Log.info(self, "Netdata is not installed")
@@ -261,7 +263,8 @@ class WOStackStatusController(CementBaseController):
# netdata # netdata
if pargs.netdata: if pargs.netdata:
if os.path.isdir("/opt/netdata"): if (os.path.isdir("/opt/netdata") or
os.path.isdir("/etc/netdata")):
services = services + ['netdata'] services = services + ['netdata']
else: else:
Log.info(self, "Netdata is not installed") Log.info(self, "Netdata is not installed")
@@ -345,7 +348,8 @@ class WOStackStatusController(CementBaseController):
# netdata # netdata
if pargs.netdata: if pargs.netdata:
if os.path.isdir("/opt/netdata"): if (os.path.isdir("/opt/netdata") or
os.path.isdir("/etc/netdata")):
services = services + ['netdata'] services = services + ['netdata']
else: else:
Log.info(self, "Netdata is not installed") Log.info(self, "Netdata is not installed")
@@ -429,7 +433,8 @@ class WOStackStatusController(CementBaseController):
# netdata # netdata
if pargs.netdata: if pargs.netdata:
if os.path.isdir("/opt/netdata"): if (os.path.isdir("/opt/netdata") or
os.path.isdir("/etc/netdata")):
services = services + ['netdata'] services = services + ['netdata']
else: else:
Log.info(self, "Netdata is not installed") Log.info(self, "Netdata is not installed")