Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename zeroconfig config files #3682

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Conversation

jeffreyc-splunk
Copy link
Contributor

  • /etc/splunk/zeroconfig_java.conf -> /etc/splunk/zeroconfig/java.conf
  • /etc/splunk/zeroconfig_node.conf -> /etc/splunk/zeroconfig/node.conf

@jeffreyc-splunk jeffreyc-splunk marked this pull request as ready for review September 21, 2023 20:01
@jeffreyc-splunk jeffreyc-splunk merged commit eed3974 into zero-config-dev Sep 21, 2023
41 checks passed
@delete-merged-branch delete-merged-branch bot deleted the zc-config-files branch September 21, 2023 21:04
jeffreyc-splunk added a commit that referenced this pull request Sep 25, 2023
jeffreyc-splunk added a commit that referenced this pull request Sep 26, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 3, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 3, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 9, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 11, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 16, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 16, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 16, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 16, 2023
jeffreyc-splunk added a commit that referenced this pull request Oct 18, 2023
atoulme added a commit that referenced this pull request Oct 18, 2023
* [DNM] Zero-config C code to inject environment variables for Java and Node.js (#3514)

* Remove sending a metric as part of auto-instrumentation (#3482)

* refactor the code to inject allowed env vars

* latest after pair programming

* latest after review and pairing

* only inject env vars for java and nodejs programs. Apply env vars from different files for java and nodejs

* remove docker interactive and tty flags

* wip

* use arch var to set the name of the file to copy

* make tests pass on arm64

* try to support arm

* build for the proper platform

* fix package build

* review with Jason, test for env vars overrides

* Make ALLOWED_ENV_VARS a single string defined through the preprocessor

* Update instrumentation/tests/java/Dockerfile

Co-authored-by: Jeff Cheng <[email protected]>

* load preload file same way as java test

* move file locations to macros

* use n functions to handle strings when possible

---------

Co-authored-by: Jeff Cheng <[email protected]>

* Add systemd sample file to splunk-otel-auto-instrumention (#3506)

* Add systemd sample file to splunk-otel-auto-instrumention

* Update manual instructions

* Include default /etc/splunk/zeroconfig_java.conf in deb/rpm packages

* Update tests for new libsplunk.so

* Run auto instrumentation workflow for the zero-config-dev branch

* Include splunk-otel-js in auto instrumentation deb/rpm (#3540)

* Add systemd sample file to splunk-otel-auto-instrumention

* Update tests for new libsplunk.so

* Include splunk-otel-js in auto instrumentation deb/rpm

* Include default /etc/splunk/zeroconfig_node.conf in deb/rpm packages

* Add tests for express instrumentation (#3566)

* Update installer script for systemd auto instrumentation (#3536)

* Rename zeroconfig config files (#3682)

* Update ZC docs and tests for manual installation/configuration (#3700)

* Update docs

* Update splunk-otel-js to v2.4.2

* Combine sample systemd config files

* Install splunk-otel-js globally for tests

* Update deps installation for node tests

* Update splunk-otel-js to v2.4.4

* Update linux-manual.md

* Update test for centos/oraclelinux 7 arm64

---------

Co-authored-by: Anna U <[email protected]>

* Update otlp endpoint for linux installer script (#3761)

* Update otlp endpoint for linux installer script

* remove 0.0.0.0

* Add debian bookworm for instrumentation tests

* Update CHANGELOG.md

---------

Co-authored-by: Antoine Toulme <[email protected]>
Co-authored-by: Anna U <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants