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

[DOC] Update screenshots tracing #2767

Merged
merged 2 commits into from
Aug 8, 2023
Merged

[DOC] Update screenshots tracing #2767

merged 2 commits into from
Aug 8, 2023

Conversation

knylander-grafana
Copy link
Contributor

What this PR does:
Moved a screenshot to the google cloud storage and updated two links to the image in the best practices and tracing.md docs.

Which issue(s) this PR fixes:
Fixes #

Checklist

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

@knylander-grafana knylander-grafana self-assigned this Aug 4, 2023
@knylander-grafana knylander-grafana added the type/docs Improvements or additions to documentation label Aug 4, 2023
@@ -16,7 +16,7 @@ Spans also have a hierarchy, where parent spans can have children or siblings.

In the screenshot below, the left side of the screen (1) shows the list of results for the query. The right side (2) lists each span that makes up the selected trace.

![Traces example with query results and spans](/static/img/docs/tempo/trace-explore-spans.png)
![Traces example with query results and spans](/static/img/docs/tempo/screenshot-trace-explore-spans-g10.png)
Copy link
Member

Choose a reason for hiding this comment

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

since this image does not exist in this repo are there any CI checks that alert us if this is removed?

cc @jdbaldry

Copy link
Member

Choose a reason for hiding this comment

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

Very fair question.

The asset uploader service doesn't allow deletes except by the website squad themselves so removals don't happen often. That being said, that distance could mean that it would be hard to communicate if a removal were to happen.

There's nothing turnkey right now but I could imagine a quick script that runs make docs, greps for all image links, and then curls the URL to check it doesn't 404.

Copy link
Member

Choose a reason for hiding this comment

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

cool, agree that something here would be nice. perhaps some CI in the main repo that double checks links/images aren't broken when they cross sub-repos.

i believe hugo will already catch in-repo broken links.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, and once I have a more tested solution we should be able to have full cross-site link checking in source project CI. I still need a GitHub App and a little testing to iron out some of the UX kinks but I have a PoC.

It also simplifies our linking rules which at the moment are a bit complicated thanks to the separation of source projects.

Copy link
Member

Choose a reason for hiding this comment

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

Putting the CI for broken images in the website repository makes sense.

@@ -45,7 +45,7 @@ That trace ID enables one to trace, or follow a request as it flows from node to

Here's an example showing two pages in Grafana Cloud. The first, on the left (1), shows a query using the **Explore** feature. In the query results you can see a **traceID** field that was added to an application. That field contains a **Tempo** trace ID. The second page, on the right (2), uses the same Explore feature to perform a Tempo search using that **trace ID**. It then shows a set of spans as horizontal bars, each bar denoting a different part of the system.

<p align="center"><img src="../getting-started/assets/trace-explore-spans.png" alt="Trace example"></p>
![Traces example with query results and spans](/static/img/docs/tempo/screenshot-trace-explore-spans-g10.png)
Copy link
Member

Choose a reason for hiding this comment

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

silly Q. does the leading ! make it an image link?

@knylander-grafana knylander-grafana merged commit 37fc00e into grafana:main Aug 8, 2023
15 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

The backport to release-v2.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2767-to-release-v2.2 origin/release-v2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 37fc00ef097619a796dde0ff60477c7befa1f1f4
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Create the PR body template
PR_BODY=$(gh pr view 2767 --json body --template 'Backport 37fc00ef097619a796dde0ff60477c7befa1f1f4 from #2767{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Push the branch to GitHub and a PR
echo "${PR_BODY}" | gh pr create --title "[release-v2.2] [DOC] Update screenshots tracing" --body-file - --label "type/docs" --label "backport" --base release-v2.2 --milestone release-v2.2 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# If you don't have the GitHub CLI installed: Push the branch to GitHub and manually create a PR:
git push --set-upstream origin backport-2767-to-release-v2.2
# Remove the local backport branch
git switch main
git branch -D backport-2767-to-release-v2.2

Unless you've used the GitHub CLI above, now create a pull request where the base branch is release-v2.2 and the compare/head branch is backport-2767-to-release-v2.2.

kvrhdn added a commit that referenced this pull request Aug 10, 2023
* [DOC] Update screenshots tracing (#2767)

* Change screenshots to use GCP

* Remove conflict images

* Update grafana/dskit dependency (#2773)

* Update grafana/dskit dependency

* go mod tidy all the go.mod's

* Update dskit again to catch patch fix

* Check in all of vendor/

* GetMetrics use second pass (#2765)

* traceqlmetris use second pass for more correct output.  However super messy memory pooling required to keep things from exploding

* Expose parquetquery methods better

* comment

* Move Release() to the spanset instead of the Fetcher interface, much less churn

* cleanup, simplification

* cleanup

* Small cleanup

* Apply same pooling changes to vparquet3.  Update benchmark to verify expected test block version

* fix test

* changelog

* Refactor user-configurable overrides API and client; add detailed logging (#2755)

* Refactor user-configurable overrides API and client

* Refactor user-configurable overrides API and client

* Bug smash

* Replace weaveworks imports

* 🤦

* Address why GCS is faling e2e test

* Add patch to e2e test

* Sprinkle some more println in tests

* Update various OTel dependencies (#2778)

* Update various OTel dependencies

* Breaking changes, fix compilation issues

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
Co-authored-by: Martin Disibio <martin.disibio@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.2 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants