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

Customize the OpenTelemetry demo for Splunk #1

Merged
merged 24 commits into from
Dec 22, 2023

Conversation

dmitchsplunk
Copy link
Collaborator

Changes

I've made a number of customizations to the upstream OpenTelemetry demo for use with Splunk Cloud/Enterprise and Splunk Observability Cloud. These include:

  • Replacing the upstream collector from the docker.yml file with the Splunk distro of the collector.
  • Removing the upstream collector from the kubernetes/opentelemetry-demo.yaml file (since it will be installed via helm instead), and modified the other services in this file to use the Splunk distro of the collector running on the K8s node.
  • Updated the README instructions to point Lantern blog articles for deploying the demo.

Merge Requirements

For new features contributions please make sure you have completed the following
essential items:

  • CHANGELOG.md updated to document new feature additions
  • Appropriate documentation updates in the docs
  • Appropriate Helm chart updates in the helm-charts

Maintainers will not merge until the above have been completed. If you're unsure
which docs need to be changed ping the
@open-telemetry/demo-approvers.

Copy link

This PR was marked stale due to lack of activity. It will be closed in 7 days.

@github-actions github-actions bot added the Stale label Nov 23, 2023
@jvoravong
Copy link

jvoravong commented Nov 27, 2023

Can we develop a script (example) or GitHub workflow to automate the synchronization of this demo with the upstream source? It's crucial to either automate the update process or provide detailed documentation for the process. This will facilitate incorporating changes from the upstream project over time.

@github-actions github-actions bot removed the Stale label Nov 28, 2023
@dmitchsplunk
Copy link
Collaborator Author

Thanks for the example script @jvoravong , I'll see what I can do.

Copy link

github-actions bot commented Dec 7, 2023

This PR was marked stale due to lack of activity. It will be closed in 7 days.

@github-actions github-actions bot added the Stale label Dec 7, 2023
@github-actions github-actions bot removed the Stale label Dec 12, 2023
@dmitchsplunk
Copy link
Collaborator Author

@jvoravong FYI, I've made good progress on automating the process of applying my changes to the upstream version, but still have work to do before the PR is ready to be reviewed.

@dmitchsplunk
Copy link
Collaborator Author

Hi @jvoravong - the requested changes are ready for your review.

To make future merges with upstream straightforward, the only files changed are in a new folder named "splunk". Everything else is aligned with upstream exactly.

A new script was added named "update-demos.sh" that can be run after merging with upstream to regenerate the splunk-specific config.

splunk/README.md Outdated Show resolved Hide resolved
splunk/README.md Outdated Show resolved Hide resolved
splunk/README.md Outdated Show resolved Hide resolved
Copy link

@jvoravong jvoravong left a comment

Choose a reason for hiding this comment

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

Some small nits. LGTM overall.

@dmitchsplunk
Copy link
Collaborator Author

Thanks @jvoravong , I've made the suggested changes. I believe @atoulme is the owner of this repo and will need to approve the merge.

@atoulme
Copy link
Collaborator

atoulme commented Dec 22, 2023

@jvoravong you should have powers to merge now.

@jvoravong jvoravong merged commit f7cfef4 into signalfx:main Dec 22, 2023
22 of 26 checks passed
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.

3 participants