Skip to content

Commit

Permalink
Include changes missed in conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
clayton-cornell committed Apr 10, 2024
1 parent 1c1845b commit 8a22a8f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/sources/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ cascade:

# Grafana Agent

{{< docs/shared lookup="agent-deprecation.md" source="alloy" version="<ALLOY_VERSION>">}}

Grafana Agent is a vendor-neutral, batteries-included telemetry collector with
configuration inspired by [Terraform][]. It is designed to be flexible,
performant, and compatible with multiple ecosystems such as Prometheus and
Expand Down
2 changes: 2 additions & 0 deletions docs/sources/_index.md.t
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ cascade:

# Grafana Agent

{{< docs/shared lookup="agent-deprecation.md" source="alloy" version="<ALLOY_VERSION>">}}

Grafana Agent is a vendor-neutral, batteries-included telemetry collector with
configuration inspired by [Terraform][]. It is designed to be flexible,
performant, and compatible with multiple ecosystems such as Prometheus and
Expand Down

0 comments on commit 8a22a8f

Please sign in to comment.