From 937898bfd6a465e7c42af4ec7571081d8ddcdbf6 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 14 Jan 2020 16:26:25 +0100
Subject: [PATCH] Fix netdata

---
 CHANGELOG.md                    |  2 ++
 wo/cli/plugins/stack_pref.py    |  2 +-
 wo/cli/plugins/stack_upgrade.py | 28 +++++++---------------------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ede69ac..41cf92f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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 opcache cleaning with `wo clean --opcache`
 - Force php imagick extension to be enabled after php-fpm install
+- Netdata upgrade is now performed with fresh install script downloaded from github
 
 #### Fixed
 
 - Domain IP validation when using CNAME before issuing SSL certificate
 - Netdata stack purge/remove not working properly
 - 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
 
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index 0557ba7..9b10bb0 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -1381,7 +1381,7 @@ 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", errormsg='', log=False)
+                "--dont-wait --no-updates", errormsg='', log=False)
             Log.valide(self, "Installing Netdata")
             if os.path.isdir('/etc/netdata'):
                 wo_netdata = "/"
diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py
index be669c5..983ebc4 100644
--- a/wo/cli/plugins/stack_upgrade.py
+++ b/wo/cli/plugins/stack_upgrade.py
@@ -11,6 +11,7 @@ from wo.core.fileutils import WOFileUtils
 from wo.core.logging import Log
 from wo.core.shellexec import WOShellExec
 from wo.core.variables import WOVar
+from wo.core.services import WOService
 
 
 class WOStackUpgradeController(CementBaseController):
@@ -360,29 +361,14 @@ class WOStackUpgradeController(CementBaseController):
 
                 # Netdata
                 if WOAptGet.is_selected(self, 'Netdata', packages):
+                    WOService.stop_service(self, 'netdata')
                     Log.wait(self, "Upgrading Netdata")
                     # detect static binaries install
-                    if os.path.isdir('/opt/netdata'):
-                        if os.path.exists(
-                            '/opt/netdata/usr/libexec/'
-                                'netdata/netdata-updater.sh'):
-                            WOShellExec.cmd_exec(
-                                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")
+                    WOShellExec.cmd_exec(
+                        self,
+                        "bash /var/lib/wo/tmp/kickstart.sh "
+                        "--dont-wait --no-updates",
+                        errormsg='', log=False)
                     Log.valide(self, "Upgrading Netdata")
 
                 if WOAptGet.is_selected(self, 'WordOps Dashboard', packages):