From f978834ae76b942269df1072136812bfd0abcb62 Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Mon, 2 Oct 2023 12:23:00 -0400 Subject: [PATCH 1/9] #7 Updating paths in create_config() --- install_collector.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 3f711a1..55a799d 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -58,7 +58,7 @@ function update_td_agent_service_file() { } function create_config() { - local MAIN_CONF_FILE=$TEMP_DIR/td-agent.conf + local MAIN_CONF_FILE=$TEMP_DIR/fluentd.conf local USER_CONF_FILE=$TEMP_DIR/user.conf local SYSTEMD_CONF_FILE=$TEMP_DIR/systemd.conf local CONTAINERS_CONF_FILE=$TEMP_DIR/containers.conf @@ -74,7 +74,7 @@ function create_config() { path "$JOURNAL_DIR" @type local - path "/var/log/td-agent/fluentd-journald-cursor.json" + path "/var/log/fluentd/fluentd-journald-cursor.json" tag journal read_from_head true @@ -107,7 +107,7 @@ EOF path "$ZE_LOG_PATHS" format none path_key tailed_path - pos_file /var/log/td-agent/sys_logs.pos + pos_file /var/log/fluentd/sys_logs.pos tag node.logs.* read_from_head true @@ -124,7 +124,7 @@ $SYSTEMD_INCLUDE ze_host_tags "$ZE_HOST_TAGS" @type file - path /var/log/td-agent/buffer/out_zebrium.*.buffer + path /var/log/fluentd/buffer/out_zebrium.*.buffer chunk_limit_size "1MB" chunk_limit_records "4096" flush_mode "interval" @@ -140,7 +140,7 @@ EOF @type tail path "$ZE_USER_LOG_PATHS" path_key tailed_path - pos_file /var/log/td-agent/user_logs.pos + pos_file /var/log/fluentd/user_logs.pos @type none @@ -153,7 +153,7 @@ EOF @type tail path "/var/log/zebrium/container_logs/*.log" path_key tailed_path - pos_file /var/log/td-agent/containers_logs.pos + pos_file /var/log/fluentd/containers_logs.pos read_from_head true tag containers.* format json @@ -162,18 +162,18 @@ EOF EOF - $SUDO_CMD mkdir -p /etc/td-agent - $SUDO_CMD cp -f $MAIN_CONF_FILE /etc/td-agent/td-agent.conf - $SUDO_CMD mkdir -p /etc/td-agent/conf.d - $SUDO_CMD cp -f $USER_CONF_FILE /etc/td-agent/conf.d - $SUDO_CMD cp -f $CONTAINERS_CONF_FILE /etc/td-agent/conf.d + $SUDO_CMD mkdir -p /etc/fluent + $SUDO_CMD cp -f $MAIN_CONF_FILE /etc/fluent/fluentd.conf + $SUDO_CMD mkdir -p /etc/fluent/conf.d + $SUDO_CMD cp -f $USER_CONF_FILE /etc/fluent/conf.d + $SUDO_CMD cp -f $CONTAINERS_CONF_FILE /etc/fluentconf.d if [ -n "$SYSTEMD_INCLUDE" ]; then - $SUDO_CMD cp -f $SYSTEMD_CONF_FILE /etc/td-agent/conf.d + $SUDO_CMD cp -f $SYSTEMD_CONF_FILE /etc/fluent/conf.d fi } function is_log_collector_installed() { - egrep -q '@type[[:space:]]+zebrium' /etc/td-agent/td-agent.conf 2>/dev/null + egrep -q '@type[[:space:]]+zebrium' /etc/fluent/fluentd.conf 2>/dev/null } function has_systemd() { From 6a13976da07f5cb43d52aa550d7913baa1c5dfd7 Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Mon, 2 Oct 2023 12:54:48 -0400 Subject: [PATCH 2/9] #7 Updates to update_td_agent_service_file --- install_collector.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 55a799d..487275b 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -47,13 +47,13 @@ and we'll do our very best to help you solve your problem.\n\033[0m\n" } function update_td_agent_service_file() { - if ! grep -q 'ExecStartPre=' /lib/systemd/system/td-agent.service; then - log info "Add ExecStartPre script for td-agent service" - $SUDO_CMD sed -i '/^ExecStart=.*/i ExecStartPre=/opt/td-agent/bin/ruby /opt/zebrium/bin/update_fluentd_cfg.rb' /lib/systemd/system/td-agent.service + if ! grep -q 'ExecStartPre=' /lib/systemd/system/fluentd.service; then + log info "Add ExecStartPre script for fluentd service" + $SUDO_CMD sed -i '/^ExecStart=.*/i ExecStartPre=/opt/fluent/bin/ruby /opt/zebrium/bin/update_fluentd_cfg.rb' /lib/systemd/system/fluentd.service fi - if grep -q 'Environment=LD_PRELOAD=/opt/td-agent/lib/libjemalloc.so' /lib/systemd/system/td-agent.service; then + if grep -q 'Environment=LD_PRELOAD=/opt/fluent/lib/libjemalloc.so' /lib/systemd/system/fluentd.service; then log info "Disabling Malloc as a temp solution to memory leak crash" - $SUDO_CMD sed -i 's/^Environment=LD_PRELOAD=\/opt\/td-agent\/lib\/libjemalloc.so/#Environment=LD_PRELOAD=\/opt\/td-agent\/lib\/libjemalloc.so/' /lib/systemd/system/td-agent.service + $SUDO_CMD sed -i 's/^Environment=LD_PRELOAD=\/opt\/fluent\/lib\/libjemalloc.so/#Environment=LD_PRELOAD=\/opt\/fluent\/lib\/libjemalloc.so/' /lib/systemd/system/fluentd.service fi } From 80ae1496850b418f042127e3dfc907f8a482a9a3 Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Mon, 2 Oct 2023 13:12:58 -0400 Subject: [PATCH 3/9] #7 Refactored all remaining references to td-agent and paths to fluentd --- install_collector.sh | 90 ++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 487275b..77cdaf6 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -181,7 +181,7 @@ function has_systemd() { } function is_td_agent_service_installed() { - has_systemd && systemctl -a | grep -q td-agent + has_systemd && systemctl -a | grep -q fluentd } function do_uninstall() { @@ -189,18 +189,18 @@ function do_uninstall() { if has_systemd; then $SUDO_CMD systemctl stop zebrium-container-mon $SUDO_CMD systemctl disable zebrium-container-mon - $SUDO_CMD systemctl stop td-agent + $SUDO_CMD systemctl stop fluentd else - $SUDO_CMD /etc/init.d/td-agent stop + $SUDO_CMD /etc/init.d/fluentd stop fi log info "Removing packages" if [ "$OS" = "RedHat" -o "$OS" = "Amazon" ]; then - $SUDO_CMD yum remove -y td-agent + $SUDO_CMD yum remove -y fluentd elif [ "$OS" = "Debian" ]; then - $SUDO_CMD apt-get -y remove td-agent + $SUDO_CMD apt-get -y remove fluentd fi $SUDO_CMD rm -rf /etc/zebrium /opt/zebrium - $SUDO_CMD rm -rf /etc/zebrium /opt/zebrium /etc/td-agent + $SUDO_CMD rm -rf /etc/zebrium /opt/zebrium /etc/fluentd log info "Removed Zebrium log collector" } @@ -359,6 +359,10 @@ function main() { fi # Install the Fluentd, plugin and their depedencies + + # --------------------- + # RedHat Install Section + # --------------------- if [ $OS = "RedHat" ]; then DEFAULTS_DIR=/etc/sysconfig MAJOR_VERS="" @@ -376,10 +380,10 @@ function main() { elif (($MAJOR_VERS >20)); then MAJOR_VERS=7 fi - TD_AGENT_INSTALLED=$(yum list installed td-agent > /dev/null 2>&1 || echo "no") + TD_AGENT_INSTALLED=$(yum list installed fluentd > /dev/null 2>&1 || echo "no") if [ "$TD_AGENT_INSTALLED" == "no" ]; then # treasuredata releases are '7', '8' etc but releasever added by installed may not match - SH_FILE=install-redhat-td-agent4.sh + SH_FILE=install-redhat-fluent-package5.sh download_installer https://toolbelt.treasuredata.com/sh/$SH_FILE MAJOR_VERS=`echo $MAJOR_VERS | sed 's/\..*//'` sed -i -e "s/\\\\\$releasever/$MAJOR_VERS/" $SH_FILE @@ -389,13 +393,19 @@ function main() { $SUDO_CMD bash $SH_FILE && rm $SH_FILE fi fi + # --------------------- + # Amazon Linux Install Section + # --------------------- elif [ $OS = "Amazon" ]; then DEFAULTS_DIR=/etc/sysconfig - TD_AGENT_INSTALLED=$(yum list installed td-agent > /dev/null 2>&1 || echo "no") + TD_AGENT_INSTALLED=$(yum list installed fluentd > /dev/null 2>&1 || echo "no") AMZN_VERS=`uname -r | egrep -o 'amzn[[:digit:]]+' | sed 's/amzn//'` if [ "$TD_AGENT_INSTALLED" == "no" ]; then - download_and_run_installer https://toolbelt.treasuredata.com/sh/install-amazon${AMZN_VERS}-td-agent4.sh + download_and_run_installer https://toolbelt.treasuredata.com/sh/install-amazon${AMZN_VERS}-fluent-package5.sh fi + # --------------------- + # Debian/Ubuntu Install Section + # --------------------- elif [ $OS = "Debian" ]; then DEFAULTS_DIR=/etc/default IS_UBUNTU=`cat /etc/os-release | grep -i Ubuntu | wc -l` @@ -426,25 +436,25 @@ function main() { fi log info "Flavor of package: ${FLAVOR_STR} and code name: ${CODE_NAME} detected" - log info "Installing log collector from https://toolbelt.treasuredata.com/sh/install-${FLAVOR_STR}-${CODE_NAME}-td-agent4.sh" - download_and_run_installer https://toolbelt.treasuredata.com/sh/install-${FLAVOR_STR}-${CODE_NAME}-td-agent4.sh + log info "Installing log collector from https://toolbelt.treasuredata.com/sh/install-${FLAVOR_STR}-${CODE_NAME}-fluent-package5.sh" + download_and_run_installer https://toolbelt.treasuredata.com/sh/install-${FLAVOR_STR}-${CODE_NAME}-fluent-package5.sh else err_exit info "Your OS or distribution is not supported by this install script." fi - if ! command -v td-agent &> /dev/null; then - err_exit "td-agent installation failed" + if ! command -v fluentd &> /dev/null; then + err_exit "Fluentd installation failed" fi log info "Installing fluent-plugin-systemd" - $SUDO_CMD td-agent-gem install fluent-plugin-systemd + $SUDO_CMD fluent-gem install fluent-plugin-systemd log info "Installing docker-api" - $SUDO_CMD td-agent-gem install docker-api + $SUDO_CMD fluent-gem install docker-api log info "Uninstalling fluent-plugin-zebrium_output" - $SUDO_CMD td-agent-gem uninstall fluent-plugin-zebrium_output + $SUDO_CMD fluent-gem uninstall fluent-plugin-zebrium_output log info "Installing fluent-plugin-zebrium_output" - $SUDO_CMD td-agent-gem install fluent-plugin-systemd fluent-plugin-zebrium_output + $SUDO_CMD fluent-gem install fluent-plugin-systemd fluent-plugin-zebrium_output log info "Downloading zebrium-fluentd package" $DL_CMD https://github.com/zebrium/ze-fluentd-plugin/releases/latest/download/zebrium-fluentd.tar.gz @@ -454,18 +464,18 @@ function main() { $SUDO_CMD rm zebrium-fluentd.tar.gz - TD_DEFAULT_FILE=$DEFAULTS_DIR/td-agent + TD_DEFAULT_FILE=$DEFAULTS_DIR/fluent if [ ! -e $TD_DEFAULT_FILE ]; then $SUDO_CMD sh -c "echo TD_AGENT_USER=root >> $TD_DEFAULT_FILE" $SUDO_CMD sh -c "echo TD_AGENT_GROUP=root >> $TD_DEFAULT_FILE" fi - if [ -f /var/log/td-agent/td-agent.log ]; then - $SUDO_CMD chown root:root /var/log/td-agent/td-agent.log + if [ -f /var/log/fluent/fluentd.log ]; then + $SUDO_CMD chown root:root /var/log/fluent/fluentd.log fi if has_systemd; then - $SUDO_CMD mkdir -p /etc/systemd/system/td-agent.service.d - $SUDO_CMD sh -c '/bin/echo -e "[Service]\nUser=root\nGroup=root\n" > /etc/systemd/system/td-agent.service.d/override.conf' + $SUDO_CMD mkdir -p /etc/systemd/system/fluentd.service.d + $SUDO_CMD sh -c '/bin/echo -e "[Service]\nUser=root\nGroup=root\n" > /etc/systemd/system/fluentd.service.d/override.conf' update_td_agent_service_file $SUDO_CMD cp -f /opt/zebrium/etc/zebrium-container-mon.service /etc/systemd/system/ @@ -476,12 +486,12 @@ function main() { fi # Set the configuration - if egrep -q '@type[[:space:]]+zebrium' /etc/td-agent/td-agent.conf 2>/dev/null && [ $OVERWRITE_CONFIG -eq 0 ]; then - log info "Keeping old /etc/td-agent/td-agent.conf configuration file" + if egrep -q '@type[[:space:]]+zebrium' /etc/fluent/fluentd.conf 2>/dev/null && [ $OVERWRITE_CONFIG -eq 0 ]; then + log info "Keeping old /etc/fluent/fluentd.conf configuration file" else - if [ -e /etc/td-agent/td-agent.conf ]; then - log info "Saving current /etc/td-agent/td-agent.conf to /etc/td-agent/td-agent.backup" - $SUDO_CMD mv -f /etc/td-agent/td-agent.conf /etc/td-agent/td-agent.backup + if [ -e /etc/fluent/fluentd.conf ]; then + log info "Saving current /etc/fluent/fluentd.conf to /etc/fluent/fluentd.backup" + $SUDO_CMD mv -f /etc/fluent/fluentd.conf /etc/fluent/fluentd.backup fi log info "Creating new fluentd config and adding API server URL and API key" if [ -e /var/log/journal ]; then @@ -494,11 +504,11 @@ function main() { create_config fi - restart_cmd="$SUDO_CMD /etc/init.d/td-agent restart" + restart_cmd="$SUDO_CMD /etc/init.d/fluentd restart" if has_systemd; then - restart_cmd="$SUDO_CMD systemctl restart td-agent" + restart_cmd="$SUDO_CMD systemctl restart fluentd" if ! is_td_agent_service_installed; then - $SUDO_CMD systemctl enable td-agent + $SUDO_CMD systemctl enable fluentd fi fi @@ -510,7 +520,7 @@ Zebrium Log Collector is not started. To start Log Collector manually, run: sudo systemctl start zebrium-container-mon - sudo systemctl start td-agent + sudo systemctl start fluentd \033[0m" @@ -520,7 +530,7 @@ To start Log Collector manually, run: Zebrium Log Collector is not started. To start Log Collector manually, run: - sudo /etc/init.d/td-agent start + sudo /etc/init.d/fluentd start \033[0m" fi @@ -532,7 +542,7 @@ To start Log Collector manually, run: fi log info "Starting Zebrium log collector..." - # We have seen systemd returns error on first start of td-agent, so we ignore error and just check + # We have seen systemd returns error on first start of fluentd, so we ignore error and just check # status set +e trap - ERR @@ -542,7 +552,7 @@ To start Log Collector manually, run: if is_td_agent_service_installed; then while : ; do log info "Waiting for log collector to come up ..." - systemctl status td-agent > /dev/null && break + systemctl status fluentd > /dev/null && break sleep 5 done printf "\033[32m @@ -552,19 +562,19 @@ Zebrium Log Collector is running. If you ever want to stop the Log Collector, run: sudo systemctl stop zebrium-container-mon - sudo systemctl stop td-agent + sudo systemctl stop fluentd And to run it again run: sudo systemctl start zebrium-container-mon - sudo systemctl start td-agent + sudo systemctl start fluentd \033[0m" else while : ; do log info "Waiting for log collector to come up ..." - $SUDO_CMD /etc/init.d/td-agent status && break + $SUDO_CMD /etc/init.d/fluentd status && break sleep 5 done printf "\033[32m @@ -573,11 +583,11 @@ Zebrium Log Collector is running. If you ever want to stop the Log Collector, run: - sudo /etc/init.d/td-agent stop + sudo /etc/init.d/fluentd stop And to run it again run: - sudo /etc/init.d/td-agent start + sudo /etc/init.d/fluentd start \033[0m" fi From d7587e95ba50259f784b91e017661c32d63ea61a Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Mon, 2 Oct 2023 13:30:28 -0400 Subject: [PATCH 4/9] #7 fixed logging to use single path to /var/log/fluent --- install_collector.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 77cdaf6..788f5e7 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -74,7 +74,7 @@ function create_config() { path "$JOURNAL_DIR" @type local - path "/var/log/fluentd/fluentd-journald-cursor.json" + path "/var/log/fluent/fluentd-journald-cursor.json" tag journal read_from_head true @@ -107,7 +107,7 @@ EOF path "$ZE_LOG_PATHS" format none path_key tailed_path - pos_file /var/log/fluentd/sys_logs.pos + pos_file /var/log/fluent/sys_logs.pos tag node.logs.* read_from_head true @@ -124,7 +124,7 @@ $SYSTEMD_INCLUDE ze_host_tags "$ZE_HOST_TAGS" @type file - path /var/log/fluentd/buffer/out_zebrium.*.buffer + path /var/log/fluent/buffer/out_zebrium.*.buffer chunk_limit_size "1MB" chunk_limit_records "4096" flush_mode "interval" @@ -140,7 +140,7 @@ EOF @type tail path "$ZE_USER_LOG_PATHS" path_key tailed_path - pos_file /var/log/fluentd/user_logs.pos + pos_file /var/log/fluent/user_logs.pos @type none @@ -153,7 +153,7 @@ EOF @type tail path "/var/log/zebrium/container_logs/*.log" path_key tailed_path - pos_file /var/log/fluentd/containers_logs.pos + pos_file /var/log/fluent/containers_logs.pos read_from_head true tag containers.* format json From 3feea2eb493197134ffddbd742a53f0b4b632960 Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Thu, 5 Oct 2023 11:53:50 -0400 Subject: [PATCH 5/9] #7 fixed amazon linux identification issue --- install_collector.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 788f5e7..5a671fe 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -329,7 +329,6 @@ function main() { elif [ "$DISTRIBUTION" == "Amazon" ]; then OS="Amazon" fi - # Root user detection if [ $(echo "$UID") = "0" -o "$SUDO_DISABLED" = "1" ]; then log info "SUDO_DISABLED is set to 1, must be running as the root user" @@ -399,9 +398,25 @@ function main() { elif [ $OS = "Amazon" ]; then DEFAULTS_DIR=/etc/sysconfig TD_AGENT_INSTALLED=$(yum list installed fluentd > /dev/null 2>&1 || echo "no") - AMZN_VERS=`uname -r | egrep -o 'amzn[[:digit:]]+' | sed 's/amzn//'` + # OLD CHECK: AMZN_VERS=`uname -r | egrep -o 'amzn[[:digit:]]+' | sed 's/amzn//'` + + # NEW CHECK: Check if /etc/os-release file exists + if [ -f /etc/os-release ]; then + # Use grep to search for specific strings in the os-release file + if grep -q 'Amazon Linux 2' /etc/os-release; then + AMZN_VERS="amazon2" + elif grep -q 'Amazon Linux 2023' /etc/os-release; then + AMZN_VERS="amazon2023" + else + log error "Unknown Amazon Linux version" + fi + else + log error "The /etc/os-release file does not exist. It should if this is an Amazon Linux box, so not sure how we got here." + fi + if [ "$TD_AGENT_INSTALLED" == "no" ]; then - download_and_run_installer https://toolbelt.treasuredata.com/sh/install-amazon${AMZN_VERS}-fluent-package5.sh + echo "download_and_run_installer https://toolbelt.treasuredata.com/sh/install-${AMZN_VERS}-fluent-package5.sh" + download_and_run_installer https://toolbelt.treasuredata.com/sh/install-${AMZN_VERS}-fluent-package5.sh fi # --------------------- # Debian/Ubuntu Install Section From 1fcad97ec8bdac3490be6e05afe1cc0b8e06253d Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Thu, 5 Oct 2023 14:55:06 -0400 Subject: [PATCH 6/9] #7 fixed issue with installing on AL2023 --- install_collector.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install_collector.sh b/install_collector.sh index 5a671fe..c765781 100755 --- a/install_collector.sh +++ b/install_collector.sh @@ -403,10 +403,10 @@ function main() { # NEW CHECK: Check if /etc/os-release file exists if [ -f /etc/os-release ]; then # Use grep to search for specific strings in the os-release file - if grep -q 'Amazon Linux 2' /etc/os-release; then - AMZN_VERS="amazon2" - elif grep -q 'Amazon Linux 2023' /etc/os-release; then + if grep -q 'Amazon Linux 2023' /etc/os-release; then AMZN_VERS="amazon2023" + elif grep -q 'Amazon Linux 2' /etc/os-release; then + AMZN_VERS="amazon2" else log error "Unknown Amazon Linux version" fi From 3f6755b85ef0d23e93f82744cee847f847f75481 Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Thu, 12 Oct 2023 14:18:10 -0400 Subject: [PATCH 7/9] #7 fixed test workflow to remove eol OS versions --- .github/workflows/test.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dde34f6..4d2f464 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,8 +1,9 @@ name: test on: + push: pull_request: - + permissions: contents: read @@ -14,12 +15,12 @@ jobs: os: - ubuntu:jammy - ubuntu:focal - - ubuntu:bionic - debian:bullseye - - debian:buster - oraclelinux:9 - oraclelinux:8 - oraclelinux:7 + - amazonlinux:2 + - amazonlinux:2023 runs-on: ubuntu-latest container: image: ${{ matrix.os }} @@ -39,7 +40,7 @@ jobs: apt-get -qq update apt-get -qq install -y apt-transport-https - name: Install Dependencies RPM - if: ${{ contains( matrix.os, 'oracle') || contains(matrix.os, 'redhat' ) }} + if: ${{ contains( matrix.os, 'oracle') || contains(matrix.os, 'redhat' ) || contains(matrix.os, 'amazon' ) }} run: | yum -q update -y yum -q install -y git sudo From 6bb59f4a7d60a1f6eab7705c4351f6946f0427ab Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Thu, 12 Oct 2023 14:20:04 -0400 Subject: [PATCH 8/9] #7 removed extra push check from test --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4d2f464..c76d107 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,7 +1,6 @@ name: test on: - push: pull_request: permissions: From ee100160e1b89c0130a37b8624a38a246676fb1b Mon Sep 17 00:00:00 2001 From: Seamus Clark Date: Thu, 12 Oct 2023 14:23:08 -0400 Subject: [PATCH 9/9] #7 added step to install tar on AL systems --- .github/workflows/test.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c76d107..aab73da 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,10 +39,16 @@ jobs: apt-get -qq update apt-get -qq install -y apt-transport-https - name: Install Dependencies RPM - if: ${{ contains( matrix.os, 'oracle') || contains(matrix.os, 'redhat' ) || contains(matrix.os, 'amazon' ) }} + if: ${{ contains( matrix.os, 'oracle') || contains(matrix.os, 'redhat' )}} run: | yum -q update -y yum -q install -y git sudo + - name: Install Dependencies RPM Amazon + if: ${{ contains(matrix.os, 'amazon' ) }} + run: | + yum -q update -y + yum -q install -y git sudo tar + - uses: actions/checkout@v3 - run: git config --system --add safe.directory $GITHUB_WORKSPACE - run: ./install_collector.sh \ No newline at end of file