From 26296ba25265deb2a88bfa3944044db4604d375f Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 29 Jan 2022 18:36:23 +0100
Subject: [PATCH 1/3] Upgrade to upstream version 1.33.0

---
 README.md     | 2 +-
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0298443..42f919c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
 (**physical** & **virtual** servers, **containers**, **IoT** devices), without
 disrupting their core function._
 
-**Shipped version:** 1.32.1
+**Shipped version:** 1.33.0
 
 **Customization brought by the package:**
 
diff --git a/conf/app.src b/conf/app.src
index a4692fe..eba57c8 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/netdata/netdata/releases/download/1.32.1/netdata-v1.32.1.tar.gz
-SOURCE_SUM=ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e
+SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.33.0/netdata-v1.33.0.tar.gz
+SOURCE_SUM=d167d4b2d8529119fa4047ae40d22833dac9d360a6ed07c314ba313807c027eb
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index c199d05..3d11e68 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Real-time performance and health monitoring",
         "fr": "Monitoring serveur en temps reel"
     },
-    "version": "1.32.1~ynh1",
+    "version": "1.33.0~ynh1",
     "url": "http://my-netdata.io/",
     "license": "GPL-3.0",
     "maintainer": {

From 266f736b6e304546593a76da720176da4bfbf349 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 29 Jan 2022 18:37:04 +0100
Subject: [PATCH 2/3] Disable telemetry, set to stable upgrade channel

---
 scripts/install | 2 +-
 scripts/restore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9014d25..00c2be3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -98,7 +98,7 @@ exec 3>${tmp}
 
 # Launch netdata installation in /opt directory
 pushd $NETDATA_TMPDIR
-./netdata-installer.sh --install /opt --dont-wait --disable-cloud >&3 2>&3 || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
+./netdata-installer.sh --install /opt --dont-wait --disable-cloud --disable-telemetry --stable-channel >&3 2>&3 || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
 popd
 
 # close fd 3
diff --git a/scripts/restore b/scripts/restore
index 38fc509..633cd3a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -82,7 +82,7 @@ exec 3>${tmp}
 
 # Launch netdata installation in /opt directory
 cd $NETDATA_TMPDIR
-./netdata-installer.sh --install /opt --dont-wait --disable-cloud >&3 2>&3 || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
+./netdata-installer.sh --install /opt --dont-wait --disable-cloud --disable-telemetry --stable-channel >&3 2>&3 || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
 
 # close fd 3
 exec 3<&-

From 232ee77b77daf52a01f0255f567a0778d39109b3 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 2 Feb 2022 21:21:03 +0100
Subject: [PATCH 3/3] Fix linter warnings

---
 README.md       | 4 ++--
 conf/nginx.conf | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 42f919c..d32089c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 NetData for YunoHost
 ---------------------
 
-[![Integration level](https://dash.yunohost.org/integration/netdata.svg)](https://ci-apps.yunohost.org/jenkins/job/netdata%20%28Community%29/lastBuild/consoleFull) ![](https://ci-apps.yunohost.org/ci/badges/netdata.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/netdata.maintain.svg)  
-[![Install NetData with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=netdata)
+[![Integration level](https://dash.yunohost.org/integration/netdata.svg)](https://dash.yunohost.org/appci/app/netdata) ![](https://ci-apps.yunohost.org/ci/badges/netdata.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/netdata.maintain.svg)
+[![Install example with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=netdata)
 
 [NetData](http://my-netdata.io/) is a system for **distributed real-time performance and health monitoring**.
 It provides **unparalleled insights, in real-time**, of everything happening on the
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 9241df9..b8984da 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,10 +1,6 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 
 location ~ __PATH__/(?<ndpath>.*) {
-    # Force usage of https
-    if ($scheme = http) {
-      rewrite ^ https://$server_name$request_uri? permanent;
-    }
     proxy_redirect off;
     proxy_set_header Host $host;