[ASCII-145] Update pkg/status/render to only handle rendering logic
#20824
Conversation
This file contains 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
GustavoCaso
commented
Nov 13, 2023
| } | ||
|
|
||
| aggregatorStats := stats["aggregatorStats"] | ||
| s, err := checkstats.TranslateEventPlatformEventTypes(aggregatorStats) |
There was a problem hiding this comment.
We already call this function when fetching the status in the pkg/status package.
datadog-agent/pkg/status/status.go
Line 335 in 30cff43
GustavoCaso
commented
Nov 13, 2023
Comment on lines
-35
to
-39
| if forwarderStatsMap, ok := forwarderStats.(map[string]interface{}); ok { | ||
| forwarderStatsMap["config"] = stats["config"] | ||
| } else { | ||
| log.Warn("The Forwarder status format is invalid. Some parts of the `Forwarder` section may be missing.") | ||
| } |
There was a problem hiding this comment.
I aggregated all forwarded stats within the same function when fetching the status.
datadog-agent/pkg/status/status.go
Lines 320 to 327 in 30cff43
GustavoCaso
commented
Nov 13, 2023
| } | ||
|
|
||
| netflowFunc := func() error { | ||
| if server.IsEnabled() { |
There was a problem hiding this comment.
Move that check to pkg/status GetStatus() function
GustavoCaso
commented
Nov 13, 2023
| return nil | ||
| } | ||
| snmpTrapFunc := func() error { | ||
| if traps.IsEnabled(config.Datadog) { |
There was a problem hiding this comment.
Move that check to pkg/status GetStatus() function
GustavoCaso
commented
Nov 13, 2023
| return renderStatusTemplate(b, "/remoteconfig.tmpl", stats) | ||
| } | ||
| otlpFunc := func() error { | ||
| if otlp.IsDisplayed() { |
There was a problem hiding this comment.
Move that check to pkg/status GetStatus() function
Go Package Import DifferencesBaseline: ad3cf2e
|
GustavoCaso
changed the title
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
d83219a
to
125e8da
Compare
10 tasks
hush-hush
approved these changes
Nov 15, 2023
GustavoCaso
force-pushed
the
extract-render-subpackge-from-status
branch
from
58dec94
to
fe628cc
Compare
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
125e8da
to
7b13bb5
Compare
GustavoCaso
force-pushed
the
extract-render-subpackge-from-status
branch
from
5f9922f
to
65ca3d3
Compare
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
7b13bb5
to
747e70e
Compare
GustavoCaso
force-pushed
the
extract-render-subpackge-from-status
branch
from
65ca3d3
to
7d61e71
Compare
GustavoCaso
changed the title
Base automatically changed from
extract-render-subpackge-from-status
to
main
November 20, 2023 17:00
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
747e70e
to
1b08647
Compare
GustavoCaso
changed the title
pkg/status/render to only handle rendering logic
…ventPlatformEventTypes twice
…d move config check outside of the render package
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
1b08647
to
6c8847a
Compare
GustavoCaso
force-pushed
the
update-status-templates-key-access
branch
from
7134c88
to
05d8059
Compare
paulcacheux
approved these changes
Nov 22, 2023
kkhor-datadog
approved these changes
Nov 22, 2023
knusbaum
approved these changes
Nov 22, 2023
10 tasks
10 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?
The PR builds on top of the work done on #20776
Ensure the
status/renderpackage mainly deals with the rendering responsibility.The changes within the PR ensure no extra conversation nor check if a feature is enabled with the render package. Also, remove the indirection created of having different key names on the templates than the ones used when fetching the data.
This work will be convenient to continue extracting the different status sub-packages.
The end goal is that each sub-package is responsible for fetching and rendering the information. by making the render package only handle rending behaviour, it is going to be easier to extract this functionality in the future
Motivation
Additional Notes
Possible Drawbacks / Trade-offs
Describe how to test/QA your changes
The output of the status commands works as expected.
Normal agent
agent statusagent launch-guiCluster agent
agent statusProcess agent
/opt/datadog-agent/embedded/bin/process-agent statusSecurity Agent
agent statusReviewer's Checklist
Triagemilestone is set.major_changelabel if your change either has a major impact on the code base, is impacting multiple teams or is changing important well-established internals of the Agent. This label will be use during QA to make sure each team pay extra attention to the changed behavior. For any customer facing change use a releasenote.changelog/no-changeloglabel has been applied.qa/skip-qalabel is not applied.team/..label has been applied, indicating the team(s) that should QA this change.need-change/operatorandneed-change/helmlabels have been applied.k8s/<min-version>label, indicating the lowest Kubernetes version compatible with this feature.