Merging upstream version 1.33.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 90 insertions, 16 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 50aa6797f..9aae48d57 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -33,7 +33,7 @@ docs/ @DShreve2 @kickoke
 health/ @thiagoftsm @vlvkobal @vkalintiris
 health/health.d/ @thiagoftsm @vlvkobal
 health/notifications/ @Ferroin @thiagoftsm
-ml/ @siamaktavakoli @vkalintiris
+ml/ @andrewm4894 @vkalintiris
 libnetdata/ @thiagofsm
 packaging/ @Ferroin @iigorkarpov @maneamarius @vkalintiris
 registry/ @jacekkolasa
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 10a131c4c..d82d46331 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -1,4 +1,4 @@
-name: "Bug report: Netdata"
+name: "Netdata Agent: Bug report"
 description: "Submit a report and help us improve our free and open-source Netdata Agent"
 title: "[Bug]: "
 labels: ["bug", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml
new file mode 100644
index 000000000..11d77a04a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml
@@ -0,0 +1,62 @@
+name: "Netdata Agent: Feature request"
+description: "Submit a feature request and help us improve our free and open-source Netdata Agent"
+title: "[Feat]: "
+labels: ["feature request", "needs triage"]
+body:
+  - type: markdown
+    attributes:
+      value: "### Thank you for contributing to our project!"
+  - type: markdown
+    attributes:
+      value: |
+        Submit a feature request and help us improve our free and open-source Netdata Agent.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: |
+        Is your feature request intended to solve a problem? If so, provide a description of the problem.
+    validations:
+      required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Provide a clear and concise description of the feature you want or need.
+    validations:
+      required: true
+  - type: dropdown
+    id: importance
+    attributes:
+      label: Importance
+      description: |
+        Help us to understand the importance of your feature request. Choose "blocker" if lack of this feature stops you from using Netdata Agent.
+      options:
+        - "nice to have"
+        - "really want"
+        - "must have"
+        - "blocker"
+    validations:
+      required: true
+  - type: textarea
+    id: value-proposition
+    attributes:
+      label: Value proposition
+      description: |
+        Help us to understand why we need this feaure. Describe benefits that users receive if we implement this feature request.
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-implementation
+    attributes:
+      label: Proposed implementation
+      description: |
+        Share your proposal if you have any ideas on how this feature can be implemented.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e6ea7d316..c21d50e0c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,15 @@
+# Ref: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: false
 contact_links:
-  - name: "Bug report: Netdata Cloud"
+  - name: "Netdata Agent: Question"
+    url: https://github.com/netdata/netdata/discussions/new?category=q-a
+    about: Ask a question about Netdata Agent
+  - name: "Netdata Agent Dashboard"
+    url: https://github.com/netdata/dashboard/issues/new/choose
+    about: Create a report to help us improve our dashboard
+  - name: "Netdata Cloud"
     url: https://github.com/netdata/netdata-cloud/issues/new/choose
     about: Create a report to help us improve our web application
-  - name: Help
-    url: https://community.netdata.cloud/c/support/13
-    about: We offer community-driven support on our community forums
-  - name: Feature request
-    url: https://community.netdata.cloud/c/feature-requests/7
-    about: Make a feature request for Netdata Cloud or the Netdata Agent
   - name: Community
     url: https://netdata.cloud/community
     about: If you don't know where to start, visit our community page!
diff --git a/.github/data/build-matrix.json b/.github/data/build-matrix.json
index c50ec0d22..6ceb9fa54 100644
--- a/.github/data/build-matrix.json
+++ b/.github/data/build-matrix.json
@@ -34,8 +34,8 @@
       "artifact_key": "centos7"
     },
     {
-      "distro": "centos:8",
-      "artifact_key": "centos8",
+      "distro": "rockylinux/rockylinux:8",
+      "artifact_key": "rockylinux8",
       "rmjsonc": "dnf remove -y json-c-devel"
     },
     {
diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh
index 196fefa99..148ecd629 100755
--- a/.github/scripts/pkg-test.sh
+++ b/.github/scripts/pkg-test.sh
@@ -101,7 +101,7 @@ case "${DISTRO}" in
   fedora | oraclelinux)
     install_fedora_like
     ;;
-  centos)
+  centos | rockylinux)
     install_centos
     ;;
   opensuse)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61e086670..abf08c2ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -461,7 +461,7 @@ jobs:
           name: final-artifacts
           path: final-artifacts
       - name: Setup Gcloud
-        uses: google-github-actions/setup-gcloud@v0.4.0
+        uses: google-github-actions/setup-gcloud@v0.5.0
         with:
           project_id: ${{ secrets.GCP_NIGHTLY_STORAGE_PROJECT }}
           service_account_key: ${{ secrets.GCP_STORAGE_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index ca48f6ca2..38a78731b 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -52,8 +52,8 @@ jobs:
           - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf}
           - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64}
           - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
-          - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
-          - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64}
+          - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
+          - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/arm64/v8, arch: arm64}
           - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
           - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm/v7, arch: armhf}
           - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm64/v8, arch: arm64}
diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml
index e5fee2f8a..b8d0ff67c 100644
--- a/.github/workflows/repoconfig-packages.yml
+++ b/.github/workflows/repoconfig-packages.yml
@@ -3,6 +3,16 @@
 name: Repository Packages
 on:
   workflow_dispatch: null
+  pull_request:
+    paths:
+      - packaging/repoconfig/**
+      - .github/workflows/repoconfig-packages.yml
+  push:
+    branches:
+      - master
+    paths:
+      - packaging/repoconfig/**
+      - .github/workflows/repoconfig-packages.yml
 env:
   DO_NOT_TRACK: 1
 jobs:
@@ -23,7 +33,7 @@ jobs:
           - {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
           - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
           - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
-          - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
+          - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
           - {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
           - {distro: fedora, version: "35", pkgclouddistro: fedora/35, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
           - {distro: opensuse, version: "15.3", pkgclouddistro: opensuse/15.3, format: rpm, base_image: opensuse/leap, platform: linux/amd64, arch: amd64}
@@ -51,6 +61,7 @@ jobs:
               -v $PWD:/netdata ${{ matrix.base_image }}:${{ matrix.version }} \
               /netdata/packaging/repoconfig/build-${{ matrix.format }}.sh
       - name: Upload Packages
+        if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata'
         shell: bash
         env:
           PKG_CLOUD_TOKEN: ${{ secrets.PACKAGE_CLOUD_API_KEY }}