From dd24e74edfbafc09eaeb2dde0fda7eb3e1e86d0b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 14 Jun 2023 21:20:36 +0200 Subject: Merging upstream version 1.40.0. Signed-off-by: Daniel Baumann --- .github/CODEOWNERS | 6 +++--- .github/codeql/c-cpp-config.yml | 2 ++ .github/data/distros.yml | 13 ++++++------- .github/labeler.yml | 4 ++++ .github/scripts/pkg-test.sh | 20 ++++++-------------- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 1 + 7 files changed, 24 insertions(+), 26 deletions(-) create mode 100644 .github/codeql/c-cpp-config.yml (limited to '.github') diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7857b9a73..bea69deac 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ collectors/cups.plugin/ @thiagoftsm exporting/ @thiagoftsm daemon/ @thiagoftsm @vkalintiris database/ @thiagoftsm @vkalintiris -docs/ @tkatsoulas @andrewm4894 @cakrit +docs/ @tkatsoulas @andrewm4894 @Ancairon health/ @thiagoftsm @vkalintiris @MrZammler health/health.d/ @thiagoftsm @MrZammler health/notifications/ @Ferroin @thiagoftsm @MrZammler @@ -35,8 +35,8 @@ web/gui/ @jacekkolasa # Ownership by filetype (overwrites ownership by directory) *.am @Ferroin @tkatsoulas -*.md @tkatsoulas @andrewm4894 @cakrit -*.mdx @tkatsoulas @andrewm4894 @cakrit +*.md @tkatsoulas @andrewm4894 @Ancairon +*.mdx @tkatsoulas @andrewm4894 @Ancairon Dockerfile* @Ferroin @tkatsoulas # Ownership of specific files diff --git a/.github/codeql/c-cpp-config.yml b/.github/codeql/c-cpp-config.yml new file mode 100644 index 000000000..cd7c24011 --- /dev/null +++ b/.github/codeql/c-cpp-config.yml @@ -0,0 +1,2 @@ +paths-ignore: + - httpd/h2o diff --git a/.github/data/distros.yml b/.github/data/distros.yml index bfe8b7615..355378f5a 100644 --- a/.github/data/distros.yml +++ b/.github/data/distros.yml @@ -161,13 +161,6 @@ include: repo_distro: fedora/37 test: ebpf-core: true - - <<: *fedora - version: "36" - packages: - <<: *fedora_packages - repo_distro: fedora/36 - test: - ebpf-core: true - &opensuse distro: opensuse @@ -184,6 +177,12 @@ include: - aarch64 test: ebpf-core: true + - <<: *opensuse + version: "15.5" + base_image: opensuse/leap:15.5 + packages: + <<: *opensuse_packages + repo_distro: opensuse/15.5 - &oracle distro: oraclelinux diff --git a/.github/labeler.yml b/.github/labeler.yml index 4d3a614d4..44c493b10 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -78,6 +78,10 @@ collectors/cups: - collectors/cups.plugin/* - collectors/cups.plugin/**/* +collectors/debugfs: + - collectors/debugfs.plugin/* + - collectors/debugfs.plugin/**/* + collectors/diskspace: - collectors/diskspace.plugin/* - collectors/diskspace.plugin/**/* diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh index 45b8c320b..85e8b2e8d 100755 --- a/.github/scripts/pkg-test.sh +++ b/.github/scripts/pkg-test.sh @@ -14,7 +14,7 @@ install_debian_like() { # Install Netdata # Strange quoting is required here so that glob matching works. - apt-get install -y /netdata/artifacts/netdata_"${VERSION}"*_*.deb || exit 1 + apt-get install -y $(find /netdata/artifacts -type f -name 'netdata*.deb' ! -name '*dbgsym*' ! -name '*cups*' ! -name '*freeipmi*') || exit 3 # Install testing tools apt-get install -y --no-install-recommends curl "${netcat}" jq || exit 1 @@ -26,15 +26,13 @@ install_fedora_like() { PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")" - pkg_version="$(echo "${VERSION}" | tr - .)" - if [ "${PKGMGR}" = "dnf" ]; then opts="--allowerasing" fi # Install Netdata # Strange quoting is required here so that glob matching works. - "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 + "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1 # Install testing tools "$PKGMGR" install -y curl nc jq || exit 1 @@ -46,8 +44,6 @@ install_centos() { PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")" - pkg_version="$(echo "${VERSION}" | tr - .)" - if [ "${PKGMGR}" = "dnf" ]; then opts="--allowerasing" fi @@ -57,7 +53,7 @@ install_centos() { # Install Netdata # Strange quoting is required here so that glob matching works. - "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 + "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1 # Install testing tools # shellcheck disable=SC2086 @@ -67,15 +63,13 @@ install_centos() { install_amazon_linux() { PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")" - pkg_version="$(echo "${VERSION}" | tr - .)" - if [ "${PKGMGR}" = "dnf" ]; then opts="--allowerasing" fi # Install Netdata # Strange quoting is required here so that glob matching works. - "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 + "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1 # Install testing tools # shellcheck disable=SC2086 @@ -86,14 +80,12 @@ install_suse_like() { # Using a glob pattern here because I can't reliably determine what the # resulting package name will be (TODO: There must be a better way!) - pkg_version="$(echo "${VERSION}" | tr - .)" - # Install Netdata # Strange quoting is required here so that glob matching works. - zypper install -y --allow-unsigned-rpm /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 + zypper install -y --allow-downgrade --allow-unsigned-rpm /netdata/artifacts/netdata*.rpm || exit 1 # Install testing tools - zypper install -y --no-recommends curl netcat-openbsd jq || exit 1 + zypper install -y --allow-downgrade --no-recommends curl netcat-openbsd jq || exit 1 } dump_log() { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c349e4fdd..da828f51e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -659,10 +659,10 @@ jobs: credentials_json: ${{ secrets.GCS_STORAGE_SERVICE_KEY_JSON }} - name: Setup GCS id: gcs-setup - uses: google-github-actions/setup-gcloud@v1.1.0 + uses: google-github-actions/setup-gcloud@v1.1.1 - name: Upload Artifacts id: upload - uses: google-github-actions/upload-cloud-storage@v1.0.1 + uses: google-github-actions/upload-cloud-storage@v1.0.3 with: destination: ${{ secrets.GCP_NIGHTLY_STORAGE_BUCKET }} gzip: false diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b2af615e4..174f650ea 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -84,6 +84,7 @@ jobs: uses: github/codeql-action/init@v2 with: languages: cpp + config-file: ./.github/codeql/c-cpp-config.yml - name: Prepare environment run: ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata - name: Build netdata -- cgit v1.2.3