fix: disable pg_settings scrape when --disable-default-metrics is set#1276
Open
ricardbejarano wants to merge 1 commit intoprometheus-community:masterfrom
Open
Conversation
When --disable-default-metrics is passed, pg_settings should also be skipped. Previously, only --disable-settings-metrics would suppress the pg_settings query. This change makes --disable-default-metrics imply disabling pg_settings as well, which matches user expectations. Fixes prometheus-community#712 Signed-off-by: Tommy <tommy@bejarano.io>
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 join this conversation on GitHub. Already have an account? Sign in to comment
1 participant
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.
Description
Fixes #712
When
--disable-default-metricsis passed, users reasonably expect that all default metrics—including thepg_settingsview—are skipped. Previously, only--disable-settings-metricswould suppress thepg_settingsquery;--disable-default-metricshad no effect on it.This change makes
--disable-default-metricsimply skipping pg_settings, by ORing the two flags when callingserver.Scrape.Changes
exporter/datasource.go: passe.disableSettingsMetrics || e.disableDefaultMetricstoserver.Scrapeinstead of juste.disableSettingsMetricsTesting
Existing unit tests pass. The bug was confirmed by users running with
--disable-default-metricsand observingQuerying pg_setting viewdebug lines in the logs.