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

Serve config at HTTP endpoint #446

Merged
merged 8 commits into from
Jan 21, 2021
Merged

Conversation

annanay25
Copy link
Contributor

Signed-off-by: Annanay annanayagarwal@gmail.com

What this PR does:
Adds a /config handler to serve the config that tempo is running with. Makes it easier to debug in non-k8s environments.

Long term, we should add an API module similar to Cortex.

Which issue(s) this PR fixes:
Fixes #nada

Checklist

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

Signed-off-by: Annanay <annanayagarwal@gmail.com>
Signed-off-by: Annanay <annanayagarwal@gmail.com>
Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Tempo can include sensitive information in its config. We either need to find a way to redact that or perhaps only serve this endpoint if it's configured.

@annanay25
Copy link
Contributor Author

Good point, I had not considered that. I was following suit with Cortex, which serves config by default I guess.

@annanay25
Copy link
Contributor Author

Okay, cortex is clever :) - https://github.com/cortexproject/cortex/blob/master/pkg/util/flagext/secret.go

I'll reuse this.

Signed-off-by: Annanay <annanayagarwal@gmail.com>
Signed-off-by: Annanay <annanayagarwal@gmail.com>
Signed-off-by: Annanay <annanayagarwal@gmail.com>
Signed-off-by: Annanay <annanayagarwal@gmail.com>
@annanay25
Copy link
Contributor Author

Results in

storage:
    trace:
        backend: s3
        local:
            path: ""
        gcs:
            bucket_name: ""
            chunk_buffer_size: 10485760
            endpoint: ""
            insecure: false
        s3:
            bucket: tempo
            endpoint: minio:9000
            access_key: '********'
            secret_key: '********'
            insecure: true
            part_size: 0
            signature_v2: false

Signed-off-by: Annanay <annanayagarwal@gmail.com>
Signed-off-by: Annanay <annanayagarwal@gmail.com>
@annanay25 annanay25 merged commit e5ea537 into grafana:master Jan 21, 2021
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