Skip to content

Commit

Permalink
Update documentation and changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
mapno committed Mar 26, 2021
1 parent 0acf9c5 commit c758d4a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ cross-compilation issue, but will return in v0.13.0.
`GrafanaAgent/<version>` (@rfratto)

- [ENHANCEMENT] Upgrade `go.opentelemetry.io/collector` to v0.21.0 (@mapno)

- [ENHANCEMENT] Add kafka trace receiver (@mapno)

# v0.13.0 (2021-02-25)

Expand Down
4 changes: 2 additions & 2 deletions docs/configuration-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2019,8 +2019,8 @@ push_config:
[ retry_on_failure: <otlpexporter.retry_on_failure> ]

# Receiver configurations are mapped directly into the OpenTelmetry receivers block.
# At least one receiver is required.
# https://github.com/open-telemetry/opentelemetry-collector/blob/7d7ae2eb34b5d387627875c498d7f43619f37ee3/receiver/README.md
# At least one receiver is required. Supported receivers: otlp, jaeger, kafka, opencensus and zipkin.
# Documentation for each receiver can be found at https://github.com/open-telemetry/opentelemetry-collector/blob/7d7ae2eb34b5d387627875c498d7f43619f37ee3/receiver/README.md
receivers:

# A list of prometheus scrape configs. Targets discovered through these scrape configs have their __address__ matched against the ip on incoming spans.
Expand Down
2 changes: 1 addition & 1 deletion docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ developer team.

Grafana Agent supports collecting traces and sending them to Tempo using its
`tempo` subsystem. This is done by utilizing the upstream [OpenTelmetry Collector](https://github.com/open-telemetry/opentelemetry-collector).
The agent is capable of ingesting OpenTelemetry, OpenCensus, Jaeger or Zipkin spans.
The agent is capable of ingesting OpenTelemetry, OpenCensus, Jaeger, Zipkin or Kafka spans.
See documentation on how to configure [receivers](./configuration-reference.md#tempo_config).
The agent is capable of exporting to any OpenTelemetry GRPC compatible system.

Expand Down

0 comments on commit c758d4a

Please sign in to comment.