CLOUDP-351614 - Fix tls deactivation with monitoring #649
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
MCK 1.6.2 Release NotesBug Fixes
|
nammn
force-pushed
the
fix-tls-stopping
branch
from
ae774a7 to
9df6415
Compare
nammn
commented
Dec 17, 2025
| tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ] | ||
| run_on: | ||
| - ubuntu2404-large | ||
| <<: *base_om8_dependency |
Collaborator
Author
There was a problem hiding this comment.
revert me once the image build has been fixed for the database image
nammn
force-pushed
the
fix-tls-stopping
branch
4 times, most recently
from
2d967f1 to
73a98ff
Compare
When TLS is disabled on AppDB, clear stale TLS params from monitoring config's additionalParams to prevent the monitoring agent from trying to use certificate files that no longer exist. Added addTLSParams/clearTLSParams functions that use shared constants to ensure add and remove operations stay in sync.
nammn
force-pushed
the
fix-tls-stopping
branch
from
73a98ff to
b251f50
Compare
1. Fix type assertion in clearTLSParamsFromMonitoringVersion to handle
both map[string]string (locally created) and map[string]interface{}
(from JSON/API unmarshaling)
2. Fix addMonitoring to update TLS params on existing monitoring entries
when TLS is enabled (previously only added TLS for new entries)
3. Fix trueString constant to be "true" instead of "trueString"
MaciejKaras
reviewed
Dec 19, 2025
controllers/om/deployment.go
Outdated
| } | ||
| d.AddMonitoring(log, tls, caFilepath) | ||
| d.ConfigureMonitoring(log, tls, caFilepath) | ||
| d.addBackup(log) |
Collaborator
There was a problem hiding this comment.
nit: if we are renaming addXXX functions to configureXXX let's do the same for addBackup
MaciejKaras
reviewed
Dec 19, 2025
| } | ||
| } | ||
|
|
||
| func addMonitoring(ac *automationconfig.AutomationConfig, log *zap.SugaredLogger, tls bool) { |
Collaborator
There was a problem hiding this comment.
nit: configureMonitoring
MaciejKaras
approved these changes
Dec 19, 2025
Collaborator
MaciejKaras
left a comment
MaciejKaras
left a comment
There was a problem hiding this comment.
Very nice!
It's a pity though that we have different object for Deployment in OM and in AppDB so the logic has to be maintained in two places.
vinilage
approved these changes
Dec 19, 2025
Comment on lines
+1
to
+6
| --- | ||
| kind: fix | ||
| date: 2025-12-16 | ||
| --- | ||
|
|
||
| * Fixed an issue where monitoring agents would fail after disabling TLS on a MongoDB deployment. |
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.
Summary
This pull request fixes the issue: "Monitoring fails to start when disabling TLS"
This pull request addresses a bug where monitoring agents could fail after disabling TLS on a MongoDB deployment, and refactors the code to improve monitoring agent configuration and TLS parameter handling. The changes ensure that TLS-specific parameters are properly cleared when TLS is disabled, preventing monitoring agents from referencing certificate files that no longer exist. The refactor also improves code clarity and reliability by replacing deprecated methods and updating function names to better reflect their behavior.
Proof of Work
Checklist
skip-changeloglabel if not needed