Skip to content

Fix tempo cli arguments - #4259

Merged
mapno merged 3 commits into
grafana:mainfrom
faridtmammadov:fix-tempo-cli-arguments
Nov 4, 2024
Merged

Fix tempo cli arguments#4259
mapno merged 3 commits into
grafana:mainfrom
faridtmammadov:fix-tempo-cli-arguments

Conversation

@faridtmammadov

@faridtmammadov faridtmammadov commented Nov 1, 2024

Copy link
Copy Markdown
Contributor

What this PR does:
This PR fixes the unused S3Pass and S3User parameters in the CLI options by implementing them in the code. Additionally, it introduces a skip verify option to bypass SSL certificate validation when connecting to the S3 backend, enhancing flexibility for self-signed or internal certificates.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]
@CLAassistant

CLAassistant commented Nov 1, 2024

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@faridtmammadov
faridtmammadov force-pushed the fix-tempo-cli-arguments branch from 01c5ff1 to ab16948 Compare November 1, 2024 12:54

@joe-elliott joe-elliott left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

i have never used these fields and now i know they wouldn't have worked anyway.

thanks for spotting this and the fix! requesting a small change to the insecure flag. 🙏

Comment thread cmd/tempo-cli/main.go
@faridtmammadov
faridtmammadov force-pushed the fix-tempo-cli-arguments branch 2 times, most recently from 77768ab to 2b56810 Compare November 1, 2024 13:48
@joe-elliott
joe-elliott force-pushed the fix-tempo-cli-arguments branch from bbf6c8d to 60e19d2 Compare November 1, 2024 19:01

@mapno mapno left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks!

@mapno
mapno merged commit 2b4368a into grafana:main Nov 4, 2024
mattdurham pushed a commit to mattdurham/tempo that referenced this pull request Jun 18, 2026
* add option to skip s3 certificate verification

* use S3User and S3Pass parameters in tempo-cli

* lint

Signed-off-by: Joe Elliott <number101010@gmail.com>

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants