checking wal_level before quering for control checkpoint metrics #20490
Conversation
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
jasonmp85
previously approved these changes
Jun 11, 2025
Review from jasonmp85 is dismissed. Related teams and files:
- database-monitoring-agent
- postgres/datadog_checks/postgres/postgres.py
jasonmp85
approved these changes
Jun 11, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
bonnefoa
reviewed
Jun 12, 2025
Comment on lines
+322
to
+329
| if self.wal_level == 'logical': | ||
| self.log.debug("wal_level is logical, adding control checkpoint metrics") | ||
|
|
||
| if self.version >= V10: | ||
| queries.append(QUERY_PG_CONTROL_CHECKPOINT) | ||
|
|
||
| else: | ||
| queries.append(QUERY_PG_CONTROL_CHECKPOINT_LT_10) |
There was a problem hiding this comment.
As mentioned, this is an Aurora specific issue. Calling pg_current_wal_lsn() on an Aurora will fail with:
SELECT pg_current_wal_lsn();
ERROR: wal_level must be set to 'logical'
HINT: WAL control functions cannot be executed when wal_level < logical.
Normal PG can run this query regardless of the WAL level so the check should also include self.is_aurora is False
3 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 13, 2025
…point metrics (#20500) * Remove extra setting of internal resource tag (#20485) * Initial LiteLLM integration (#20480) * litellm poc * fixtures * litellm implementation * Delete ibm_db2/simple_ibm_db2_check.py * e2e test skip * Rename 1.added to 20480.added * Update manifest.json * Update manifest.json * license * sort metadata * license header * fix manifest * remove unusable metric * labeler * Delete celery/.junit/test-e2e-py3.12.xml * Delete silk/.junit/test-unit-py3.12.xml * Delete strimzi/.junit/test-e2e-py3.12-0.34.xml * Update common.py * Update test_unit.py * Add Agent Integrations to Falco codeowners (#20486) * Falco Integration (#20449) * Falco Integration * E2E * undo manifest changes * add docker-compose.yaml * Lint and fix docker-compose * Falco service check and lint * Add metadata.csv * fix metadata.csv * Changelog fix and add towncrier header * Add version to Agent metadata * Remove falco.version from manifest * Added wal_level check * Added test * updated changelog * Formatting * Updated some logic * checking wal_level before quering for control checkpoint metrics (#20490) * Added wal_level check * Added test * updated changelog * Formatting * Updated some logic * Release new integrations for 7.68.x (#20491) (#20492) * Release new integrations for 7.68.x (#20491) * [Release] Bumped eset_protect version to 1.0.0 * [Release] Bumped kuma version to 1.0.0 * [Release] Bumped litellm version to 1.0.0 * [Release] Bumped microsoft_dns version to 1.0.0 * [Release] Bumped watchguard_firebox version to 1.0.0 * [Release] Update metadata * Remove the in-toto new file to backport to master * Add supported OS classifiers to Falco (#20495) * Updated check and test to account for aurora environments * Added changelog and formatted code * [SQLServer] - Add AO failover monitor template (#20488) * [SQLServer] - Add AO failover monitor template * manifest * Formatting --------- Co-authored-by: Eric Weaver <eweaver755@gmail.com> Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> Co-authored-by: Kyle Neale <kyle.neale@datadoghq.com> Co-authored-by: Juanpe Araque <juanpedro.araque@datadoghq.com> Co-authored-by: Ilia Kurenkov <ilia.kurenkov@datadoghq.com> Co-authored-by: Joel Marcotte <91903666+joelmarcotte@users.noreply.github.com>
datadog-agent-integrations-bot bot
pushed a commit
that referenced
this pull request
Jun 25, 2025
…point metrics (#20500) * Remove extra setting of internal resource tag (#20485) * Initial LiteLLM integration (#20480) * litellm poc * fixtures * litellm implementation * Delete ibm_db2/simple_ibm_db2_check.py * e2e test skip * Rename 1.added to 20480.added * Update manifest.json * Update manifest.json * license * sort metadata * license header * fix manifest * remove unusable metric * labeler * Delete celery/.junit/test-e2e-py3.12.xml * Delete silk/.junit/test-unit-py3.12.xml * Delete strimzi/.junit/test-e2e-py3.12-0.34.xml * Update common.py * Update test_unit.py * Add Agent Integrations to Falco codeowners (#20486) * Falco Integration (#20449) * Falco Integration * E2E * undo manifest changes * add docker-compose.yaml * Lint and fix docker-compose * Falco service check and lint * Add metadata.csv * fix metadata.csv * Changelog fix and add towncrier header * Add version to Agent metadata * Remove falco.version from manifest * Added wal_level check * Added test * updated changelog * Formatting * Updated some logic * checking wal_level before quering for control checkpoint metrics (#20490) * Added wal_level check * Added test * updated changelog * Formatting * Updated some logic * Release new integrations for 7.68.x (#20491) (#20492) * Release new integrations for 7.68.x (#20491) * [Release] Bumped eset_protect version to 1.0.0 * [Release] Bumped kuma version to 1.0.0 * [Release] Bumped litellm version to 1.0.0 * [Release] Bumped microsoft_dns version to 1.0.0 * [Release] Bumped watchguard_firebox version to 1.0.0 * [Release] Update metadata * Remove the in-toto new file to backport to master * Add supported OS classifiers to Falco (#20495) * Updated check and test to account for aurora environments * Added changelog and formatted code * [SQLServer] - Add AO failover monitor template (#20488) * [SQLServer] - Add AO failover monitor template * manifest * Formatting --------- Co-authored-by: Eric Weaver <eweaver755@gmail.com> Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> Co-authored-by: Kyle Neale <kyle.neale@datadoghq.com> Co-authored-by: Juanpe Araque <juanpedro.araque@datadoghq.com> Co-authored-by: Ilia Kurenkov <ilia.kurenkov@datadoghq.com> Co-authored-by: Joel Marcotte <91903666+joelmarcotte@users.noreply.github.com> (cherry picked from commit 08389f8)
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Makes sure that the
wal_levelislogicalbefore trying to query for the control checkpoint metrics introduced in this PR.Motivation
The motivation was to address the issues brought up in this case.
User was getting the error
Error querying pg_control_checkpoint: wal_level must be set to 'logical'when the agent tries to collect the control checkpoint metrics.Review checklist (to be filled by reviewers)
qa/skip-qalabel if the PR doesn't need to be tested during QA.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged