Revert "Revert "OTL-2195: Disable fluentd by default in installer scripts (#3369)" (#3420)" #3423
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jeffreyc-splunk
force-pushed
the
installer-disable-fluentd
branch
from
1968a0a
to
965b087
Compare
atoulme
approved these changes
Jul 28, 2023
rmfitzpatrick
approved these changes
Jul 28, 2023
dmitryax
approved these changes
Aug 1, 2023
rmfitzpatrick
pushed a commit
to crobert-1/splunk-otel-collector
that referenced
this pull request
Aug 2, 2023
…ipts (signalfx#3369)" (signalfx#3420)" (signalfx#3423) This reverts commit f6dc932.
atoulme
added a commit
that referenced
this pull request
Sep 7, 2023
* [receiver/jmx] Add Docker support for JMX receiver To properly support the jmx receiver in Docker, the dockerfile has to download the JMX metrics gatherer, and have it available to the collector. This change adds this functionality to the linux/macos dockerfile, as well as the windows dockerfile. Also, adds an integration test getting metrics from a docker container. * Add back accidental deletion * Updated based on Jeff's comments - Update download URLs for consistency - Remove unecessary data copies - Fix file permissions * Fix import order * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Download from github instead of maven * Add missing space * Fix version numbering * Update version style for new remote repo * Add v back for versioning download * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update file names to match downloaded files * Fix sprintf formatting * Ensure required directories exist * Remove unecessary steps * Make container delay longer, curl into specific filename * Rename JAR files to match default JMX path * Fix variable syntax in config file * Fix jmx integration test * Increase timeout to see if integration test will pass * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update cmd/otelcol/Dockerfile.windows Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Fix integration test * Remove integration test * Add check for jmx jar path in windows MSI * Update path setting in windows dockerfile * Fix path setting variable in windows dockerfile * Try another variation of dockerfile windows path * Another try at the path syntax * Remove extra path arguments * Use servercore syntax for setting path * Add missing terminator * Match servercore * Move around values * Try another format for path * Add integration tests back in * Ran make fmt * Get path a different way * Try debugging failure * Change tmp dir's name * Change temp dir's permission * Try base case without any temp dir * Manually create tmp dir and mount it * Remove extra will fail call * Regular mount, made tmpdir with all permissions * Create tmp dir in scratch docker image * Update Java version and re-use with different format * Use powershell for string replacement * Fix powershell command formatting * Fix formatting again * Try another powershell formatting * Update variable reference to env reference * Fix syntax * Remove command option * Try moving variable outside parenthesis * Use explicit setenv method of powershell * Name directory generic name * Try to see if tmp dir is reason tests are failing * Mount local tmpdir for test only * Manually set local tmp if not set * Skip integration test when running on arm * Fix whitespace * Change method to find arch running test * Try env variable for go arch * Add test data for ARM architecture * Add comment about arm test check * Update .github/workflows/win-package-test.yml Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update cmd/otelcol/Dockerfile Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Changes suggested by Jeff - Need to install JMX gatherer at proper path, updated msi builder and wix file * Add component ref for JMX gatherer * Add changelog entry * Add PR link * add tmpdir to images * Bump boto3 in /internal/buildscripts/packaging/release (#3425) Bumps [boto3](https://github.com/boto/boto3) from 1.28.9 to 1.28.15. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](boto/boto3@1.28.9...1.28.15) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/aws/aws-sdk-go from 1.44.280 to 1.44.312 in /internal/signalfx-agent (#3427) * Bump github.com/aws/aws-sdk-go in /internal/signalfx-agent Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.280 to 1.44.312. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.280...v1.44.312) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump github.com/snowflakedb/gosnowflake from 1.6.22 to 1.6.23 in /internal/signalfx-agent (#3428) * Bump github.com/snowflakedb/gosnowflake in /internal/signalfx-agent Bumps [github.com/snowflakedb/gosnowflake](https://github.com/snowflakedb/gosnowflake) from 1.6.22 to 1.6.23. - [Release notes](https://github.com/snowflakedb/gosnowflake/releases) - [Changelog](https://github.com/snowflakedb/gosnowflake/blob/master/release.go) - [Commits](snowflakedb/gosnowflake@v1.6.22...v1.6.23) --- updated-dependencies: - dependency-name: github.com/snowflakedb/gosnowflake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump github.com/docker/docker from 24.0.4+incompatible to 24.0.5+incompatible in /internal/signalfx-agent (#3429) * Bump github.com/docker/docker in /internal/signalfx-agent Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.4+incompatible to 24.0.5+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v24.0.4...v24.0.5) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump github.com/docker/docker in /tests (#3432) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.4+incompatible to 24.0.5+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v24.0.4...v24.0.5) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.commons:commons-lang3 (#3434) Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.13.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/prometheus/prometheus from 0.45.0 to 0.46.0 (#3433) Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.45.0 to 0.46.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.45.0...v0.46.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Upgrade go to 1.20.6 (#3437) * Bump github.com/google/cadvisor from 0.47.1 to 0.47.3 in /internal/signalfx-agent (#3431) * Bump github.com/google/cadvisor in /internal/signalfx-agent Bumps [github.com/google/cadvisor](https://github.com/google/cadvisor) from 0.47.1 to 0.47.3. - [Release notes](https://github.com/google/cadvisor/releases) - [Changelog](https://github.com/google/cadvisor/blob/master/CHANGELOG.md) - [Commits](google/cadvisor@v0.47.1...v0.47.3) --- updated-dependencies: - dependency-name: github.com/google/cadvisor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump github.com/prometheus/prometheus (#3435) Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.45.0 to 0.46.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.45.0...v0.46.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update OpenTelemetry Dependencies to latest (#3436) Co-authored-by: jeffreyc-splunk <jeffreyc@splunk.com> Co-authored-by: Dmitry Anoshin <anoshindx@gmail.com> * Cherry-pick a fix for resource detection processor (#3438) Pull open-telemetry/opentelemetry-collector-contrib#24670 from contrib which was merged right after 0.82.0 * Revert "Revert "OTL-2195: Disable fluentd by default in installer scripts (#3369)" (#3420)" (#3423) This reverts commit f6dc932. * OTL-2195: Disable fluentd by default for choco package (#3377) * set TMPDIR in docker image * remove unnecesary fixtures and mount * update gatherer version * use standard tmp dir in docker image * fix telegraf-exec test tmp race * fix windows jdk path * use jre instead of jdk and disable java otlp log exporter * Bump pygithub in /internal/buildscripts/packaging/release (#3490) Bumps [pygithub](https://github.com/pygithub/pygithub) from 1.59.0 to 1.59.1. - [Release notes](https://github.com/pygithub/pygithub/releases) - [Changelog](https://github.com/PyGithub/PyGithub/blob/v1.59.1/doc/changes.rst) - [Commits](PyGithub/PyGithub@v1.59.0...v1.59.1) --- updated-dependencies: - dependency-name: pygithub dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2 in /pkg/receiver/smartagentreceiver (#3492) * Bump github.com/openzipkin/zipkin-go in /pkg/receiver/smartagentreceiver Bumps [github.com/openzipkin/zipkin-go](https://github.com/openzipkin/zipkin-go) from 0.4.1 to 0.4.2. - [Release notes](https://github.com/openzipkin/zipkin-go/releases) - [Commits](openzipkin/zipkin-go@v0.4.1...v0.4.2) --- updated-dependencies: - dependency-name: github.com/openzipkin/zipkin-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump boto3 in /internal/buildscripts/packaging/release (#3491) Bumps [boto3](https://github.com/boto/boto3) from 1.28.15 to 1.28.25. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](boto/boto3@1.28.15...1.28.25) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang.org/x/tools from 0.11.1 to 0.12.0 in /internal/tools (#3494) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.11.1 to 0.12.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.11.1...v0.12.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang in /examples/prometheus-federation/prom-counter (#3493) Bumps golang from 1.20.7-bullseye to 1.21.0-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/golangci/golangci-lint in /internal/tools (#3496) Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.53.3 to 1.54.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.53.3...v1.54.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Workaround for windows installer script signing (#3505) * Bump github.com/antonmedv/expr from 1.12.6 to 1.13.0 in /internal/signalfx-agent (#3503) * Bump github.com/antonmedv/expr in /internal/signalfx-agent Bumps [github.com/antonmedv/expr](https://github.com/antonmedv/expr) from 1.12.6 to 1.13.0. - [Release notes](https://github.com/antonmedv/expr/releases) - [Commits](expr-lang/expr@v1.12.6...v1.13.0) --- updated-dependencies: - dependency-name: github.com/antonmedv/expr dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump golang.org/x/net from 0.12.0 to 0.14.0 in /internal/signalfx-agent (#3502) * Bump golang.org/x/net from 0.12.0 to 0.14.0 in /internal/signalfx-agent Bumps [golang.org/x/net](https://github.com/golang/net) from 0.12.0 to 0.14.0. - [Commits](golang/net@v0.12.0...v0.14.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Add a github issue template to send folks to support and splunk ideas (#3487) * Add a github issue template to send folks to support and splunk ideas * Update .github/ISSUE_TEMPLATE/config.yml * enable blank issues * Bump golang in /examples/splunk-hec-traces/tracing (#3495) Bumps golang from 1.20.7-bullseye to 1.21.0-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang in /examples/splunk-hec/logging (#3497) Bumps golang from 1.20.7-bullseye to 1.21.0-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/hashicorp/consul/api in /internal/signalfx-agent (#3500) Bumps [github.com/hashicorp/consul/api](https://github.com/hashicorp/consul) from 1.22.0 to 1.24.0. - [Release notes](https://github.com/hashicorp/consul/releases) - [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md) - [Commits](hashicorp/consul@api/v1.22.0...api/v1.24.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/consul/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/hashicorp/golang-lru from 0.6.0 to 1.0.2 in /internal/signalfx-agent (#3501) * Bump github.com/hashicorp/golang-lru in /internal/signalfx-agent Bumps [github.com/hashicorp/golang-lru](https://github.com/hashicorp/golang-lru) from 0.6.0 to 1.0.2. - [Release notes](https://github.com/hashicorp/golang-lru/releases) - [Commits](hashicorp/golang-lru@v0.6.0...v1.0.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/golang-lru dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * Bump github.com/beevik/ntp from 1.2.0 to 1.3.0 in /internal/signalfx-agent (#3499) * Bump github.com/beevik/ntp in /internal/signalfx-agent Bumps [github.com/beevik/ntp](https://github.com/beevik/ntp) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/beevik/ntp/releases) - [Changelog](https://github.com/beevik/ntp/blob/main/RELEASE_NOTES.md) - [Commits](beevik/ntp@v1.2.0...v1.3.0) --- updated-dependencies: - dependency-name: github.com/beevik/ntp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> * corect changelog * update default msi gatherer version * remove arm-specific telegraf-proctstat test metrics * corect cl entry location * update jmx gatherer to 1.29.0 * Update .gitlab/update-openjdk.sh Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * Update cmd/otelcol/Dockerfile Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> * move autoconfigure env vars to int test * Changes requested in PR - Add java check in windows docker - Add jmx gatherer to tar * Add missing parenthesis * Fix string comparison * Fix missing paren * Add test to make sure jar is installed properly * Test paths for jmx jar * Update install path for jmx jar * Pass in version for jmx download method * Move install path of jmx jar * Update tests/receivers/jmxreceiver/jmxreceiver_test.go Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com> * Update internal/buildscripts/packaging/msi/msi-builder/Dockerfile Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com> * Update internal/buildscripts/packaging/msi/msi-builder/build.sh Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com> Co-authored-by: Ryan Fitzpatrick <rfitzpatrick@splunk.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: release-bot <ssg-srv-gh-o11y-gdi@splunk.com> Co-authored-by: srv-gh-o11y-gdi <98980563+srv-gh-o11y-gdi@users.noreply.github.com> Co-authored-by: jeffreyc-splunk <jeffreyc@splunk.com> Co-authored-by: Dmitry Anoshin <anoshindx@gmail.com> Co-authored-by: Antoine Toulme <antoine@lunar-ocean.com> Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit f6dc932.