feat: Database_observability.postgres: support excluding DBs in all collectors#5366
Merged
cristiangreco merged 2 commits intomainfrom Jan 28, 2026
Merged
Conversation
ea452a3 to
006566e
Compare
006566e to
51f4afa
Compare
cristiangreco
commented
Jan 28, 2026
| package collector | ||
|
|
||
| import "strings" | ||
| import "github.com/grafana/alloy/internal/component/database_observability" |
Contributor
Author
There was a problem hiding this comment.
Most of the code here has been moved to shared sql_exclusion.go
cristiangreco
commented
Jan 28, 2026
| @@ -0,0 +1,84 @@ | |||
| package database_observability | |||
Contributor
Author
There was a problem hiding this comment.
Tests moved here from deleted file exclude_schemas_test.go
51f4afa to
197c84b
Compare
matthewnolf
reviewed
Jan 28, 2026
| var defaultExclusionClause = buildExclusionClause(defaultExcludedSchemas) | ||
| var defaultExclusionClause = database_observability.BuildExclusionClause(defaultExcludedSchemas) | ||
|
|
||
| func buildExcludedSchemasClause(excludedSchemas []string) string { |
Contributor
There was a problem hiding this comment.
Can we move this to sql_exclusion given it's pretty generic appending of slices
Contributor
Author
There was a problem hiding this comment.
As optimisation, the var defaultExclusionClause is precomputed as string and returned by this method, with the default being different for each engine.
We could move everything into sql_exclusion but would need to carry over the engine-specific lists as well in the top package. I don't have a strong preference, wdyt?
Contributor
There was a problem hiding this comment.
I prefer not to move engine-specifics to top package so let's keep as is. Thanks
Contributor
Author
There was a problem hiding this comment.
Ok I'll leave as-is. (but I've applied the rename you suggested in the other comment)
| import "strings" | ||
| import "github.com/grafana/alloy/internal/component/database_observability" | ||
|
|
||
| var defaultExcludedSchemas = []string{"mysql", "performance_schema", "sys", "information_schema"} |
Contributor
There was a problem hiding this comment.
Suggested change
| var defaultExcludedSchemas = []string{"mysql", "performance_schema", "sys", "information_schema"} | |
| var excludedSchemas = []string{"mysql", "performance_schema", "sys", "information_schema"} |
Contributor
Author
There was a problem hiding this comment.
Have pushed a second commit with the rename.
| var defaultExcludedSchemas = []string{"mysql", "performance_schema", "sys", "information_schema"} | ||
|
|
||
| var defaultExclusionClause = buildExclusionClause(defaultExcludedSchemas) | ||
| var defaultExclusionClause = database_observability.BuildExclusionClause(defaultExcludedSchemas) |
Contributor
There was a problem hiding this comment.
Suggested change
| var defaultExclusionClause = database_observability.BuildExclusionClause(defaultExcludedSchemas) | |
| var exclusionClause = database_observability.BuildExclusionClause(defaultExcludedSchemas) |
Contributor
There was a problem hiding this comment.
Same comments as in internal/component/database_observability/mysql/collector/exclude_schemas.go
matthewnolf
approved these changes
Jan 28, 2026
…ollectors Propagate `exclude_databases` configuration to all PostgreSQL collectors and append the user-defined databases to the default excluded databases. Additionally, change the behaviour of `explain_plans` collector to skip queries from excluded databases instead of processing them. Followup of #5350
197c84b to
9f9fdf8
Compare
Draft
grafana-alloybot bot
pushed a commit
that referenced
this pull request
Jan 28, 2026
…ollectors (#5366) ### Brief description of Pull Request Propagate `exclude_databases` configuration to all PostgreSQL collectors and append the user-defined databases to the default excluded databases. Additionally, change the behaviour of `explain_plans` collector to skip queries from excluded databases instead of processing them. Followup of #5350 ### Pull Request Details <!-- Add a more detailed descripion of the Pull Request here, if needed. --> ### 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 (cherry picked from commit 1fe42db)
Merged
3 tasks
ptodev
pushed a commit
that referenced
this pull request
Jan 28, 2026
…ollectors [backport] (#5383) ## Backport of #5366 This PR backports #5366 to release/v1.13. ### Original PR Author @cristiangreco ### Description ### Brief description of Pull Request Propagate `exclude_databases` configuration to all PostgreSQL collectors and append the user-defined databases to the default excluded databases. Additionally, change the behaviour of `explain_plans` collector to skip queries from excluded databases instead of processing them. Followup of #5350 ### Pull Request Details <!-- Add a more detailed descripion of the Pull Request here, if needed. --> ### 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>
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.
3 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.
Brief description of Pull Request
Propagate
exclude_databasesconfiguration to all PostgreSQL collectors and append the user-defined databases to the default excluded databases.Additionally, change the behaviour of
explain_planscollector to skip queries from excluded databases instead of processing them.Followup of #5350
Pull Request Details
Issue(s) fixed by this Pull Request
Notes to the Reviewer
PR Checklist