chore: Forwardport release v1.13.1 to main#5538
Merged
Conversation
this is needed because the forwardport workflow failed and went unnoticed for a while.
…ackport] (#5492) ## Backport of #5488 This PR backports #5488 to release/v1.13. ### Original PR Title docs: Update the validate command topic to clarify syntax checking ### Original PR Author @clayton-cornell ### Description Update the validate command documentation to clarify that syntax checking is only for Alloy syntax. Fixes: #5230 --- *This backport was created automatically.* Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
…e.match [backport] (#5495) ## Backport of #5460 This PR backports #5460 to release/v1.13. ### Original PR Author @kalleep ### Description ### Pull Request Details When reloading config for `loki.process` we have had issues where metrics would be registered multiple times. It was fixed in #1292. But if you have metrics in `stage.match` you will hit the same issue because we never cleaned them up: ``` stage.match { selector = `{ test="" }` stage.metrics { metric.counter { name = "counter" description = "some metric desc" action = "inc" match_all = true max_idle_duration = "12h" } } } ``` ### Issue(s) fixed by this Pull Request ### Notes to the Reviewer Test added in pr fails on main ### PR Checklist <!-- Remove items that do not apply. For completed items, change [ ] to [x]. --> - [ ] Documentation added - [x] Tests updated - [ ] Config converters updated --- *This backport was created automatically.* Co-authored-by: Karl Persson <23356117+kalleep@users.noreply.github.com>
… contains newline [backport] (#5496) ## Backport of #5489 This PR backports #5489 to release/v1.13. ### Original PR Author @kalleep ### Description ### Pull Request Details Regression from #4713. Before that pr we parsed log lines that only included newlines. In this pr I fixed the issue so we no longer report an error but we keep the behavior of not forwarding empty lines and add a debug log for these cases. ### Issue(s) fixed by this Pull Request Fixes: #5476 ### Notes to the Reviewer <!-- Add any relevant notes for the reviewers and testers of this PR. --> ### PR Checklist <!-- Remove items that do not apply. For completed items, change [ ] to [x]. --> - [ ] Documentation added - [x] Tests updated - [ ] Config converters updated --- *This backport was created automatically.* Co-authored-by: Karl Persson <23356117+kalleep@users.noreply.github.com>
…w ones [backport] (#5443) ## Backport of #5401 This PR backports #5401 to release/v1.13. ### Original PR Author @kgeckhart ### Description ### Brief description of Pull Request Adjust the ordering for component scheduling so that we give components time to shutdown before we start new components. If components take too long we will still move on but wait for all to shutdown during scheduling. ### Pull Request Details We have run in to issues with components which bind shared resources not being able to release those resources when the component is rescheduled due to a module rename / component rename. An example of this is the `loki.source.syslog` component which will bind 1 or more ports depending on the listener config. This causes issues with our current implementation where shutdown/startup order is not defined, 1. Old components are told to shutdown 2. As soon as all old components have been told to shutdown, new components are started 3. If the syslog component did not shutdown fast enough the new component will fail to bind ports 4. Failing to bind ports does not cause the syslog component to exit we just won't open the listener forcing a user to restart alloy to resolve the problem ### Issue(s) fixed by this Pull Request I need to look to see if there are issues which describe this sort of behavior ### Notes to the Reviewer This PR is intended to work with components which bind resources when Run. We have multiple components which bind resources when the is newly created before running. This causes a panic instead which will be resolved in a separate PR. I chose to leave an escape hatch on shutdown because our default component shutdown timeout is 10 minutes. This is incredibly long to leave a pipeline offline. Using the warning log window of 1 minute felt much safer. ### PR Checklist - [x] Tests updated --- *This backport was created automatically.* Co-authored-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>
…ort] (#5516) ## Backport of #5505 This PR backports #5505 to release/v1.13. ### Original PR Author @kgeckhart ### Description ### Brief description of Pull Request Bump to prometheus patch release to pull in the fix for prometheus/prometheus#17659 which would impact `prometheus.receive_http` which uses the upstream `remote.NewWriteHandler` which was impacted by prometheus/client_golang#1927. ### Issue(s) fixed by this Pull Request Resolves: #5471 ### Notes to the Reviewer I didn't add a test because it's a rather low level implementation details about returning response stats vs not returning response stats. I'm open to adding one though. --- *This backport was created automatically.* Co-authored-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>
… for postgres explain plans [backport] (#5520) ## Backport of #5422 This PR backports #5422 to release/v1.13. ### Original PR Author @rgeyer ### Description ### Brief description of Pull Request During dogfooding we discovered some cases where explain plans were failing to run due to missing or ambiguous schema names. This PR addresses several small issues with the `SET search_path` command which is meant to address these issues. ### Pull Request Details - Sets the search path first, before any other requests are issued, including creating the prepared statement. - Places the datname in double quotes to prevent syntax errors - Explicitly sets the search path for SESSION rather than depending upon the default. ### PR Checklist - [x] Tests updated --- *This backport was created automatically.* Co-authored-by: Ryan Geyer <me@ryangeyer.com>
… MySQL query details collector [backport] (#5519) ## Backport of #5425 This PR backports #5425 to release/v1.13. ### Original PR Author @fridgepoet ### Description This PR handles NULL `query_sample_text` in the MySQL query details collector. This PR addresses a `sql: Scan error on column index 3, name "query_sample_text": converting NULL to string is unsupported` when scanning results from the `summary table samples`. The `query_sample_text` column in `internal/component/database_observability/mysql/collector/query_details.go` has been updated from a `string` to `sql.NullString` to correctly handle NULL values from the database. ### PR Checklist - [ ] Documentation added - [x] Tests updated - [ ] Config converters updated <a href="https://cursor.com/background-agent?bcId=bc-a95f4c5e-11ef-530f-a7b3-448bd2ef0888"><picture><source media="(prefers-color-scheme: dark)" srcset="https://cursor.com/assets/images/open-in-cursor-dark.png"><source media="(prefers-color-scheme: light)" srcset="https://cursor.com/assets/images/open-in-cursor-light.png"><img alt="Open in Cursor" width="131" height="28" src="https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> <a href="https://cursor.com/agents?id=bc-a95f4c5e-11ef-530f-a7b3-448bd2ef0888"><picture><source media="(prefers-color-scheme: dark)" srcset="https://cursor.com/assets/images/open-in-web-dark.png"><source media="(prefers-color-scheme: light)" srcset="https://cursor.com/assets/images/open-in-web-light.png"><img alt="Open in Web" width="114" height="28" src="https://cursor.com/assets/images/open-in-web-dark.png"></picture></a> --- *This backport was created automatically.* Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
…_wait [backport] (#5521) ## Backport of #5478 This PR backports #5478 to release/v1.13. ### Original PR Author @cristiangreco ### Description ### Brief description of Pull Request Do not log wait events with NULL timer_wait (currently logged as "0ms" duration), as they do not provide meaningful information. ### Pull Request Details Avoid logs like ``` wait_event_name="wait/io/socket/sql/client_connection" wait_object_type="SOCKET" wait_time="0.000000ms" sql_text="COMMIT" ``` ### Issue(s) fixed by this Pull Request <!-- Uncomment the following line and fill in an issue number if you want a GitHub issue to be closed automatically when this PR gets merged. --> <!-- Fixes #issue_id --> ### Notes to the Reviewer <!-- Add any relevant notes for the reviewers and testers of this PR. --> ### PR Checklist <!-- Remove items that do not apply. For completed items, change [ ] to [x]. --> - [ ] Documentation added - [x] Tests updated - [ ] Config converters updated --- *This backport was created automatically.* Co-authored-by: Cristian Greco <cristian@regolo.cc>
…t] (#5531) ## Backport of #5528 This PR backports #5528 to release/v1.13. ### Original PR Author @kalleep ### Description ### Pull Request Details Noticed that we do not close file if we cannot get encoding. Review all other paths and we close file properly. I really wish go had something like [errdefer like zig does](https://ziglang.org/documentation/master/#errdefer). ### Issue(s) fixed by this Pull Request <!-- Uncomment the following line and fill in an issue number if you want a GitHub issue to be closed automatically when this PR gets merged. --> <!-- Fixes #issue_id --> ### Notes to the Reviewer <!-- Add any relevant notes for the reviewers and testers of this PR. --> ### PR Checklist <!-- Remove items that do not apply. For completed items, change [ ] to [x]. --> - [ ] Documentation added - [ ] Tests updated - [ ] Config converters updated --- *This backport was created automatically.* Co-authored-by: Karl Persson <23356117+kalleep@users.noreply.github.com>
## Backport of #5529 This PR backports #5529 to release/v1.13. ### Original PR Author @blewis12 ### Description A follow up to #5525 Should also fix [CVE-2025-68121](https://ops.grafana-ops.net/a/grafana-vulnerabilityobs-app/cves/details/CVE-2025-68121) --- *This backport was created automatically.* Co-authored-by: Bejal Lewis <164711649+blewis12@users.noreply.github.com>
## Backport of #5525 This PR backports #5525 to release/v1.13. ### Original PR Author @jharvey10 Co-authored-by: Joe Harvey <51208233+jharvey10@users.noreply.github.com>
🤖 I have created a release *beep* *boop* --- ## [1.13.1](v1.13.0...v1.13.1) (2026-02-13) ### Bug Fixes 🐛 * **database_observability.mysql:** Make query sample text nullable in MySQL query details collector [backport] ([#5519](#5519)) ([fc49bfe](fc49bfe)) * **database_observability.mysql:** Skip wait events with `NULL` timer_wait [backport] ([#5521](#5521)) ([2f43c91](2f43c91)) * **database_observability.postgres:** Improvements to SET search_path for postgres explain plans [backport] ([#5520](#5520)) ([ecbb577](ecbb577)) * **loki.process:** Registration of stage.metric when used inside stage.match [backport] ([#5495](#5495)) ([2bbc37e](2bbc37e)) * **loki.source.docker:** Parse timestamp correctly when log line only contains newline [backport] ([#5496](#5496)) ([55a82f0](55a82f0)) * **loki.source.file:** Close file if we cannot find encoding [backport] ([#5531](#5531)) ([ccda4a5](ccda4a5)) * **prometheus.receive_http:** Bump prometheus patch for bugfix [backport] ([#5516](#5516)) ([b3531fb](b3531fb)) * **scheduling:** Shutdown runnables with a timeout before starting new ones [backport] ([#5443](#5443)) ([d446610](d446610)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: grafana-alloybot[bot] <167359181+grafana-alloybot[bot]@users.noreply.github.com>
Contributor
|
💻 Deploy preview deleted (chore: Forwardport release v1.13.1 to main). |
kgeckhart
force-pushed
the
tmp/manual-forwardport-for-v1.13.1
branch
from
af5bbbd to
bbe11b0
Compare
![https://cursor.com/assets/images/open-in-cursor-dark.png"><source](https://cursor.com/assets/images/open-in-cursor-dark.png"><source){kind=link}
![https://cursor.com/assets/images/open-in-cursor-light.png"><img](https://cursor.com/assets/images/open-in-cursor-light.png"><img){kind=link}
![https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> <a](https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> <a){kind=link}
![https://cursor.com/assets/images/open-in-web-dark.png"><source](https://cursor.com/assets/images/open-in-web-dark.png"><source){kind=link}
![https://cursor.com/assets/images/open-in-web-light.png"><img](https://cursor.com/assets/images/open-in-web-light.png"><img){kind=link}
![https://cursor.com/assets/images/open-in-web-dark.png"></picture></a](https://cursor.com/assets/images/open-in-web-dark.png"></picture></a){kind=link}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Description
Update the
postgres_exporterto versionv0.19.0
(but continue to use our
fork).
The update adds support for configuring the
stat_statementscollectorflags, including
limit,exclude_databases, andexclude_users.Which issue(s) this PR fixes
Fixes #5502
Notes to the Reviewer
PR Checklist
Co-authored-by: Clayton Cornell 131809008+clayton-cornell@users.noreply.github.com