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 splunk_config_linux.yaml to gateway_config.yaml #170

Merged
merged 1 commit into from
Mar 18, 2021
Merged

Conversation

mstumpfx
Copy link

I used rg "splunk_config_linux.yaml" -l | xargs sed -i '' "s/splunk_config_linux.yaml/gateway_config.yaml/g" I'm not sure if this needs to be changed elsewhere.

@jrcamp
Copy link
Contributor

jrcamp commented Mar 17, 2021

I'm confused about

defaultDockerSAPMConfig = "/etc/otel/collector/gateway_config.yaml"
I don't see it referencing agent_config.yaml anywhere in this section 🤔 Either I don't understand how this is supposed to work or maybe it was never updated?

I feel like defaultDockerSAPMConfig, etc. should be renamed to defaultGatewayConfig to make it more clear.

@mstumpfx
Copy link
Author

I'm confused about

defaultDockerSAPMConfig = "/etc/otel/collector/gateway_config.yaml"

I don't see it referencing agent_config.yaml anywhere in this section 🤔 Either I don't understand how this is supposed to work or maybe it was never updated?

I feel like defaultDockerSAPMConfig, etc. should be renamed to defaultGatewayConfig to make it more clear.

hm yeah, some of the wording around these probably needs to be changed. I would think for the install sections we would want a section for using collector as a gateway and a section for using collector as an agent.

@codecov
Copy link

codecov bot commented Mar 17, 2021

Codecov Report

Merging #170 (758688e) into main (848fe10) will decrease coverage by 0.20%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #170      +/-   ##
==========================================
- Coverage   88.62%   88.41%   -0.21%     
==========================================
  Files          16       16              
  Lines         958      958              
==========================================
- Hits          849      847       -2     
- Misses         76       77       +1     
- Partials       33       34       +1     
Impacted Files Coverage Δ
cmd/otelcol/main.go 55.26% <ø> (ø)
internal/receiver/smartagentreceiver/output.go 90.19% <0.00%> (-1.97%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 848fe10...758688e. Read the comment docs.

@@ -16,7 +16,7 @@ SERVICE_GROUP="splunk-otel-collector"

OTELCOL_INSTALL_PATH="/usr/bin/otelcol"
CONFIG_REPO_PATH="$REPO_DIR/cmd/otelcol/config/collector/agent_config.yaml"
CONFIG_INSTALL_PATH="/etc/otel/collector/splunk_config_linux.yaml"
CONFIG_INSTALL_PATH="/etc/otel/collector/gateway_config.yaml"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the default config file in the deb/rpm packages, maybe we just package the file as config.yaml instead of gateway_config.yaml. We'll then need to add the SPLUNK_CONFIG=/etc/otel/collector/config.yaml env var to the collector service environment file to override whatever is the default in main.go. I can make the necessary changes after this PR is merged.

@mstumpfx mstumpfx merged commit f55250c into main Mar 18, 2021
@mstumpfx mstumpfx deleted the gateway branch March 18, 2021 21:11
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.

4 participants