[ASCII-145] Update pkg/status/render to only handle rendering logic
#20824
+142
−210
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,12 +15,7 @@ import ( | |
| "path" | ||
| "text/template" | ||
|
|
||
| "github.com/DataDog/datadog-agent/pkg/config" | ||
| ) | ||
|
|
||
| var fmap = Textfmap() | ||
|
|
@@ -31,28 +26,6 @@ func FormatStatus(data []byte) (string, error) { | |
| if renderError != "" || err != nil { | ||
| return renderError, err | ||
| } | ||
|
There was a problem hiding this comment. We already call this function when fetching the status in the datadog-agent/pkg/status/status.go Line 335 in 30cff43 |
||
| title := fmt.Sprintf("Agent (v%s)", stats["version"]) | ||
| stats["title"] = title | ||
|
|
||
|
|
@@ -62,55 +35,20 @@ func FormatStatus(data []byte) (string, error) { | |
| return renderStatusTemplate(b, "/collector.tmpl", stats) | ||
| } | ||
| jmxFetchFunc := func() error { return renderStatusTemplate(b, "/jmxfetch.tmpl", stats) } | ||
|
There was a problem hiding this comment. Move that check to |
||
|
There was a problem hiding this comment. Move that check to |
||
|
There was a problem hiding this comment. Move that check to |
||
| forwarderFunc := func() error { return renderStatusTemplate(b, "/forwarder.tmpl", stats) } | ||
| endpointsFunc := func() error { return renderStatusTemplate(b, "/endpoints.tmpl", stats) } | ||
| logsAgentFunc := func() error { return renderStatusTemplate(b, "/logsagent.tmpl", stats) } | ||
| systemProbeFunc := func() error { return renderStatusTemplate(b, "/systemprobe.tmpl", stats) } | ||
| processAgentFunc := func() error { return renderStatusTemplate(b, "/process-agent.tmpl", stats) } | ||
| traceAgentFunc := func() error { return renderStatusTemplate(b, "/trace-agent.tmpl", stats) } | ||
| aggregatorFunc := func() error { return renderStatusTemplate(b, "/aggregator.tmpl", stats) } | ||
| dogstatsdFunc := func() error { return renderStatusTemplate(b, "/dogstatsd.tmpl", stats) } | ||
| clusterAgentFunc := func() error { return renderStatusTemplate(b, "/clusteragent.tmpl", stats) } | ||
| snmpTrapFunc := func() error { return renderStatusTemplate(b, "/snmp-traps.tmpl", stats) } | ||
| netflowFunc := func() error { return renderStatusTemplate(b, "/netflow.tmpl", stats) } | ||
| autodiscoveryFunc := func() error { return renderStatusTemplate(b, "/autodiscovery.tmpl", stats) } | ||
| remoteConfigFunc := func() error { return renderStatusTemplate(b, "/remoteconfig.tmpl", stats) } | ||
| otlpFunc := func() error { return renderStatusTemplate(b, "/otlp.tmpl", stats) } | ||
|
|
||
| var renderFuncs []func() error | ||
| if config.IsCLCRunner() { | ||
|
|
@@ -141,14 +79,11 @@ func FormatDCAStatus(data []byte) (string, error) { | |
| return renderError, err | ||
| } | ||
|
|
||
| // We nil these keys because we do not want to display that information in the collector template | ||
| stats["pyLoaderStats"] = nil | ||
| stats["pythonInit"] = nil | ||
| stats["inventories"] = nil | ||
|
|
||
| title := fmt.Sprintf("Datadog Cluster Agent (v%s)", stats["version"]) | ||
| stats["title"] = title | ||
|
|
||
|
|
@@ -160,24 +95,21 @@ func FormatDCAStatus(data []byte) (string, error) { | |
| if err := renderStatusTemplate(b, "/collector.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/forwarder.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/endpoints.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/logsagent.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/autodiscovery.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
|
|
||
| if err := renderStatusTemplate(b, "/orchestrator.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderErrors(b, errs); err != nil { | ||
| fmt.Println(err) | ||
|
|
@@ -209,9 +141,7 @@ func FormatSecurityAgentStatus(data []byte) (string, error) { | |
| if renderError != "" || err != nil { | ||
| return renderError, err | ||
| } | ||
|
|
||
| title := fmt.Sprintf("Datadog Security Agent (v%s)", stats["version"]) | ||
| stats["title"] = title | ||
|
|
||
|
|
@@ -220,10 +150,10 @@ func FormatSecurityAgentStatus(data []byte) (string, error) { | |
| if err := renderStatusTemplate(b, "/header.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/runtimesecurity.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderStatusTemplate(b, "/compliance.tmpl", stats); err != nil { | ||
| errs = append(errs, err) | ||
| } | ||
| if err := renderErrors(b, errs); err != nil { | ||
|
|
@@ -287,28 +217,6 @@ func FormatCheckStats(data []byte) (string, error) { | |
| return b.String(), nil | ||
| } | ||
|
|
||
| //go:embed templates | ||
| var templatesFS embed.FS | ||
|
|
||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| {{- with .clusterAgentStatus -}} | ||
| ===================== | ||
| Datadog Cluster Agent | ||
| ===================== | ||
| {{ if .DetectionError }} | ||
| - Could not detect the Datadog Cluster Agent's endpoint: {{ .DetectionError }} | ||
| {{ else }} | ||
| - Datadog Cluster Agent endpoint detected: {{ .Endpoint }} | ||
| {{- end }} | ||
| {{- if .ConnectionError }} | ||
| - Could not reach the Datadog Cluster Agent: {{ .ConnectionError }} | ||
| {{- end }} | ||
| {{- if not .Version }} | ||
| - Could not retrieve the version of the Datadog Cluster Agent. | ||
| {{ else }} | ||
| Successfully connected to the Datadog Cluster Agent. | ||
| - Running: {{ .Version }} | ||
| {{- end }} | ||
| {{- end -}} |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,18 @@ | ||
| {{/* | ||
| NOTE: Changes made to this template should be reflected on the following templates, if applicable: | ||
| * cmd/agent/gui/views/templates/generalStatus.tmpl | ||
hush-hush marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */}}========== | ||
| Endpoints | ||
| ========== | ||
| {{- with .endpointsInfos -}} | ||
| {{ range $key, $value := .}} | ||
| {{$key}} - API Key{{ if gt (len $value) 1}}s{{end}} ending with: | ||
| {{- range $idx, $apikey := $value }} | ||
| - {{$apikey}} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- else }} | ||
|
|
||
| No endpoints information. The agent may be misconfigured. | ||
| {{end }} | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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