diff --git a/.github/workflows/integrationTest.yml b/.github/workflows/integrationTest.yml index 0b893a7983..bfc147e4b7 100644 --- a/.github/workflows/integrationTest.yml +++ b/.github/workflows/integrationTest.yml @@ -36,7 +36,6 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - submodules: 'true' # Set up building environment, patch the dev repo code on dispatch events. - name: Set up Go 1.x @@ -81,6 +80,7 @@ jobs: echo "${GPG_PRIVATE_KEY}" | gpg --batch --import - for f in $(find build/bin/); do if [ ! -d $f ]; then echo "Signing file $f" && echo "${PASSPHRASE}" | gpg --detach-sign --passphrase-fd 0 --batch --default-key "${GPG_KEY_NAME}" $f ; fi ; done + - name: Upload to s3 if: steps.cached_binaries.outputs.cache-hit != 'true' run: aws s3 cp build/bin s3://${S3_INTEGRATION_BUCKET}/integration-test/binary/${{ github.sha }} --recursive @@ -689,4 +689,4 @@ jobs: max_attempts: 3 timeout_minutes: 8 retry_wait_seconds: 5 - command: cd integration/terraform/ec2/linux && terraform destroy --auto-approve \ No newline at end of file + command: cd integration/terraform/ec2/linux && terraform destroy --auto-approve diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3698fcacf7..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "aws-otel-collector"] - path = aws-otel-collector - url = ../../aws-observability/aws-otel-collector.git diff --git a/AOC_GIT_SHA b/AOC_GIT_SHA deleted file mode 100644 index 2242701308..0000000000 --- a/AOC_GIT_SHA +++ /dev/null @@ -1 +0,0 @@ -86d542ef6c9afbab2f5fc94d52a1a2e1f7b839c2 diff --git a/Makefile b/Makefile index 7ae71e3d70..ffc6fd727d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ export BASE_SPACE=$(shell pwd) export BUILD_SPACE=$(BASE_SPACE)/build -export AOC_BASE_SPACE=$(BASE_SPACE)/aws-otel-collector -export AOC_BUILD_SPACE=$(AOC_BASE_SPACE)/build VERSION = $(shell echo `git describe --tag --dirty``git status --porcelain 2>/dev/null| grep -q "^??" &&echo '-untracked'`) VERSION := $(shell echo ${VERSION} | sed -e "s/^v//") @@ -28,20 +26,6 @@ DARWIN_BUILD = GO111MODULE=on GOOS=darwin GOARCH=amd64 go build -ldflags="${LDFL IMAGE = amazon/cloudwatch-agent:$(VERSION) DOCKER_BUILD_FROM_SOURCE = docker build -t $(IMAGE) -f ./amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile -AOC_IMPORT_PATH=github.com/aws-observability/aws-otel-collector -AOC_GIT_SHA = $(shell cd $(AOC_BASE_SPACE) && git rev-parse HEAD) -AOC_LDFLAGS = -s -w -X $(AOC_IMPORT_PATH)/tools/version.GitHash=$(AOC_GIT_SHA) -AOC_LDFLAGS += -X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=cwagent-otel-collector -AOC_LDFLAGS += -X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter.collectorDistribution=cwagent-otel-collector -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/tools/version.Version=$(VERSION) -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/tools/version.Date=$(BUILD) -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/userutils.defaultUser=cwagent -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/userutils.defaultInstallPath=/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/ -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/logger.UnixLogPath=/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs/cwagent-otel-collector.log -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/logger.WindowsLogPath=C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\CWAgentOtelCollector\\Logs\\cwagent-otel-collector.log -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/extraconfig.unixExtraConfigPath=/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/extracfg.txt -AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/extraconfig.windowsExtraConfigPath=C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\CWAgentOtelCollector\\extracfg.txt - CW_AGENT_IMPORT_PATH=https://github.com/aws/amazon-cloudwatch-agent.git ALL_SRC := $(shell find . -name '*.go' -type f | sort) TOOLS_BIN_DIR := $(abspath ./build/tools) @@ -55,7 +39,7 @@ release: clean test build package-rpm package-deb package-win package-darwin nightly-release: release -build: check_secrets cwagent-otel-collector amazon-cloudwatch-agent config-translator start-amazon-cloudwatch-agent amazon-cloudwatch-agent-config-wizard config-downloader +build: check_secrets amazon-cloudwatch-agent config-translator start-amazon-cloudwatch-agent amazon-cloudwatch-agent-config-wizard config-downloader check_secrets:: if grep --exclude-dir=build --exclude-dir=vendor -exclude=integration/msi/tools/amazon-cloudwatch-agent.wxs -E "(A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}|(\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')?" -Rn .; then echo "check_secrets failed"; exit 1; fi; @@ -76,17 +60,6 @@ amazon-cloudwatch-agent: copy-version-file $(WIN_BUILD)/amazon-cloudwatch-agent.exe github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent $(DARWIN_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent -# Save AWS OTEL Collector GIT SHA to a file so it can be easily referenced from outside this repository. -update-submodule: - git submodule update --init - echo "$(AOC_GIT_SHA)" > AOC_GIT_SHA - -cwagent-otel-collector: update-submodule - @echo Building aws-otel-collector - cd $(AOC_BASE_SPACE) && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${AOC_LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_amd64/cwagent-otel-collector $(AOC_IMPORT_PATH)/cmd/awscollector - cd $(AOC_BASE_SPACE) && CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${AOC_LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_arm64/cwagent-otel-collector $(AOC_IMPORT_PATH)/cmd/awscollector - cd $(AOC_BASE_SPACE) && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${AOC_LDFLAGS}" -o $(BUILD_SPACE)/bin/windows_amd64/cwagent-otel-collector.exe $(AOC_IMPORT_PATH)/cmd/awscollector - config-translator: copy-version-file @echo Building config-translator $(LINUX_AMD64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator @@ -156,9 +129,7 @@ package-prepare-rpm: # amd64 rpm mkdir -p $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/linux_amd64/* $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/dependencies/amazon-cloudwatch-agent-ctl $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ @@ -167,16 +138,11 @@ package-prepare-rpm: cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.conf $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.spec $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/translator/config/schema.json $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/amazon-cloudwatch-agent-schema.json - cp $(BASE_SPACE)/packaging/dependencies/cwagent-otel-collector.service $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/packaging/linux/cwagent-otel-collector.conf $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/predefined-config-data # arm64 rpm mkdir -p $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/linux_arm64/* $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/dependencies/amazon-cloudwatch-agent-ctl $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ @@ -185,18 +151,13 @@ package-prepare-rpm: cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.conf $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.spec $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/translator/config/schema.json $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/amazon-cloudwatch-agent-schema.json - cp $(BASE_SPACE)/packaging/dependencies/cwagent-otel-collector.service $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/packaging/linux/cwagent-otel-collector.conf $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg/predefined-config-data cp -rf $(BASE_SPACE)/Tools $(BUILD_SPACE)/ package-prepare-deb: # amd64 deb mkdir -p $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/linux_amd64/* $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/dependencies/amazon-cloudwatch-agent-ctl $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ @@ -204,16 +165,11 @@ package-prepare-deb: cp $(BASE_SPACE)/cfg/commonconfig/common-config.toml $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.conf $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/translator/config/schema.json $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/amazon-cloudwatch-agent-schema.json - cp $(BASE_SPACE)/packaging/dependencies/cwagent-otel-collector.service $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/packaging/linux/cwagent-otel-collector.conf $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/linux/amd64/deb/amazon-cloudwatch-agent-pre-pkg/predefined-config-data # arm64 deb mkdir -p $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/linux_arm64/* $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/dependencies/amazon-cloudwatch-agent-ctl $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ @@ -221,9 +177,7 @@ package-prepare-deb: cp $(BASE_SPACE)/cfg/commonconfig/common-config.toml $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.conf $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/translator/config/schema.json $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/amazon-cloudwatch-agent-schema.json - cp $(BASE_SPACE)/packaging/dependencies/cwagent-otel-collector.service $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/packaging/linux/cwagent-otel-collector.conf $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/linux/arm64/deb/amazon-cloudwatch-agent-pre-pkg/predefined-config-data + cp -rf $(BASE_SPACE)/Tools $(BUILD_SPACE)/ cp -rf $(BASE_SPACE)/packaging $(BUILD_SPACE)/ @@ -231,9 +185,7 @@ package-prepare-win-zip: # amd64 win mkdir -p $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/windows_amd64/* $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/cfg/commonconfig/common-config.toml $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ @@ -241,16 +193,13 @@ package-prepare-win-zip: cp ${BASE_SPACE}/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ cp ${BASE_SPACE}/packaging/windows/install.ps1 $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ cp ${BASE_SPACE}/packaging/windows/uninstall.ps1 $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/windows/amd64/zip/amazon-cloudwatch-agent-pre-pkg/predefined-config-data cp -rf $(BASE_SPACE)/Tools $(BUILD_SPACE)/ package-prepare-darwin-tar: # amd64 darwin mkdir -p $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg cp $(BUILD_SPACE)/bin/darwin_amd64/* $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/LICENSE $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/NOTICE $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/licensing/THIRD-PARTY-LICENSES $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ + cp $(BASE_SPACE)/licensing/* $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/RELEASE_NOTES $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ cp $(BUILD_SPACE)/bin/CWAGENT_VERSION $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/cfg/commonconfig/common-config.toml $(BUILD_SPACE)/private/darwin/amd64/tar/amazon-cloudwatch-agent-pre-pkg/ diff --git a/README.md b/README.md index dad3cafd99..f5fa58b29f 100644 --- a/README.md +++ b/README.md @@ -123,14 +123,12 @@ Nightly s3 release are not production ready and should be used at own risk * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/linux_{amd_64/arm64}/amazon-cloudwatch-agent-config-wizard * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/linux_{amd_64/arm64}/config-downloader * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/linux_{amd_64/arm64}/config-translator - * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/linux_{amd_64/arm64}/cwagent-otel-collector * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/linux_{amd_64/arm64}/start-amazon-cloudwatch-agent 1. Windows * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/amazon-cloudwatch-agent-config-wizard.exe * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/amazon-cloudwatch-agent.exe * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/config-downloader.exe * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/config-translator.exe - * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/cwagent-otel-collector.exe * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/windows_amd64/start-amazon-cloudwatch-agent.exe 1. Mac * https://amazoncloudwatch-agent.s3.amazonaws.com/nightly-build/latest/darwin_amd64/amazon-cloudwatch-agent diff --git a/THIRD-PARTY b/THIRD-PARTY index 0b07c6b2fd..bbd99ff166 100644 --- a/THIRD-PARTY +++ b/THIRD-PARTY @@ -202,8 +202,6 @@ END OF TERMS AND CONDITIONS https://github.com/googleapis/google-cloud-go ** contrib.go.opencensus.io/exporter/ocagent; version v0.6.0 -- https://github.com/census-ecosystem/opencensus-go-exporter-ocagent -** github.com/aws-observability/aws-otel-collector; version 0.6.0 -- -https://github.com/aws-observability/aws-otel-collector ** github.com/aws/aws-lambda-go; version v1.13.3 -- https://github.com/aws/aws-lambda-go ** github.com/aws/aws-sdk-go; version 1.30.15 -- @@ -620,7 +618,7 @@ limitations under the License. Copyright 2018 Google LLC * For contrib.go.opencensus.io/exporter/ocagent see also this required NOTICE: Copyright 2018, OpenCensus Authors -* For github.com/aws-observability/aws-otel-collector see also this required + NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * For github.com/aws/aws-lambda-go see also this required NOTICE: diff --git a/Tools/src/create_deb.sh b/Tools/src/create_deb.sh index 752111426b..86c3c452ef 100755 --- a/Tools/src/create_deb.sh +++ b/Tools/src/create_deb.sh @@ -14,9 +14,6 @@ mkdir -p ${BUILD_ROOT}/bin mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/logs mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/var mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d -mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs -mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var -mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.d mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin mkdir -p ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/doc mkdir -p ${BUILD_ROOT}/etc/init @@ -29,19 +26,15 @@ cp ${PREPKGPATH}/THIRD-PARTY-LICENSES ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-ag cp ${PREPKGPATH}/RELEASE_NOTES ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/CWAGENT_VERSION ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/amazon-cloudwatch-agent ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ -cp ${PREPKGPATH}/cwagent-otel-collector ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/amazon-cloudwatch-agent-ctl ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/amazon-cloudwatch-agent.service ${BUILD_ROOT}/etc/systemd/system/ -cp ${PREPKGPATH}/cwagent-otel-collector.service ${BUILD_ROOT}/etc/systemd/system/ cp ${PREPKGPATH}/config-translator ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/config-downloader ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/amazon-cloudwatch-agent-config-wizard ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/start-amazon-cloudwatch-agent ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/ cp ${PREPKGPATH}/common-config.toml ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/etc/ cp ${PREPKGPATH}/amazon-cloudwatch-agent.conf ${BUILD_ROOT}/etc/init/ -cp ${PREPKGPATH}/cwagent-otel-collector.conf ${BUILD_ROOT}/etc/init/ cp ${PREPKGPATH}/amazon-cloudwatch-agent-schema.json ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/doc/ -cp ${PREPKGPATH}/predefined-config-data ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var/.predefined-config-data ############################# create the symbolic links here to make them managed by dpkg # bin @@ -50,24 +43,19 @@ ln -f -s /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl ${BUIL # etc mkdir -p ${BUILD_ROOT}/etc/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/etc ${BUILD_ROOT}/etc/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc ${BUILD_ROOT}/etc/amazon/cwagent-otel-collector # log mkdir -p ${BUILD_ROOT}/var/log/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/logs ${BUILD_ROOT}/var/log/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs ${BUILD_ROOT}/var/log/amazon/cwagent-otel-collector # pid mkdir -p ${BUILD_ROOT}/var/run/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/var ${BUILD_ROOT}/var/run/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var ${BUILD_ROOT}/var/run/amazon/cwagent-otel-collector cp ${BUILD_SPACE}/packaging/debian/conffiles ${BUILD_ROOT}/ cp ${BUILD_SPACE}/packaging/debian/preinst ${BUILD_ROOT}/ cp ${BUILD_SPACE}/packaging/debian/prerm ${BUILD_ROOT}/ -cp ${BUILD_SPACE}/packaging/debian/postinst ${BUILD_ROOT}/ cp ${BUILD_SPACE}/packaging/debian/debian-binary ${BUILD_ROOT}/ chmod ug+rx ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent -chmod ug+rx ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector chmod ug+rx ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl chmod ug+rx ${BUILD_ROOT}/opt/aws/amazon-cloudwatch-agent/bin/start-amazon-cloudwatch-agent @@ -90,7 +78,7 @@ cd ${BUILD_ROOT} tar czf data.tar.gz opt etc usr var --owner=0 --group=0 cd ~- cd ${BUILD_ROOT} -tar czf control.tar.gz control conffiles preinst prerm postinst --owner=0 --group=0 +tar czf control.tar.gz control conffiles preinst prerm --owner=0 --group=0 cd ~- echo "Creating the debian package" diff --git a/Tools/src/create_rpm.sh b/Tools/src/create_rpm.sh index 20fede794e..4d1f85d41a 100755 --- a/Tools/src/create_rpm.sh +++ b/Tools/src/create_rpm.sh @@ -6,9 +6,11 @@ set -e SPEC_FILE="${PREPKGPATH}/amazon-cloudwatch-agent.spec" BUILD_ROOT="${BUILD_SPACE}/private/linux_${ARCH}/rpm-build" +AGENT_VERSION_WITHOUT_SED=$(cat ${BUILD_SPACE}/bin/CWAGENT_VERSION) AGENT_VERSION=$(cat ${PREPKGPATH}/CWAGENT_VERSION | sed -e "s/-/+/g") -echo "BUILD_SPACE: ${BUILD_SPACE} agent_version: ${AGENT_VERSION} pre-package location:${PREPKGPATH}" +echo "BUILD_SPACE: ${BUILD_SPACE} agent: ${AGENT_VERSION_WITHOUT_SED} agent_version: ${AGENT_VERSION} pre-package location:${PREPKGPATH}" + echo "Creating rpm-build workspace" @@ -17,9 +19,6 @@ mkdir -p ${BUILD_ROOT}/{RPMS,SRPMS,BUILD,SOURCES,SPECS,BUILDROOT} mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/logs mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/var mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d -mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs -mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var -mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.d mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin mkdir -p ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/doc mkdir -p ${BUILD_ROOT}/SOURCES/etc/init @@ -42,15 +41,10 @@ cp ${PREPKGPATH}/start-amazon-cloudwatch-agent ${BUILD_ROOT}/SOURCES/opt/aws/ama cp ${PREPKGPATH}/common-config.toml ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/etc/ cp ${PREPKGPATH}/amazon-cloudwatch-agent.conf ${BUILD_ROOT}/SOURCES/etc/init/amazon-cloudwatch-agent.conf cp ${PREPKGPATH}/amazon-cloudwatch-agent-schema.json ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/doc/ -cp ${PREPKGPATH}/cwagent-otel-collector ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin/ -cp ${PREPKGPATH}/cwagent-otel-collector.service ${BUILD_ROOT}/SOURCES/etc/systemd/system/ -cp ${PREPKGPATH}/cwagent-otel-collector.conf ${BUILD_ROOT}/SOURCES/etc/init/ -cp ${PREPKGPATH}/predefined-config-data ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var/.predefined-config-data chmod ug+rx ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent chmod ug+rx ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl chmod ug+rx ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin/start-amazon-cloudwatch-agent -chmod ug+rx ${BUILD_ROOT}/SOURCES/opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector tar -zcvf ${BUILD_ROOT}/SOURCES/amazon-cloudwatch-agent.tar.gz -C ${BUILD_ROOT}/SOURCES opt etc rm -rf ${BUILD_ROOT}/SOURCES/opt ${BUILD_ROOT}/SOURCES/etc diff --git a/Tools/src/create_win.sh b/Tools/src/create_win.sh index c171633089..5a20f97b5d 100755 --- a/Tools/src/create_win.sh +++ b/Tools/src/create_win.sh @@ -20,7 +20,6 @@ cp ${PREPKGPATH}/THIRD-PARTY-LICENSES ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/RELEASE_NOTES ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/CWAGENT_VERSION ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/amazon-cloudwatch-agent.exe ${BUILD_ROOT}/amazon-cloudwatch-agent/ -cp ${PREPKGPATH}/cwagent-otel-collector.exe ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/amazon-cloudwatch-agent-ctl.ps1 ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/install.ps1 ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/uninstall.ps1 ${BUILD_ROOT}/amazon-cloudwatch-agent/ @@ -30,7 +29,6 @@ cp ${PREPKGPATH}/amazon-cloudwatch-agent-config-wizard.exe ${BUILD_ROOT}/amazon- cp ${PREPKGPATH}/start-amazon-cloudwatch-agent.exe ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/common-config.toml ${BUILD_ROOT}/amazon-cloudwatch-agent/ cp ${PREPKGPATH}/amazon-cloudwatch-agent-schema.json ${BUILD_ROOT}/amazon-cloudwatch-agent/ -cp ${PREPKGPATH}/predefined-config-data ${BUILD_ROOT}/amazon-cloudwatch-agent/ echo "Constructing the zip package" diff --git a/aws-otel-collector b/aws-otel-collector deleted file mode 160000 index 86d542ef6c..0000000000 --- a/aws-otel-collector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86d542ef6c9afbab2f5fc94d52a1a2e1f7b839c2 diff --git a/integration/msi/tools/amazon-cloudwatch-agent.wxs b/integration/msi/tools/amazon-cloudwatch-agent.wxs index b06749364a..9995dca640 100644 --- a/integration/msi/tools/amazon-cloudwatch-agent.wxs +++ b/integration/msi/tools/amazon-cloudwatch-agent.wxs @@ -47,10 +47,6 @@ - - - - @@ -67,10 +63,6 @@ - - - - @@ -104,33 +96,6 @@ Wait="yes" /> - - - - - - - - - @@ -181,24 +146,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/integration/test/sanity/resources/verifyLinuxCtlScript.sh b/integration/test/sanity/resources/verifyLinuxCtlScript.sh index 2c324e3645..3900e18a2a 100755 --- a/integration/test/sanity/resources/verifyLinuxCtlScript.sh +++ b/integration/test/sanity/resources/verifyLinuxCtlScript.sh @@ -15,12 +15,6 @@ assertStatus() { cwa_config_status) grepKey="\"configstatus\"" ;; - cwoc_running_status) - grepKey="\"cwoc_status\"" - ;; - cwoc_config_status) - grepKey="\"cwoc_configstatus\"" - ;; *) echo "Invalid Key To Check: ${keyToCheck}" >&2 exit 1 @@ -39,95 +33,56 @@ assertStatus() { # init step=0 -aoc_user=$(cat /etc/passwd | grep aoc) -if [ "${aoc_user}" = "" ]; then - echo 'aoc:x:995:991:AOC Agent:/home/aoc:/sbin/nologin' | sudo tee -a /etc/passwd -fi -/usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -c all -o all +/usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -c all /usr/bin/amazon-cloudwatch-agent-ctl -a stop step=1 /usr/bin/amazon-cloudwatch-agent-ctl -a status assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "stopped" assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "not configured" step=2 /usr/bin/amazon-cloudwatch-agent-ctl -a start assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "stopped" assertStatus "cwa_config_status" "configured" -assertStatus "cwoc_config_status" "not configured" step=3 -/usr/bin/amazon-cloudwatch-agent-ctl -a fetch-config -o default -s /usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -c default -s assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "running" assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "configured" step=4 -/usr/bin/amazon-cloudwatch-agent-ctl -a fetch-config -c default -o invalid -s +/usr/bin/amazon-cloudwatch-agent-ctl -a fetch-config -c default -s assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "running" assertStatus "cwa_config_status" "configured" -assertStatus "cwoc_config_status" "configured" step=5 /usr/bin/amazon-cloudwatch-agent-ctl -a prep-restart /usr/bin/amazon-cloudwatch-agent-ctl -a stop assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "stopped" assertStatus "cwa_config_status" "configured" -assertStatus "cwoc_config_status" "configured" step=6 /usr/bin/amazon-cloudwatch-agent-ctl -a cond-restart assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "running" assertStatus "cwa_config_status" "configured" -assertStatus "cwoc_config_status" "configured" step=7 /usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -c default -s assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "running" assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "configured" step=8 -/usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -o default -s -assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "stopped" -assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "not configured" - -step=9 -/usr/bin/amazon-cloudwatch-agent-ctl -a append-config -c default -o default -s +/usr/bin/amazon-cloudwatch-agent-ctl -a append-config -c default -s assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "stopped" assertStatus "cwa_config_status" "configured" -assertStatus "cwoc_config_status" "not configured" -step=10 +step=9 /usr/bin/amazon-cloudwatch-agent-ctl -a remove-config -c all assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "stopped" -assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "not configured" - -step=11 -/usr/bin/amazon-cloudwatch-agent-ctl -a fetch-config -o default -s -assertStatus "cwa_running_status" "running" -assertStatus "cwoc_running_status" "running" assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "configured" -step=12 +step=10 /usr/bin/amazon-cloudwatch-agent-ctl -a stop assertStatus "cwa_running_status" "stopped" -assertStatus "cwoc_running_status" "stopped" assertStatus "cwa_config_status" "not configured" -assertStatus "cwoc_config_status" "configured" diff --git a/licensing/THIRD-PARTY-LICENSES b/licensing/THIRD-PARTY-LICENSES index 0b07c6b2fd..389742d02f 100644 --- a/licensing/THIRD-PARTY-LICENSES +++ b/licensing/THIRD-PARTY-LICENSES @@ -202,8 +202,6 @@ END OF TERMS AND CONDITIONS https://github.com/googleapis/google-cloud-go ** contrib.go.opencensus.io/exporter/ocagent; version v0.6.0 -- https://github.com/census-ecosystem/opencensus-go-exporter-ocagent -** github.com/aws-observability/aws-otel-collector; version 0.6.0 -- -https://github.com/aws-observability/aws-otel-collector ** github.com/aws/aws-lambda-go; version v1.13.3 -- https://github.com/aws/aws-lambda-go ** github.com/aws/aws-sdk-go; version 1.30.15 -- @@ -620,7 +618,6 @@ limitations under the License. Copyright 2018 Google LLC * For contrib.go.opencensus.io/exporter/ocagent see also this required NOTICE: Copyright 2018, OpenCensus Authors -* For github.com/aws-observability/aws-otel-collector see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * For github.com/aws/aws-lambda-go see also this required NOTICE: diff --git a/packaging/debian/cwagent-otel-collector.conf b/packaging/debian/cwagent-otel-collector.conf deleted file mode 100644 index bcb4b07272..0000000000 --- a/packaging/debian/cwagent-otel-collector.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: MIT - -description "CWAgent OTel Collector" -author "Amazon.com" - -start on (runlevel [2345] and started network) -stop on (runlevel [!2345] or stopping network) - -normal exit 0 - -respawn - -exec /opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector --config /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.yaml -post-stop exec sleep 1 diff --git a/packaging/debian/postinst b/packaging/debian/postinst deleted file mode 100644 index 511643c6b1..0000000000 --- a/packaging/debian/postinst +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash - -chown -R cwagent:cwagent /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs -chown -R cwagent:cwagent /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var diff --git a/packaging/debian/preinst b/packaging/debian/preinst index f6de9325e9..c8f1b12623 100755 --- a/packaging/debian/preinst +++ b/packaging/debian/preinst @@ -17,15 +17,3 @@ if ! id cwagent >/dev/null 2>&1; then echo "create user cwagent, result: $?" fi -if ! grep "^aoc:" /etc/group >/dev/null 2>&1; then - groupadd -r aoc >/dev/null 2>&1 - echo "create group aoc, result: $?" -fi - -if ! id aoc >/dev/null 2>&1; then - useradd -r -M aoc -d /home/aoc -g aoc -c "AWS OTel Collector" -s $(test -x /sbin/nologin && echo /sbin/nologin || (test -x /usr/sbin/nologin && echo /usr/sbin/nologin || (test -x /bin/false && echo /bin/false || echo /bin/sh))) >/dev/null 2>&1 - echo "create user aoc, result: $?" -else - usermod aoc -c "AWS OTel Collector" -s $(test -x /sbin/nologin && echo /sbin/nologin || (test -x /usr/sbin/nologin && echo /usr/sbin/nologin || (test -x /bin/false && echo /bin/false || echo /bin/sh))) >/dev/null 2>&1 - echo "update user aoc, result: $?" -fi diff --git a/packaging/dependencies/amazon-cloudwatch-agent-ctl b/packaging/dependencies/amazon-cloudwatch-agent-ctl index b972dd307d..5c5fbcf9f8 100755 --- a/packaging/dependencies/amazon-cloudwatch-agent-ctl +++ b/packaging/dependencies/amazon-cloudwatch-agent-ctl @@ -294,10 +294,9 @@ runstatus() { config_all() { cwa_config_location="${1:-}" - cwoc_config_location="${2:-}" - restart="${3:-}" - mode="${4:-}" - multi_config="${5:-}" + restart="${2:-}" + mode="${3:-}" + multi_config="${4:-}" if [ -z "${cwa_config_location}" ] && [ -z "${cwoc_config_location}" ]; then cwa_config_location='default' @@ -544,4 +543,4 @@ main() { esac } -main "$@" +main "$@" \ No newline at end of file diff --git a/packaging/dependencies/cwagent-otel-collector.service b/packaging/dependencies/cwagent-otel-collector.service deleted file mode 100644 index 284a6a6c28..0000000000 --- a/packaging/dependencies/cwagent-otel-collector.service +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: MIT - -# Location: /etc/systemd/system/aws-otel-collector.service -# systemctl enable cwagent-otel-collector -# systemctl start cwagent-otel-collector -# systemctl | grep cwagent-otel-collector -# https://www.freedesktop.org/software/systemd/man/systemd.unit.html - -[Unit] -Description=CWAgent OTel Collector -After=network.target - -[Service] -Type=simple -ExecStart=/opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector --config /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.yaml -KillMode=process -Restart=on-failure -RestartSec=60s - -[Install] -WantedBy=multi-user.target diff --git a/packaging/linux/amazon-cloudwatch-agent.spec b/packaging/linux/amazon-cloudwatch-agent.spec index 8cb92d1fb0..1e54096124 100644 --- a/packaging/linux/amazon-cloudwatch-agent.spec +++ b/packaging/linux/amazon-cloudwatch-agent.spec @@ -30,15 +30,12 @@ ln -f -s /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl ${RPM_ # etc mkdir -p ${RPM_BUILD_ROOT}/etc/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/etc ${RPM_BUILD_ROOT}/etc/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc ${RPM_BUILD_ROOT}/etc/amazon/cwagent-otel-collector # log mkdir -p ${RPM_BUILD_ROOT}/var/log/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/logs ${RPM_BUILD_ROOT}/var/log/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs ${RPM_BUILD_ROOT}/var/log/amazon/cwagent-otel-collector # pid mkdir -p ${RPM_BUILD_ROOT}/var/run/amazon ln -f -s /opt/aws/amazon-cloudwatch-agent/var ${RPM_BUILD_ROOT}/var/run/amazon/amazon-cloudwatch-agent -ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var ${RPM_BUILD_ROOT}/var/run/amazon/cwagent-otel-collector %files %dir /opt/aws/amazon-cloudwatch-agent @@ -48,10 +45,6 @@ ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var ${RPM_BUILD %dir /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d %dir /opt/aws/amazon-cloudwatch-agent/logs %dir /opt/aws/amazon-cloudwatch-agent/var -%dir /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc -%dir /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.d -%dir %attr(-, cwagent, cwagent) /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/logs -%dir %attr(-, cwagent, cwagent) /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl /opt/aws/amazon-cloudwatch-agent/bin/CWAGENT_VERSION @@ -59,10 +52,8 @@ ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var ${RPM_BUILD /opt/aws/amazon-cloudwatch-agent/bin/config-downloader /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-config-wizard /opt/aws/amazon-cloudwatch-agent/bin/start-amazon-cloudwatch-agent -/opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector /opt/aws/amazon-cloudwatch-agent/doc/amazon-cloudwatch-agent-schema.json %config(noreplace) /opt/aws/amazon-cloudwatch-agent/etc/common-config.toml -/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var/.predefined-config-data /opt/aws/amazon-cloudwatch-agent/LICENSE /opt/aws/amazon-cloudwatch-agent/NOTICE @@ -70,16 +61,11 @@ ln -f -s /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/var ${RPM_BUILD /opt/aws/amazon-cloudwatch-agent/RELEASE_NOTES /etc/init/amazon-cloudwatch-agent.conf /etc/systemd/system/amazon-cloudwatch-agent.service -/etc/init/cwagent-otel-collector.conf -/etc/systemd/system/cwagent-otel-collector.service /usr/bin/amazon-cloudwatch-agent-ctl /etc/amazon/amazon-cloudwatch-agent /var/log/amazon/amazon-cloudwatch-agent /var/run/amazon/amazon-cloudwatch-agent -/etc/amazon/cwagent-otel-collector -/var/log/amazon/cwagent-otel-collector -/var/run/amazon/cwagent-otel-collector %pre # Stop the agent before upgrades. @@ -100,17 +86,14 @@ if ! id cwagent >/dev/null 2>&1; then echo "create user cwagent, result: $?" fi -if ! grep "^aoc:" /etc/group >/dev/null 2>&1; then - groupadd -r aoc >/dev/null 2>&1 - echo "create group aoc, result: $?" +if id aoc >/dev/null 2>&1; then + userdel -r aoc >/dev/null 2>&1 + echo "delete user aoc, result: $?" fi -if ! id aoc >/dev/null 2>&1; then - useradd -r -M aoc -d /home/aoc -g aoc -c "AWS OTel Collector" -s $(test -x /sbin/nologin && echo /sbin/nologin || (test -x /usr/sbin/nologin && echo /usr/sbin/nologin || (test -x /bin/false && echo /bin/false || echo /bin/sh))) >/dev/null 2>&1 - echo "create user aoc, result: $?" -else - usermod aoc -c "AWS OTel Collector" -s $(test -x /sbin/nologin && echo /sbin/nologin || (test -x /usr/sbin/nologin && echo /usr/sbin/nologin || (test -x /bin/false && echo /bin/false || echo /bin/sh))) >/dev/null 2>&1 - echo "update user aoc, result: $?" +if grep "^aoc:" /etc/group >/dev/null 2>&1; then + groupdel -r aoc >/dev/null 2>&1 + echo "delete group aoc, result: $?" fi %preun diff --git a/packaging/linux/cwagent-otel-collector.conf b/packaging/linux/cwagent-otel-collector.conf deleted file mode 100644 index ba2f182285..0000000000 --- a/packaging/linux/cwagent-otel-collector.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: MIT - -description "CWAgent OTel Collector" -author "Amazon.com" - -start on (runlevel [345] and started network) -stop on (runlevel [!345] or stopping network) - -normal exit 0 - -respawn - -exec /opt/aws/amazon-cloudwatch-agent/bin/cwagent-otel-collector --config /opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/cwagent-otel-collector.yaml -post-stop exec sleep 1 diff --git a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 index cd240b55b6..18ca0e6db9 100644 --- a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 +++ b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 @@ -570,4 +570,4 @@ Function main() { } } -main +main \ No newline at end of file diff --git a/packaging/windows/install.ps1 b/packaging/windows/install.ps1 index 9aa7e1c37b..08334f75fb 100644 --- a/packaging/windows/install.ps1 +++ b/packaging/windows/install.ps1 @@ -5,17 +5,14 @@ Set-StrictMode -Version 2.0 $ErrorActionPreference = "Stop" $CWADirectory = 'Amazon\AmazonCloudWatchAgent' -$CWOCDirectory = 'Amazon\AmazonCloudWatchAgent\CWAgentOtelCollector' $CWAProgramFiles = "${Env:ProgramFiles}\${CWADirectory}" if ($Env:ProgramData) { $CWAProgramData = "${Env:ProgramData}\${CWADirectory}" - $CWOCProgramData = "${Env:ProgramData}\${CWOCDirectory}" } else { # Windows 2003 $CWAProgramData = "${Env:ALLUSERSPROFILE}\Application Data\${CWADirectory}" - $CWOCProgramData = "${Env:ALLUSERSPROFILE}\Application Data\${CWOCDirectory}" } $Cmd = "${CWAProgramFiles}\amazon-cloudwatch-agent-ctl.ps1" @@ -23,8 +20,6 @@ $Cmd = "${CWAProgramFiles}\amazon-cloudwatch-agent-ctl.ps1" New-Item -ItemType Directory -Force -Path "${CWAProgramFiles}" | Out-Null New-Item -ItemType Directory -Force -Path "${CWAProgramData}\Logs" | Out-Null New-Item -ItemType Directory -Force -Path "${CWAProgramData}\Configs" | Out-Null -New-Item -ItemType Directory -Force -Path "${CWOCProgramData}\Logs" | Out-Null -New-Item -ItemType Directory -Force -Path "${CWOCProgramData}\Configs" | Out-Null @( "LICENSE", @@ -38,7 +33,6 @@ New-Item -ItemType Directory -Force -Path "${CWOCProgramData}\Configs" | Out-Nul "config-translator.exe", "amazon-cloudwatch-agent-config-wizard.exe", "amazon-cloudwatch-agent-schema.json" -"cwagent-otel-collector.exe" ) | ForEach-Object { Copy-Item ".\$_" -Destination "${CWAProgramFiles}" -Force } @@ -46,8 +40,4 @@ New-Item -ItemType Directory -Force -Path "${CWOCProgramData}\Configs" | Out-Nul "common-config.toml" ) | ForEach-Object { Copy-Item ".\$_" -Destination "${CWAProgramData}" -Force } -@( -"predefined-config-data" -) | ForEach-Object { Copy-Item ".\$_" -Destination "${CWOCProgramData}" -Force } - & "${Cmd}" -Action cond-restart