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

Server-side metrics docs #1411

Merged
merged 18 commits into from
Apr 28, 2022
Merged

Conversation

mapno
Copy link
Member

@mapno mapno commented Apr 25, 2022

What this PR does:

Adds specific server-side metrics/metrics-generator docs to Tempo.

Which issue(s) this PR fixes:
Contributes to #1303

Checklist

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

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.

Suggestions/comments.

For the new tempo_arch.png image. I think "Metrics storage" should become "Metrics backend". We use the word "storage" a lot when we mean the object storage and I think it could get confusing

docs/tempo/website/grafana-agent/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/grafana-agent/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/grafana-agent/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/grafana-agent/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/grafana-agent/service-graphs.md Outdated Show resolved Hide resolved
docs/tempo/website/server_side_metrics/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/server_side_metrics/_index.md Outdated Show resolved Hide resolved

### Service graphs

Service graphs are the representations of the relationships between services within a distributed system.
Copy link
Member

Choose a reason for hiding this comment

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

See suggestions above.

modules/generator/generator.go Outdated Show resolved Hide resolved
modules/generator/instance.go Outdated Show resolved Hide resolved
mapno and others added 14 commits April 27, 2022 11:19
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
@mapno mapno marked this pull request as ready for review April 28, 2022 16:23
mapno and others added 3 commits April 28, 2022 18:25
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott joe-elliott enabled auto-merge (squash) April 28, 2022 16:57
@joe-elliott joe-elliott merged commit 92238a9 into grafana:main Apr 28, 2022
@mapno mapno deleted the metrics-generator-docs branch April 28, 2022 17:20
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