From c4152ba19bea1d53a691d5497f36ced759947800 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sat, 13 Jul 2019 15:15:52 +0200
Subject: [PATCH] Prepare for release

---
 CHANGELOG.md                    |  9 +++++++--
 setup.py                        |  2 +-
 wo/cli/plugins/stack.py         |  1 +
 wo/cli/plugins/stack_upgrade.py | 20 ++++++++++++++++++--
 wo/core/variables.py            |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b485e3c..49ca4ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Releases
 
+### v3.9.x - [Unreleased]
+
 ---
 
-### v3.9.6 - [Unreleased]
+### v3.9.5.4 - 2019-07-13
 
 #### Added
 
 - New Nginx package on Ubuntu with TLS v1.3 support (OpenSSL 1.1.1c)
+- Netdata upgrade with `wo stack upgrade --netdata`
+- Netdata stack remove/purge
 
 #### Changed
 
@@ -23,8 +27,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - phpRedisAdmin installation
 - Duplicated locations /robots.txt after upgrade to v3.9.5.3
-- Site update with flag "--le=off"
+- Let's Encrypt stack "wo site update --letsencrypt/--letsencrypt=off"
 - pt-query-advisor dead link
+- Netdata persistant configuration
 
 ### v3.9.5.3 - 2019-06-18
 
diff --git a/setup.py b/setup.py
index e07ac0c..1f098e4 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ if not os.path.isfile('/root/.gitconfig'):
     shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='wo',
-      version='3.9.5.3',
+      version='3.9.5.4',
       description=long_description,
       long_description=long_description,
       classifiers=[],
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index ce6f56e..4ea0cd4 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -1185,6 +1185,7 @@ class WOStackController(CementBaseController):
                                               "health_alarm_notify.conf",
                                               'SEND_EMAIL="YES"',
                                               'SEND_EMAIL="NO"')
+                    # make changes persistant
                     WOFileUtils.copyfile(self, "/opt/netdata/usr/"
                                          "lib/netdata/conf.d/"
                                          "health_alarm_notify.conf",
diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py
index 43250f8..4a333ee 100644
--- a/wo/cli/plugins/stack_upgrade.py
+++ b/wo/cli/plugins/stack_upgrade.py
@@ -28,8 +28,6 @@ class WOStackUpgradeController(CementBaseController):
                 dict(help='Upgrade admin tools stack', action='store_true')),
             (['--nginx'],
                 dict(help='Upgrade Nginx stack', action='store_true')),
-            (['--nginxmainline'],
-                dict(help='Upgrade Nginx Mainline stack', action='store_true')),
             (['--php'],
                 dict(help='Upgrade PHP stack', action='store_true')),
             (['--mysql'],
@@ -38,6 +36,8 @@ class WOStackUpgradeController(CementBaseController):
                 dict(help='Upgrade WPCLI', action='store_true')),
             (['--redis'],
                 dict(help='Upgrade Redis', action='store_true')),
+            (['--netdata'],
+                dict(help='Upgrade Netdata', action='store_true')),
             (['--no-prompt'],
                 dict(help="Upgrade Packages without any prompt",
                      action='store_true')),
@@ -137,6 +137,13 @@ class WOStackUpgradeController(CementBaseController):
             else:
                 Log.info(self, "WPCLI is not installed with WordOps")
 
+        if self.app.pargs.netdata:
+            if os.path.isdir('/opt/netdata'):
+                packages = packages + [['https://my-netdata.io/'
+                                        'kickstart-static64.sh',
+                                        '/var/lib/wo/tmp/kickstart.sh',
+                                        'Netdata']]
+
         if len(packages) or len(apt_packages):
 
             Log.info(self, "During package update process non nginx-cached"
@@ -168,12 +175,21 @@ class WOStackUpgradeController(CementBaseController):
                 if self.app.pargs.wpcli:
                     WOFileUtils.remove(self, ['/usr/local/bin/wp'])
 
+                if self.app.pargs.netdata:
+                    WOFileUtils.remove(self, ['/var/lib/wo/tmp/kickstart.sh'])
+
                 Log.debug(self, "Downloading following: {0}".format(packages))
                 WODownload.download(self, packages)
 
                 if self.app.pargs.wpcli:
                     WOFileUtils.chmod(self, "/usr/local/bin/wp", 0o775)
 
+                if self.app.pargs.netdata:
+                    Log.info(self, "Upgrading Netdata, please wait...")
+                    WOShellExec.cmd_exec(self, "/bin/bash /var/lib/wo/tmp/"
+                                         "kickstart.sh "
+                                         "--dont-wait")
+
             Log.info(self, "Successfully updated packages")
         else:
             self.app.args.print_help()
diff --git a/wo/core/variables.py b/wo/core/variables.py
index 6a09dd3..2e1b43f 100644
--- a/wo/core/variables.py
+++ b/wo/core/variables.py
@@ -11,7 +11,7 @@ class WOVariables():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.9.5.3"
+    wo_version = "3.9.5.4"
     # WordOps packages versions
     wo_wp_cli = "2.2.0"
     wo_adminer = "4.7.1"