Merging upstream version 1.31.0.

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

7 files changed, 70 insertions, 28 deletions

diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml
index 4c4693601..251a65162 100644
--- a/.github/workflows/build-and-install.yml
+++ b/.github/workflows/build-and-install.yml
@@ -23,6 +23,7 @@ jobs:
     name: Build & Install
     strategy:
       fail-fast: false
+      max-parallel: 8
       matrix:
         distro:
           - 'alpine:edge'
@@ -148,7 +149,7 @@ jobs:
               yum -y groupinstall 'Development Tools' &&
               yum -y install libcurl-devel openssl-devel libuuid-devel
             build_kinesis: >-
-              git clone https://github.com/aws/aws-sdk-cpp.git &&
+              git clone --branch 1.8.186 --depth 1 https://github.com/aws/aws-sdk-cpp.git &&
               cmake -DCMAKE_INSTALL_PREFIX=/usr
               -DBUILD_ONLY=kinesis
               ./aws-sdk-cpp &&
@@ -160,7 +161,7 @@ jobs:
               DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential &&
               DEBIAN_FRONTEND=noninteractive apt-get install -y libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev
             build_kinesis: >-
-              git clone https://github.com/aws/aws-sdk-cpp.git &&
+              git clone --branch 1.8.186 --depth 1 https://github.com/aws/aws-sdk-cpp.git &&
               cmake -DCMAKE_INSTALL_PREFIX=/usr
               -DBUILD_ONLY=kinesis
               ./aws-sdk-cpp &&
@@ -172,7 +173,7 @@ jobs:
               dnf -y groupinstall 'Development Tools' &&
               dnf -y install libcurl-devel openssl-devel libuuid-devel
             build_kinesis: >-
-              git clone https://github.com/aws/aws-sdk-cpp.git &&
+              git clone --branch 1.8.186 --depth 1 https://github.com/aws/aws-sdk-cpp.git &&
               cmake -DCMAKE_INSTALL_PREFIX=/usr
               -DBUILD_ONLY=kinesis
               ./aws-sdk-cpp &&
@@ -184,7 +185,7 @@ jobs:
               DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential &&
               DEBIAN_FRONTEND=noninteractive apt-get install -y libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev
             build_kinesis: >-
-              git clone https://github.com/aws/aws-sdk-cpp.git &&
+              git clone --branch 1.8.186 --depth 1 https://github.com/aws/aws-sdk-cpp.git &&
               cmake -DCMAKE_INSTALL_PREFIX=/usr
               -DBUILD_ONLY=kinesis
               ./aws-sdk-cpp &&
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 7225d3dbe..e4025dd20 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -19,28 +19,6 @@ jobs:
           LOCAL_ONLY: "true"
         run: |
           ./tests/installer/checksums.sh
-  dashboard-checks:
-    name: Dashboard
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git clone repository
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Install required packages
-        run: |
-          ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
-      - name: Backup dashboard.js
-        run: |
-          cp web/gui/dashboard.js /tmp/dashboard.js
-      - name: Regenerate dashboard.js
-        run: |
-          autoreconf -ivf
-          ./configure --enable-maintainer-mode
-          make dist
-      - name: Compare generated Dashboard vs. Backed up Dashboard
-        run: |
-          diff -sNrdu /tmp/dashboard.js web/gui/dashboard.js
   libressl-checks:
     name: LibreSSL
     runs-on: ubuntu-latest
@@ -113,4 +91,9 @@ jobs:
       - name: Build netdata
         run: ./netdata-installer.sh --dont-start-it --disable-telemetry --dont-wait --install /tmp/install
       - name: Check that repo is clean
-        run: if [ "$(git status --porcelain=v1 | wc -l)" -gt 0 ] ; then exit 1 ; fi
+        run: |
+          git status --porcelain=v1 > /tmp/porcelain
+          if [ -s /tmp/porcelain ]; then
+            cat /tmp/porcelain
+            exit 1
+          fi
diff --git a/.github/workflows/dashboard-pr.yml b/.github/workflows/dashboard-pr.yml
new file mode 100644
index 000000000..8f5a40f2b
--- /dev/null
+++ b/.github/workflows/dashboard-pr.yml
@@ -0,0 +1,47 @@
+---
+# Create a PR to update the react dashboard code.
+name: Dashboard Version PR
+
+on:
+  workflow_dispatch:
+    inputs:
+      dashboard_version:
+        # This must be specified, and must _exactly_ match the version
+        # tag for the release to be used for the update.
+        name: Dashboard Version
+        required: true
+
+jobs:
+  dashboard-pr:
+    name: Generate Dashboard Version Bump PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Create Branch
+        # This is needed because we want to do a PR, and the commit
+        # action used below requires the branch it is commiting to to
+        # already exist.
+        run: |
+          git checkout -b dashboard-${{ github.event.inputs.dashboard_version }}
+          git push -u origin dashboard-${{ github.event.inputs.dashboard_version }}
+      - name: Update Files
+        run: |
+          web/gui/bundle_dashboard.py ${{ github.event.inputs.dashboard_version }}
+      - name: Commit Changes
+        uses: swinton/commit@v2.x
+        env:
+          GH_TOKEN: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}
+        with:
+          files: |
+            packaging/dashboard.version
+            packaging/dashboard.checksums
+          commit-message: 'Update dashboard to version ${{ github.event.inputs.dashboard_version }}.'
+          ref: refs/heads/dashboard-${{ github.event.inputs.dashboard_version }}
+      - name: Create PR
+        uses: repo-sync/pull-request@v2
+        with:
+          source_branch: dashboard-${{ github.event.inputs.dashboard_version }}
+          pr_title: 'Update dashboard to version ${{ github.event.inputs.dashboard_version }}.'
+          pr_body: 'See https://github.com/netdata/dashboard/releases/tag/${{ github.event.inputs.dashboard_version }} for changes.'
+          github_token: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a5648d2a9..4f18ce5b6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -67,3 +67,12 @@ jobs:
             && github.event_name != 'pull_request'
             && startsWith(github.ref, 'refs/heads/master')
           }}
+      - name: Trigger Helmchart PR
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.version != 'nightly'
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          token: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}
+          repo: netdata/helmchart
+          workflow: Agent Version PR
+          ref: refs/heads/master
+          inputs: '{"agent_version": "${{ github.event.inputs.version }}"}'
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index a0315430e..934aa264b 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -45,6 +45,7 @@ jobs:
       # build failure for one version doesn't prevent us from publishing
       # successfully built and tested packages for another version.
       fail-fast: false
+      max-parallel: 8
     steps:
       - name: Checkout PR # Checkout the PR if it's a PR.
         if: github.event_name == 'pull_request'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 171bf0bb9..7e47f12da 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -85,7 +85,7 @@ jobs:
           find . -type f -name '*.log' -exec cp {} ../logs/ \;
           popd || exit 1
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2.2.3
         if: always()
         with:
           name: logs
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
index 76cb2fdbe..5f8d77c4a 100644
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@@ -13,6 +13,7 @@ jobs:
     name: Install, Build & Update
     strategy:
       fail-fast: false
+      max-parallel: 8
       matrix:
         distro:
           - 'alpine:3.12'