Update enabling tempo mcp and docs#1385
Merged
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
Member
|
Great! Did you test that an agent can figure it out based on the instructions given during start? |
Contributor
Author
|
Added info to the run script for Tempo's MCP server and made it so what is added is different depending on whether it's enabled or not and also if the SA was made successfully or not. If it isn't enabled, it instead says |
Member
|
Looks great - I just want to wait until #1392 is merged and then extend that test suite to have the now logic covered as well. |
Member
|
@tiffanyfay can you add tests like in #1392 now (just merged) |
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Member
I added that now |
zeitlinger
added a commit
that referenced
this pull request
Jun 11, 2026
## What changed - add `docker/mcp-bootstrap-spec.py` as a small Python spec for the MCP bootstrap behavior - refactor `docker/run-all.bats` to compare `run-all.sh` output and generated artifacts against that spec - keep the existing docs/path checks while replacing the repetitive MCP matrix assertions with spec-based checks ## Why it changed The MCP bootstrap behavior in `docker/run-all.sh` is easy to drift as the matrix grows. This keeps the runtime implementation in shell, but moves the expected behavior model into a compact, testable Python script that acts as a second implementation for the tests. ## User impact No runtime behavior change. This only strengthens tests for the Tempo/Grafana MCP bootstrap combinations. ## Validation - `python3 -m py_compile docker/mcp-bootstrap-spec.py` - `bats docker/run-all.bats` - `bats docker/run-otelcol.bats docker/run-all.bats` Stacked on top of #1385 via base branch `tempo-mcp`.
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Member
|
@zeitlinger I don't have the permission to do it anymore - the |
martincostello
approved these changes
Jun 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Blocked by #1392
Tempo's MCP server is intentionally disabled by default in Tempo itself. Updating docs and config to start disabled, but give the user the ability to enable it instead of how the current config enables it for everyone. I added a flag for this to Tempo, which resulted in release 2.10.4.
To verify it enabled it use curl:
Additionally, the Grafana MCP server has tools for Pyroscope, so I removed the section saying there's no MCP server. See the README in the MCP server GH.