diff --git a/netdata-fix-shebang-1.37.0.patch b/netdata-fix-shebang-1.37.0.patch
deleted file mode 100644
index f9e9c4b..0000000
--- a/netdata-fix-shebang-1.37.0.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-Fix shebang according to
-https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines
-
-diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in
---- a/claim/netdata-claim.sh.in	2022-11-30 13:36:48.322052491 +0100
-+++ b/claim/netdata-claim.sh.in	2022-12-02 19:09:02.003143386 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # netdata
- # real-time performance and health monitoring, done right!
- # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh
---- a/collectors/cgroups.plugin/cgroup-name.sh	2022-11-30 13:36:48.322052491 +0100
-+++ b/collectors/cgroups.plugin/cgroup-name.sh	2022-12-02 19:09:02.006143400 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck disable=SC2001
- 
- # netdata
-diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh
---- a/collectors/cgroups.plugin/cgroup-network-helper.sh	2022-11-30 13:36:48.322052491 +0100
-+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh	2022-12-02 19:09:02.008143410 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # shellcheck disable=SC1117
- 
- # cgroup-network-helper.sh
-diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
---- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2022-11-30 13:36:48.322052491 +0100
-+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2022-12-02 19:09:02.015143442 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # shellcheck disable=SC2181
-diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin
---- a/collectors/charts.d.plugin/charts.d.plugin	2022-11-30 13:37:39.815580278 +0100
-+++ b/collectors/charts.d.plugin/charts.d.plugin	2022-12-02 19:09:02.013143433 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
---- a/collectors/charts.d.plugin/charts.d.plugin.in	2022-11-30 13:36:48.322052491 +0100
-+++ b/collectors/charts.d.plugin/charts.d.plugin.in	2022-12-02 19:09:02.010143419 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping.plugin
---- a/collectors/fping.plugin/fping.plugin	2022-11-30 13:37:39.927583599 +0100
-+++ b/collectors/fping.plugin/fping.plugin	2022-12-02 19:09:02.033143526 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in
---- a/collectors/fping.plugin/fping.plugin.in	2022-11-30 13:36:48.330052728 +0100
-+++ b/collectors/fping.plugin/fping.plugin.in	2022-12-02 19:09:02.031143516 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin
---- a/collectors/ioping.plugin/ioping.plugin	2022-11-30 13:37:39.955584429 +0100
-+++ b/collectors/ioping.plugin/ioping.plugin	2022-12-02 19:09:02.021143470 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in
---- a/collectors/ioping.plugin/ioping.plugin.in	2022-11-30 13:36:48.330052728 +0100
-+++ b/collectors/ioping.plugin/ioping.plugin.in	2022-12-02 19:09:02.024143484 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin
---- a/collectors/python.d.plugin/python.d.plugin	2022-11-30 13:37:40.139589884 +0100
-+++ b/collectors/python.d.plugin/python.d.plugin	2022-12-02 19:09:02.019143461 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- '''':;
- pybinary=$(which python3 || which python || which python2)
- filtered=()
-diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
---- a/collectors/python.d.plugin/python.d.plugin.in	2022-11-30 13:36:48.346053202 +0100
-+++ b/collectors/python.d.plugin/python.d.plugin.in	2022-12-02 19:09:02.017143451 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- '''':;
- pybinary=$(which python3 || which python || which python2)
- filtered=()
-diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py
---- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2022-11-30 13:36:48.346053202 +0100
-+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2022-12-02 19:09:02.179144203 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#
- # -*- coding: utf-8 -*-
- #
- # client.py - Somewhat higher-level GUI_RPC API for BOINC core client
-diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh
---- a/collectors/tc.plugin/tc-qos-helper.sh	2022-11-30 13:37:40.511600912 +0100
-+++ b/collectors/tc.plugin/tc-qos-helper.sh	2022-12-02 19:09:02.027143498 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # netdata
- # real-time performance and health monitoring, done right!
-diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in
---- a/collectors/tc.plugin/tc-qos-helper.sh.in	2022-11-30 13:36:48.354053440 +0100
-+++ b/collectors/tc.plugin/tc-qos-helper.sh.in	2022-12-02 19:09:02.029143507 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # netdata
- # real-time performance and health monitoring, done right!
-diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh
---- a/contrib/debian/install_go.sh	2022-11-30 13:36:48.354053440 +0100
-+++ b/contrib/debian/install_go.sh	2022-12-02 19:09:02.035143535 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- GO_PACKAGE_VERSION="$1"
- LIB_DIR="$2"
-diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh
---- a/contrib/rhel/build-netdata-rpm.sh	2022-11-30 13:36:48.354053440 +0100
-+++ b/contrib/rhel/build-netdata-rpm.sh	2022-12-02 19:09:02.037143544 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # docker run -it --rm centos:6.9 /bin/sh
- # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel
-diff -rup a/coverity-scan.sh b/coverity-scan.sh
---- a/coverity-scan.sh	2022-11-30 13:36:48.354053440 +0100
-+++ b/coverity-scan.sh	2022-12-02 19:09:02.039143553 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # Coverity scan script
- #
-diff -rup a/cppcheck.sh b/cppcheck.sh
---- a/cppcheck.sh	2022-11-30 13:36:48.354053440 +0100
-+++ b/cppcheck.sh	2022-12-02 19:09:02.041143563 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # echo >>/tmp/cppcheck.log "cppcheck ${*}"
- 
-diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh
---- a/daemon/anonymous-statistics.sh	2022-11-30 13:37:40.539601742 +0100
-+++ b/daemon/anonymous-statistics.sh	2022-12-02 19:09:02.076143725 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # Valid actions:
- 
-diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in
---- a/daemon/anonymous-statistics.sh.in	2022-11-30 13:36:48.358053558 +0100
-+++ b/daemon/anonymous-statistics.sh.in	2022-12-02 19:09:02.073143711 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # Valid actions:
- 
-diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh
---- a/daemon/get-kubernetes-labels.sh	2022-11-30 13:37:40.543601861 +0100
-+++ b/daemon/get-kubernetes-labels.sh	2022-12-02 19:09:02.043143572 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- me="$(basename "${0}")"
- 
- # Checks if netdata is running in a kubernetes pod and fetches:
-diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in
---- a/daemon/get-kubernetes-labels.sh.in	2022-11-30 13:36:48.358053558 +0100
-+++ b/daemon/get-kubernetes-labels.sh.in	2022-12-02 19:09:02.045143581 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- me="$(basename "${0}")"
- 
- # Checks if netdata is running in a kubernetes pod and fetches:
-diff -rup a/daemon/system-info.sh b/daemon/system-info.sh
---- a/daemon/system-info.sh	2022-11-30 13:36:48.358053558 +0100
-+++ b/daemon/system-info.sh	2022-12-02 19:09:02.071143702 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # -------------------------------------------------------------------------------------------------
- # detect the kernel
-diff -rup a/diagrams/build.sh b/diagrams/build.sh
---- a/diagrams/build.sh	2022-11-30 13:36:48.398054744 +0100
-+++ b/diagrams/build.sh	2022-12-02 19:09:02.047143591 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- path=$(dirname "$0")
-diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh
---- a/exporting/nc-exporting.sh	2022-11-30 13:36:48.410055100 +0100
-+++ b/exporting/nc-exporting.sh	2022-12-02 19:09:02.049143600 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
-diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh
---- a/health/notifications/alarm-email.sh	2022-11-30 13:36:48.414055219 +0100
-+++ b/health/notifications/alarm-email.sh	2022-12-02 19:09:02.059143646 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # OBSOLETE - REPLACED WITH
-diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh
---- a/health/notifications/alarm-notify.sh	2022-11-30 13:37:40.939613600 +0100
-+++ b/health/notifications/alarm-notify.sh	2022-12-02 19:09:02.055143628 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck source=/dev/null disable=SC2086,SC2154
- 
- # netdata
-diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in
---- a/health/notifications/alarm-notify.sh.in	2022-11-30 13:36:48.414055219 +0100
-+++ b/health/notifications/alarm-notify.sh.in	2022-12-02 19:09:02.052143614 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck source=/dev/null disable=SC2086,SC2154
- 
- # netdata
-diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh
---- a/health/notifications/alarm-test.sh	2022-11-30 13:36:48.414055219 +0100
-+++ b/health/notifications/alarm-test.sh	2022-12-02 19:09:02.057143637 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # netdata
- # real-time performance and health monitoring, done right!
-diff -rup a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py
---- a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2022-11-30 13:36:56.678300242 +0100
-+++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2022-12-02 19:09:02.182144217 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python33
- #
- #  Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..]
- #
-diff -rup a/ml/dlib/dlib/travis/build-and-test.sh b/ml/dlib/dlib/travis/build-and-test.sh
---- a/ml/dlib/dlib/travis/build-and-test.sh	2022-11-30 13:36:56.750302376 +0100
-+++ b/ml/dlib/dlib/travis/build-and-test.sh	2022-12-02 19:09:02.061143656 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # Exit if anything fails.
- set -eux
- 
-diff -rup a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py
---- a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2022-11-30 13:36:56.798303799 +0100
-+++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2022-12-02 19:09:02.185144231 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- # This script takes the dlib lenet model trained by the
- # examples/dnn_introduction_ex.cpp example program and runs it using caffe. 
-diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh
---- a/packaging/check-kernel-config.sh	2022-11-30 13:36:48.434055812 +0100
-+++ b/packaging/check-kernel-config.sh	2022-12-02 19:09:02.063143665 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- get_kernel_version() {
-   r="$(uname -r | cut -f 1 -d '-')"
-diff -rup a/system/edit-config b/system/edit-config
---- a/system/edit-config	2022-11-30 13:37:39.643575179 +0100
-+++ b/system/edit-config	2022-12-02 19:09:02.080143744 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- [ -f /etc/profile ] && . /etc/profile
- 
-diff -rup a/system/edit-config.in b/system/edit-config.in
---- a/system/edit-config.in	2022-11-30 13:36:48.442056049 +0100
-+++ b/system/edit-config.in	2022-12-02 19:09:02.082143753 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- [ -f /etc/profile ] && . /etc/profile
- 
-diff -rup a/system/install-service.sh.in b/system/install-service.sh.in
---- a/system/install-service.sh.in	2022-11-30 13:36:48.442056049 +0100
-+++ b/system/install-service.sh.in	2022-12-02 19:09:02.078143735 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
-diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in
---- a/system/netdata-lsb.in	2022-11-30 13:36:48.442056049 +0100
-+++ b/system/netdata-lsb.in	2022-12-02 19:09:02.065143674 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # Netdata LSB start script
- #
-diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh
---- a/tests/health_mgmtapi/health-cmdapi-test.sh	2022-11-30 13:37:39.683576365 +0100
-+++ b/tests/health_mgmtapi/health-cmdapi-test.sh	2022-12-02 19:09:02.069143693 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
- 
- NETDATA_VARLIB_DIR="/var/lib/netdata"
-diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in
---- a/tests/health_mgmtapi/health-cmdapi-test.sh.in	2022-11-30 13:36:48.442056049 +0100
-+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in	2022-12-02 19:09:02.067143683 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
- # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
- 
- NETDATA_VARLIB_DIR="@varlibdir_POST@"
diff --git a/netdata-fix-shebang-1.39.0.patch b/netdata-fix-shebang-1.39.0.patch
new file mode 100644
index 0000000..050b46c
--- /dev/null
+++ b/netdata-fix-shebang-1.39.0.patch
@@ -0,0 +1,336 @@
+Fix shebang according to
+https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines
+
+diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in
+--- a/claim/netdata-claim.sh.in	2023-05-08 14:52:30.397594409 +0200
++++ b/claim/netdata-claim.sh.in	2023-05-14 11:12:13.229357763 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # netdata
+ # real-time performance and health monitoring, done right!
+ # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
+diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh
+--- a/collectors/cgroups.plugin/cgroup-name.sh	2023-05-08 14:52:30.397594409 +0200
++++ b/collectors/cgroups.plugin/cgroup-name.sh	2023-05-14 11:12:13.253357925 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ #shellcheck disable=SC2001
+ 
+ # netdata
+diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh
+--- a/collectors/cgroups.plugin/cgroup-network-helper.sh	2023-05-08 14:52:30.397594409 +0200
++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh	2023-05-14 11:12:13.251357912 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # shellcheck disable=SC1117
+ 
+ # cgroup-network-helper.sh
+diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
+--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2023-05-08 14:52:30.401594370 +0200
++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2023-05-14 11:12:13.242357851 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # shellcheck disable=SC2181
+diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin
+--- a/collectors/charts.d.plugin/charts.d.plugin	2023-05-08 14:53:14.493122687 +0200
++++ b/collectors/charts.d.plugin/charts.d.plugin	2023-05-14 11:12:13.240357837 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
+--- a/collectors/charts.d.plugin/charts.d.plugin.in	2023-05-08 14:52:30.401594370 +0200
++++ b/collectors/charts.d.plugin/charts.d.plugin.in	2023-05-14 11:12:13.237357817 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin
+--- a/collectors/ioping.plugin/ioping.plugin	2023-05-08 14:53:14.653120991 +0200
++++ b/collectors/ioping.plugin/ioping.plugin	2023-05-14 11:12:13.245357872 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in
+--- a/collectors/ioping.plugin/ioping.plugin.in	2023-05-08 14:52:30.409594292 +0200
++++ b/collectors/ioping.plugin/ioping.plugin.in	2023-05-14 11:12:13.247357885 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin
+--- a/collectors/python.d.plugin/python.d.plugin	2023-05-08 14:53:14.929118066 +0200
++++ b/collectors/python.d.plugin/python.d.plugin	2023-05-14 11:12:13.259357966 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ '''':;
+ pybinary=$(which python3 || which python || which python2)
+ filtered=()
+diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
+--- a/collectors/python.d.plugin/python.d.plugin.in	2023-05-08 14:52:30.429594097 +0200
++++ b/collectors/python.d.plugin/python.d.plugin.in	2023-05-14 11:12:13.256357946 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ '''':;
+ pybinary=$(which python3 || which python || which python2)
+ filtered=()
+diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py
+--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2023-05-08 14:52:30.433594058 +0200
++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2023-05-14 11:12:13.437359174 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#
+ # -*- coding: utf-8 -*-
+ #
+ # client.py - Somewhat higher-level GUI_RPC API for BOINC core client
+diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh
+--- a/collectors/tc.plugin/tc-qos-helper.sh	2023-05-08 14:53:15.429112767 +0200
++++ b/collectors/tc.plugin/tc-qos-helper.sh	2023-05-14 11:12:13.232357783 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in
+--- a/collectors/tc.plugin/tc-qos-helper.sh.in	2023-05-08 14:52:30.441593980 +0200
++++ b/collectors/tc.plugin/tc-qos-helper.sh.in	2023-05-14 11:12:13.234357797 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh
+--- a/contrib/debian/install_go.sh	2023-05-08 14:52:30.441593980 +0200
++++ b/contrib/debian/install_go.sh	2023-05-14 11:12:13.261357980 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ GO_PACKAGE_VERSION="$1"
+ LIB_DIR="$2"
+diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh
+--- a/contrib/rhel/build-netdata-rpm.sh	2023-05-08 14:52:30.441593980 +0200
++++ b/contrib/rhel/build-netdata-rpm.sh	2023-05-14 11:12:13.264358000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # docker run -it --rm centos:6.9 /bin/sh
+ # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel
+diff -rup a/coverity-scan.sh b/coverity-scan.sh
+--- a/coverity-scan.sh	2023-05-08 14:52:30.441593980 +0200
++++ b/coverity-scan.sh	2023-05-14 11:12:13.266358014 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ #
+ # Coverity scan script
+ #
+diff -rup a/cppcheck.sh b/cppcheck.sh
+--- a/cppcheck.sh	2023-05-08 14:52:30.441593980 +0200
++++ b/cppcheck.sh	2023-05-14 11:12:13.269358034 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # echo >>/tmp/cppcheck.log "cppcheck ${*}"
+ 
+diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh
+--- a/daemon/anonymous-statistics.sh	2023-05-08 14:53:15.469112343 +0200
++++ b/daemon/anonymous-statistics.sh	2023-05-14 11:12:13.309358305 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
++#!/usr/bin/sh
+ 
+ # Valid actions:
+ 
+diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in
+--- a/daemon/anonymous-statistics.sh.in	2023-05-08 14:52:30.445593941 +0200
++++ b/daemon/anonymous-statistics.sh.in	2023-05-14 11:12:13.312358326 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
++#!/usr/bin/sh
+ 
+ # Valid actions:
+ 
+diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh
+--- a/daemon/get-kubernetes-labels.sh	2023-05-08 14:53:15.473112301 +0200
++++ b/daemon/get-kubernetes-labels.sh	2023-05-14 11:12:13.275358075 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ me="$(basename "${0}")"
+ 
+ # Checks if netdata is running in a kubernetes pod and fetches:
+diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in
+--- a/daemon/get-kubernetes-labels.sh.in	2023-05-08 14:52:30.445593941 +0200
++++ b/daemon/get-kubernetes-labels.sh.in	2023-05-14 11:12:13.272358054 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ me="$(basename "${0}")"
+ 
+ # Checks if netdata is running in a kubernetes pod and fetches:
+diff -rup a/daemon/system-info.sh b/daemon/system-info.sh
+--- a/daemon/system-info.sh	2023-05-08 14:52:30.445593941 +0200
++++ b/daemon/system-info.sh	2023-05-14 11:12:13.307358292 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
++#!/usr/bin/sh
+ 
+ # -------------------------------------------------------------------------------------------------
+ # detect the kernel
+diff -rup a/diagrams/build.sh b/diagrams/build.sh
+--- a/diagrams/build.sh	2023-05-08 14:52:30.505593355 +0200
++++ b/diagrams/build.sh	2023-05-14 11:12:13.277358089 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ path=$(dirname "$0")
+diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh
+--- a/exporting/nc-exporting.sh	2023-05-08 14:52:30.525593160 +0200
++++ b/exporting/nc-exporting.sh	2023-05-14 11:12:13.279358102 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh
+--- a/health/notifications/alarm-email.sh	2023-05-08 14:52:30.529593121 +0200
++++ b/health/notifications/alarm-email.sh	2023-05-14 11:12:13.282358122 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # OBSOLETE - REPLACED WITH
+diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh
+--- a/health/notifications/alarm-notify.sh	2023-05-08 14:53:16.097105688 +0200
++++ b/health/notifications/alarm-notify.sh	2023-05-14 11:12:13.291358183 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ #shellcheck source=/dev/null disable=SC2086,SC2154
+ 
+ # netdata
+diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in
+--- a/health/notifications/alarm-notify.sh.in	2023-05-08 14:52:30.533593082 +0200
++++ b/health/notifications/alarm-notify.sh.in	2023-05-14 11:12:13.285358143 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ #shellcheck source=/dev/null disable=SC2086,SC2154
+ 
+ # netdata
+diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh
+--- a/health/notifications/alarm-test.sh	2023-05-08 14:52:30.533593082 +0200
++++ b/health/notifications/alarm-test.sh	2023-05-14 11:12:13.288358163 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py
+--- a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2023-05-08 14:52:40.109496786 +0200
++++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2023-05-14 11:12:13.441359201 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/python33
+ #
+ #  Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..]
+ #
+diff -rup a/ml/dlib/dlib/travis/build-and-test.sh b/ml/dlib/dlib/travis/build-and-test.sh
+--- a/ml/dlib/dlib/travis/build-and-test.sh	2023-05-08 14:52:40.201495797 +0200
++++ b/ml/dlib/dlib/travis/build-and-test.sh	2023-05-14 11:12:13.294358204 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # Exit if anything fails.
+ set -eux
+ 
+diff -rup a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py
+--- a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2023-05-08 14:52:40.265495109 +0200
++++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2023-05-14 11:12:13.444359221 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ # This script takes the dlib lenet model trained by the
+ # examples/dnn_introduction_ex.cpp example program and runs it using caffe. 
+diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh
+--- a/packaging/check-kernel-config.sh	2023-05-08 14:52:30.557592848 +0200
++++ b/packaging/check-kernel-config.sh	2023-05-14 11:12:13.297358224 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ 
+ get_kernel_version() {
+   r="$(uname -r | cut -f 1 -d '-')"
+diff -rup a/system/edit-config b/system/edit-config
+--- a/system/edit-config	2023-05-08 14:52:30.565592770 +0200
++++ b/system/edit-config	2023-05-14 11:12:13.316358353 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
++#!/usr/bin/sh
+ 
+ # shellcheck disable=SC1091
+ [ -f /etc/profile ] && . /etc/profile
+diff -rup a/system/install-service.sh.in b/system/install-service.sh.in
+--- a/system/install-service.sh.in	2023-05-08 14:52:30.565592770 +0200
++++ b/system/install-service.sh.in	2023-05-14 11:12:13.318358367 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
++#!/usr/bin/sh
+ 
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+diff -rup a/system/lsb/init.d/netdata.in b/system/lsb/init.d/netdata.in
+--- a/system/lsb/init.d/netdata.in	2023-05-08 14:52:30.565592770 +0200
++++ b/system/lsb/init.d/netdata.in	2023-05-14 11:12:13.299358238 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ #
+ # Netdata LSB start script
+ #
+diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh
+--- a/tests/health_mgmtapi/health-cmdapi-test.sh	2023-05-08 14:53:14.297124764 +0200
++++ b/tests/health_mgmtapi/health-cmdapi-test.sh	2023-05-14 11:12:13.304358271 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
+ 
+ NETDATA_VARLIB_DIR="/var/lib/netdata"
+diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in
+--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in	2023-05-08 14:52:30.569592731 +0200
++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in	2023-05-14 11:12:13.301358251 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
+ 
+ NETDATA_VARLIB_DIR="@varlibdir_POST@"
diff --git a/netdata-install-go-plugins.sh b/netdata-install-go-plugins.sh
new file mode 100755
index 0000000..798e5f1
--- /dev/null
+++ b/netdata-install-go-plugins.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+GO_PACKAGE_VERSION="v@PLUGIN_GO_VERSION@"
+CHECKSUM_FILE="@DATADIR@/netdata/go.d.checksums"
+LIBEXEC_PATH="@LIBEXEC@/netdata"
+
+safe_sha256sum() {
+	# Within the context of the installer, we only use -c option that is common between the two commands
+	# We will have to reconsider if we start non-common options
+	if command -v sha256sum >/dev/null 2>&1; then
+		sha256sum $@
+	elif command -v shasum >/dev/null 2>&1; then
+		shasum -a 256 $@
+	else
+		fatal "I could not find a suitable checksum binary to use"
+	fi
+}
+
+download_go() {
+	url="${1}"
+	dest="${2}"
+
+	if command -v curl >/dev/null 2>&1; then
+		curl -sSL --connect-timeout 10 --retry 3 "${url}" > "${dest}"
+	elif command -v wget >/dev/null 2>&1; then
+		wget -T 15 -O - "${url}" > "${dest}"
+	else
+		echo >&2
+		echo >&2 "Downloading go.d plugin from '${url}' failed because of missing mandatory packages."
+		echo >&2 "Either add packages or disable it by issuing '--disable-go' in the installer"
+		echo >&2
+		exit 1
+	fi
+}
+
+install_go() {
+	# When updating this value, ensure correct checksums in packaging/go.d.checksums
+	ARCH_MAP=(
+		'i386::386'
+		'i686::386'
+		'x86_64::amd64'
+		'aarch64::arm64'
+		'armv64::arm64'
+		'armv6l::arm'
+		'armv7l::arm'
+		'armv5tel::arm'
+	)
+
+	if [ -z "${NETDATA_DISABLE_GO+x}" ]; then
+		echo >&2 "Install go.d.plugin"
+		ARCH=$(uname -m)
+		OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+		for index in "${ARCH_MAP[@]}" ; do
+			KEY="${index%%::*}"
+			VALUE="${index##*::}"
+			if [ "$KEY" = "$ARCH" ]; then
+				ARCH="${VALUE}"
+				break
+			fi
+		done
+		tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
+		GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
+		download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
+		# Include in RPM
+		#download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/config.tar.gz" "${tmp}/config.tar.gz"
+
+		#if [ ! -f "${tmp}/${GO_PACKAGE_BASENAME}" ] || [ ! -f "${tmp}/config.tar.gz" ] || [ ! -s "${tmp}/config.tar.gz" ] || [ ! -s "${tmp}/${GO_PACKAGE_BASENAME}" ]; then
+		if [ ! -f "${tmp}/${GO_PACKAGE_BASENAME}" ] || [ ! -s "${tmp}/${GO_PACKAGE_BASENAME}" ]; then
+			echo >&2 "Either check the error or consider disabling it by issuing '--disable-go' in the installer"
+			echo >&2
+			return 1
+		fi
+
+		grep "${GO_PACKAGE_BASENAME}\$" "${CHECKSUM_FILE}" > "${tmp}/sha256sums.txt" 2>/dev/null
+		#grep "config.tar.gz" "${CHECKSUM_FILE}" >> "${tmp}/sha256sums.txt" 2>/dev/null
+
+		# Checksum validation
+		if ! (cd "${tmp}" && safe_sha256sum -c "sha256sums.txt"); then
+
+			echo >&2 "go.d plugin checksum validation failure."
+			echo >&2 "Either check the error or consider disabling it by issuing '--disable-go' in the installer"
+			echo >&2
+
+			echo "go.d.plugin package files checksum validation failed."
+			exit 1
+		fi
+
+		# Install files
+		#tar -xf "${tmp}/config.tar.gz" -C "${NETDATA_CONF_STOCK}/conf.d/"
+		tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
+		install -m 0640 -p "${GO_PACKAGE_BASENAME/\.tar\.gz/}" ${LIBEXEC_PATH}/plugins.d/go.d.plugin
+		setcap 'cap_net_admin=eip cap_net_raw=eip' ${LIBEXEC_PATH}/plugins.d/go.d.plugin
+		rm -rf "${tmp}"
+	fi
+	return 0
+}
+
+if [ ${UID} -ne 0 ]
+then
+  echo "This script must be run by root, please use sudo"
+  exit 1
+fi
+install_go
diff --git a/netdata-remove-fonts-1.37.0.patch b/netdata-remove-fonts-1.37.0.patch
deleted file mode 100644
index 53e6646..0000000
--- a/netdata-remove-fonts-1.37.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am
---- a/web/gui/dashboard/Makefile.am	2022-11-30 13:36:48.450056286 +0100
-+++ b/web/gui/dashboard/Makefile.am	2022-12-02 19:12:46.215183637 +0100
-@@ -171,36 +171,3 @@ dist_webstaticjs_DATA = \
-     $(srcdir)/static/js/runtime-main.08abed8f.js \
-     $(srcdir)/static/js/runtime-main.08abed8f.js.map \
-     $(NULL)
--
--webstaticmediadir=$(webdir)/static/media
--dist_webstaticmedia_DATA = \
--    $(srcdir)/static/media/ibm-plex-sans-latin-100.245539db.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-100.9a582f3a.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-200.67524c36.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.52df2560.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-400.263d6267.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-400.a2c56f94.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.272f8611.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-500.0866c244.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-600.337b1651.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-700.b8809d61.woff \
--    $(srcdir)/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \
--    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \
--    $(srcdir)/static/media/material-icons.0509ab09.woff2 \
--    $(NULL)
diff --git a/netdata-remove-fonts-1.38.0.patch b/netdata-remove-fonts-1.38.0.patch
new file mode 100644
index 0000000..306a5b0
--- /dev/null
+++ b/netdata-remove-fonts-1.38.0.patch
@@ -0,0 +1,40 @@
+diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am
+--- a/web/gui/dashboard/Makefile.am	2023-02-06 15:18:31.201561714 +0100
++++ b/web/gui/dashboard/Makefile.am	2023-02-07 08:59:30.617627390 +0100
+@@ -171,36 +171,3 @@ dist_webstaticjs_DATA = \
+     $(srcdir)/static/js/runtime-main.08abed8f.js \
+     $(srcdir)/static/js/runtime-main.08abed8f.js.map \
+     $(NULL)
+-
+-webstaticmediadir=$(webdir)/static/media
+-dist_webstaticmedia_DATA = \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100.245539db.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100.9a582f3a.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200.67524c36.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.52df2560.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400.263d6267.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400.a2c56f94.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.272f8611.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500.0866c244.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600.337b1651.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700.b8809d61.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \
+-    $(srcdir)/static/media/material-icons.0509ab09.woff2 \
+-    $(NULL)
diff --git a/netdata.conf b/netdata.conf
index 392ca07..3fa470a 100644
--- a/netdata.conf
+++ b/netdata.conf
@@ -1,6 +1,10 @@
 # netdata configuration
 #
-# You can download the latest version of this file, using:
+# You can get the latest version of this file, using:
+#
+#  netdatacli dumpconfig > /etc/netdata/netdata.conf
+#
+# You can also download it using:
 #
 #  wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
 # or
@@ -10,18 +14,18 @@
 # The value shown in the commented settings, is the default value.
 #
 
-# global netdata configuration
 [global]
     run as user = netdata
 
-    # the default database size - 1 hour
-    history = 3600
+    # default storage size - increase for longer data retention
+    page cache size = 32
+    dbengine multihost disk space = 256
 
     # some defaults to run netdata with least priority
     process scheduling policy = idle
     OOM score = 1000
     
-    stock config directory = /etc/netdata/conf.d
+    stock config directory = /usr/lib/netdata/conf.d
   
 [web]
     web files owner = root
@@ -31,4 +35,4 @@
     bind to = localhost
 
 [health]
-    stock health configuration directory = /etc/netdata/conf.d/health.d
+    stock health configuration directory = /usr/lib/netdata/conf.d/health.d
diff --git a/netdata.profile b/netdata.profile
index 0673b29..4493d45 100644
--- a/netdata.profile
+++ b/netdata.profile
@@ -1,5 +1,5 @@
 # env vars for netdata
-export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d"
+export NETDATA_STOCK_CONFIG_DIR="@STOCK_CONFIG_DIR@/conf.d"
 export NETDATA_USER_CONFIG_DIR="/etc/netdata"
 export NETDATA_VARLIB_DIR="/var/lib/netdata"
 export NETDATA_CACHE_DIR="/var/cache/netdata"
diff --git a/netdata.spec b/netdata.spec
index ef126dc..8c5b0cf 100644
--- a/netdata.spec
+++ b/netdata.spec
@@ -42,7 +42,7 @@ ExcludeArch: s390x
 %global  _hardened_build 1
 
 # Build release candidate
-%global upver        1.37.1
+%global upver        1.39.0
 #global rcver        rc0
 
 # Last python 2 support (el7 only)
@@ -50,9 +50,14 @@ ExcludeArch: s390x
 # el8 only
 %global judy_ver 1.0.5-netdata2
 
+# 
+%global plugin_go_ver 0.52.2
+
+%global netdata_conf_stock %{_prefix}/lib/%{name}
+
 Name:           netdata
 Version:        %{upver}%{?rcver:~%{rcver}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Real-time performance monitoring
 # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md
 License:        GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL 
@@ -63,14 +68,16 @@ Source2:        netdata.init
 Source3:        netdata.conf
 Source4:        netdata.profile
 Source5:        README-packager.md
+Source20:       https://github.com/netdata/go.d.plugin/releases/download/v%{plugin_go_ver}/config.tar.gz
+Source21:       netdata-install-go-plugins.sh
 # Only for el7
 Source10:       https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf_cpp_ver}/protobuf-cpp-%{protobuf_cpp_ver}.tar.gz
 # Only for el8
 Source11:       https://github.com/netdata/libjudy/archive/v%{judy_ver}/libjudy-%{judy_ver}.tar.gz
-Patch0:         netdata-fix-shebang-1.37.0.patch
+Patch0:         netdata-fix-shebang-1.39.0.patch
 %if 0%{?fedora}
 # Remove embedded font
-Patch10:        netdata-remove-fonts-1.37.0.patch
+Patch10:        netdata-remove-fonts-1.38.0.patch
 %endif
 
 BuildRequires:  zlib-devel
@@ -97,6 +104,7 @@ BuildRequires:  libcurl-devel
 BuildRequires:  systemd
 BuildRequires:  openssl-devel
 BuildRequires:  libpfm-devel
+BuildRequires:  libyaml-devel
 ### TODO Remove condition when autogen become available in el9
 %if 0%{?rhel} && 0%{?rhel} == 9
 %else
@@ -258,6 +266,10 @@ autoreconf -ivf
     
 %make_build
 
+# Integrate go plugins
+mkdir conf.d
+tar -xf %{SOURCE20} -C conf.d/
+
 %install
 %make_install
 find %{buildroot} -name '.keep' -delete
@@ -265,19 +277,24 @@ find %{buildroot} -name '.keep' -delete
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-install -Dp -m 0644 system/netdata.service %{buildroot}%{_unitdir}/%{name}.service
+install -Dp -m 0644 system/systemd/netdata.service %{buildroot}%{_unitdir}/%{name}.service
 install -p -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-install -Dp -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/netdata
+install -Dp -m 0644 system/logrotate/netdata %{buildroot}%{_sysconfdir}/logrotate.d/netdata
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/
-install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg 
-mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/
+# it's better to put stock config file in a noarch pkg (like systemd)
+%ifnarch i686
+mkdir -p %{buildroot}%{netdata_conf_stock}/conf.d
+mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{netdata_conf_stock}/conf.d/
+sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_sysconfdir}/%{name}/edit-config
+%endif
+sed -i -e '/^script_dir/s;=.*;="\$\{NETDATA_USER_CONFIG_DIR:-%{_sysconfdir}/netdata\}";' \
+    %{buildroot}%{_sysconfdir}/%{name}/edit-config
+
 # Scripts must not be in /etc, /usr/libexec is a better place
 mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config
 # Fix EOL
@@ -295,6 +312,18 @@ done
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh
+sed -i -e '/NETDATA_STOCK_CONFIG_DIR/s;@STOCK_CONFIG_DIR@;%{netdata_conf_stock};' %{buildroot}%{_sysconfdir}/profile.d/netdata.sh
+
+# Integrate go plugins
+install -p conf.d/go.d.conf %{buildroot}%{netdata_conf_stock}/conf.d/go.d.conf
+cp -rp conf.d/go.d %{buildroot}%{netdata_conf_stock}/conf.d/go.d
+install -p -m 0644 packaging/go.d.checksums %{buildroot}%{_datadir}/%{name}/go.d.checksums
+install -p -m 0750 %{SOURCE21} %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh
+sed -i \
+    -e 's;@PLUGIN_GO_VERSION@;%{plugin_go_ver};' \
+    -e 's;@DATADIR@;%{_datadir};' \
+    -e 's;@LIBEXEC@;%{_libexecdir};' \
+    %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh
 
 %check
 make tests
@@ -305,10 +334,10 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s 
 
 %post
 sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||:
+sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||:
+sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||:
 %systemd_post %{name}.service
-echo "The current config file can be downloaded with the following command"
-echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf"
-echo "Config should be edited with %{_libexecdir}/%{name}/edit-config"
+echo "Netdata config should be edited with %{_libexecdir}/%{name}/edit-config"
 
 %preun
 %systemd_preun %{name}.service
@@ -339,6 +368,7 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config"
 %attr(0755, netdata, netdata) %dir %{_localstatedir}/cache/%{name}
 %attr(0755, netdata, netdata) %dir %{_localstatedir}/log/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(0750,root,netdata)%{_sbindir}/netdata-install-go-plugins.sh
 
 %files conf
 %doc README.md
@@ -348,19 +378,9 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config"
 %dir %{_sysconfdir}/%{name}/health.d
 %dir %{_sysconfdir}/%{name}/python.d
 %dir %{_sysconfdir}/%{name}/statsd.d
-%dir %{_sysconfdir}/%{name}/conf.d
-%dir %{_sysconfdir}/%{name}/conf.d/charts.d
-%dir %{_sysconfdir}/%{name}/conf.d/health.d
-%dir %{_sysconfdir}/%{name}/conf.d/python.d
-%dir %{_sysconfdir}/%{name}/conf.d/statsd.d
-%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config %{_sysconfdir}/%{name}/conf.d/*.conf
-%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf
-%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf
-%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf
-%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf
-%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf
+%dir %{netdata_conf_stock}/conf.d
+%{netdata_conf_stock}/conf.d/*
 %config %{_sysconfdir}/logrotate.d/netdata
 %config %{_sysconfdir}/profile.d/netdata.sh
 %dir %{_libexecdir}/%{name}
@@ -372,7 +392,7 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config"
 %license LICENSE REDISTRIBUTED.md
 %dir %{_datadir}/%{name}
 %attr(-, root, netdata) %{_datadir}/%{name}/web
-
+%{_datadir}/%{name}/go.d.checksums
 
 %files freeipmi
 %doc README.md
@@ -380,6 +400,9 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config"
 %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
 
 %changelog
+* Sun May 14 2023 Didier Fabert <didier.fabert@gmail.com> 1.39.0-1
+- Update from upstream
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild