Skip to content

feat(mixin): provide rendered mixin outputs#5118

Merged
thampiotr merged 9 commits intomainfrom
thampiotr/rendered-alloy-mixin
Dec 16, 2025
Merged

feat(mixin): provide rendered mixin outputs#5118
thampiotr merged 9 commits intomainfrom
thampiotr/rendered-alloy-mixin

Conversation

@thampiotr
Copy link
Contributor

@thampiotr thampiotr commented Dec 16, 2025

PR Description

This PR adds pre-rendered outputs from the Alloy jsonnet mixin, making it easier for users to import Grafana dashboards and Prometheus alert rules without needing to render them from source. The PR includes infrastructure for automatically generating and validating these rendered outputs.

Key changes:

  • Adds 8 Grafana dashboard JSON files and 3 Prometheus alert YAML files under operations/alloy-mixin/rendered/
  • Implements a new make generate-rendered-mixin target for regenerating outputs
  • Adds a GitHub workflow to ensure rendered outputs stay in sync with source files
  • Updates dependencies (grafonnet library) and example versions (Grafana, Alloy)

Which issue(s) this PR fixes

Related: #5074

Notes to the Reviewer

I've tested this locally with example/docker-compose. Was able to import dashboards and Prometheus alerting rules following the instructions in README.md.

PR Checklist

  • Documentation added
  • Tests updated
  • Config converters updated

BEGIN_COMMIT_OVERRIDE
feat(mixin): Provide rendered mixin outputs (#5118)
END_COMMIT_OVERRIDE

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR adds pre-rendered outputs from the Alloy jsonnet mixin, making it easier for users to import Grafana dashboards and Prometheus alert rules without needing to render them from source. The PR includes infrastructure for automatically generating and validating these rendered outputs.

Key changes:

  • Adds 8 Grafana dashboard JSON files and 3 Prometheus alert YAML files under operations/alloy-mixin/rendered/
  • Implements a new make generate-rendered-mixin target for regenerating outputs
  • Adds a GitHub workflow to ensure rendered outputs stay in sync with source files
  • Updates dependencies (grafonnet library) and example versions (Grafana, Alloy)

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
operations/alloy-mixin/README.md New documentation explaining how to use and regenerate the mixin outputs
operations/alloy-mixin/rendered/dashboards/*.json Pre-rendered Grafana dashboard definitions (8 dashboards for resources, Prometheus, OpenTelemetry, Loki, logs, controller, and cluster monitoring)
operations/alloy-mixin/rendered/alerts/*.yaml Pre-rendered Prometheus alert rule definitions (3 alert groups for OTel, controller, and clustering)
Makefile Adds generate-rendered-mixin target with proper jsonnet/jb tooling setup
.github/workflows/check-alloy-mixin-rendered.yml CI workflow to verify rendered outputs are up-to-date with source
operations/alloy-mixin/jsonnetfile.json Updates grafonnet dependency from v10.0.0 to latest
operations/alloy-mixin/jsonnetfile.lock.json Lock file reflecting updated dependencies including grafonnet v11.0.0 and v11.4.0
operations/alloy-mixin/dashboards/alloy-logs.libsonnet Updates import path to use grafonnet-latest
example/docker-compose/grafana.yaml Updates Grafana version from 11.5.1 to 12.3.0
example/docker-compose/compose.yaml Updates Alloy version from v1.5.1 to latest

@thampiotr thampiotr marked this pull request as ready for review December 16, 2025 13:29
@thampiotr thampiotr requested a review from a team as a code owner December 16, 2025 13:29
Copy link
Contributor

@kalleep kalleep left a comment

Choose a reason for hiding this comment

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

This is great! Nice

@thampiotr thampiotr merged commit 738b9fb into main Dec 16, 2025
50 checks passed
@thampiotr thampiotr deleted the thampiotr/rendered-alloy-mixin branch December 16, 2025 14:04
@github-actions github-actions bot locked and limited conversation to collaborators Dec 16, 2025
@grafana grafana unlocked this conversation Dec 16, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants