From 124e05fb27c545f9744d4105473fdbc93bbea52a Mon Sep 17 00:00:00 2001 From: Eric Chlebek Date: Tue, 18 Jul 2023 13:19:05 -0700 Subject: [PATCH] Remove amazon2022, use amazon2023 instead amazon2022 lacks net-snmp-utils https://github.com/amazonlinux/amazon-linux-2023/issues/144 Signed-off-by: Eric Chlebek --- .bonsai.yml | 6 +++--- Dockerfile.amazon2022 => Dockerfile.amazon2023 | 4 ++-- README.md | 2 +- build.sh | 2 +- package-build.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename Dockerfile.amazon2022 => Dockerfile.amazon2023 (88%) diff --git a/.bonsai.yml b/.bonsai.yml index dc4c2d4..aba5d56 100644 --- a/.bonsai.yml +++ b/.bonsai.yml @@ -20,14 +20,14 @@ builds: - "entity.system.platform_version == '2'" - "entity.system.arch == 'amd64'" -- platform: "amazon2022" +- platform: "amazon2023" arch: "amd64" - asset_filename: "monitoring-plugins-amazon2022_#{version}_linux_amd64.tar.gz" + asset_filename: "monitoring-plugins-amazon2023_#{version}_linux_amd64.tar.gz" sha_filename: "#{repo}_#{version}_sha512-checksums.txt" filter: - "entity.system.os == 'linux'" - "entity.system.platform == 'amazon'" - - "entity.system.platform_version == '2022'" + - "entity.system.platform_version == '2023'" - "entity.system.arch == 'amd64'" - platform: "centos7" diff --git a/Dockerfile.amazon2022 b/Dockerfile.amazon2023 similarity index 88% rename from Dockerfile.amazon2022 rename to Dockerfile.amazon2023 index f9c9f6f..1e3aead 100644 --- a/Dockerfile.amazon2022 +++ b/Dockerfile.amazon2023 @@ -1,6 +1,6 @@ -FROM amazonlinux:2022 as builder +FROM amazonlinux:2023 as builder -ARG SENSU_GO_ASSET_NAME="monitoring-plugins-amazon2022" +ARG SENSU_GO_ASSET_NAME="monitoring-plugins-amazon2023" ARG SENSU_GO_ASSET_VERSION="2.7.0" ARG PLUGINS="check_http" diff --git a/README.md b/README.md index 1bea814..28b86ef 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ creating a Sensu Go Asset containing the C plugins. The goal of this project is to provide Sensu Go Assets for CentOS/Rocky/RHEL Linux (7, 8, 9), Debian Linux (9, 10, 11), Ubuntu Linux (18.04, 20.04, 22.04), -Amazon Linux (2, 2022), and Alpine Linux containing a good subset of the +Amazon Linux (2, 2023), and Alpine Linux containing a good subset of the plugins from the Monitoring Plugins project. ### Current Status diff --git a/build.sh b/build.sh index 2bdeb3a..847aacf 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ export SENSU_GO_ASSET_VERSION=$(git describe --abbrev=0 --tags) mkdir assets/ -for PLATFORM in alpine amazon1 amazon2 amazon2022 debian8 debian9 debian10 debian11 centos6 centos7 centos8 rocky9 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004 ubuntu2204 raspberrypi64; +for PLATFORM in alpine amazon2 amazon2023 debian8 debian9 debian10 debian11 centos6 centos7 centos8 rocky9 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004 ubuntu2204 raspberrypi64; do if [[ ${PLATFORM} == "raspberrypi64" ]]; then export ARCH="arm64" diff --git a/package-build.sh b/package-build.sh index 2de0cbb..0c2e038 100755 --- a/package-build.sh +++ b/package-build.sh @@ -18,7 +18,7 @@ export PLUGINS="check_disk,check_dns,check_http,check_load,check_log,check_ntp,c [[ -z "$GITHUB_TOKEN" ]] && { echo "GITHUB_TOKEN is empty, upload disabled" ; } [[ -z "$TRAVIS_REPO_SLUG" ]] && { echo "TRAVIS_REPO_SLUG is empty"; exit 1; } if [[ -z "$1" ]]; then - echo "Parameter 1, PLATFORMS is empty, using default set" ; platforms=( alpine amazon2 amazon2022 debian10 debian11 centos7 centos8 ubuntu1804 ubuntu2004 ubuntu2204 raspberrypi64 ); + echo "Parameter 1, PLATFORMS is empty, using default set" ; platforms=( alpine amazon2 amazon2023 debian10 debian11 centos7 centos8 ubuntu1804 ubuntu2004 ubuntu2204 raspberrypi64 ); else IFS=', ' read -r -a platforms <<< "$1" fi