Render agent status using status component

cmd/agent/subcommands/jmx/command.go

@@ -33,6 +33,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/flare"
 	"github.com/DataDog/datadog-agent/comp/core/log/logimpl"
 	"github.com/DataDog/datadog-agent/comp/core/secrets"
+	"github.com/DataDog/datadog-agent/comp/core/status"
 	"github.com/DataDog/datadog-agent/comp/core/tagger"
 	"github.com/DataDog/datadog-agent/comp/core/workloadmeta"
 	"github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors"
@@ -137,6 +138,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 			fx.Provide(func() demultiplexer.Component { return nil }),
 			fx.Provide(func() inventorychecks.Component { return nil }),
 			fx.Provide(func() packagesigning.Component { return nil }),
+			fx.Provide(func() status.Component { return nil }),
 			fx.Provide(tagger.NewTaggerParamsForCoreAgent),
 			tagger.Module(),
 		)

cmd/agent/subcommands/run/command.go

@@ -46,6 +46,8 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/log"
 	"github.com/DataDog/datadog-agent/comp/core/log/logimpl"
 	"github.com/DataDog/datadog-agent/comp/core/secrets"
+	"github.com/DataDog/datadog-agent/comp/core/status"
+	"github.com/DataDog/datadog-agent/comp/core/status/statusimpl"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	"github.com/DataDog/datadog-agent/comp/core/tagger"
@@ -57,6 +59,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/dogstatsd/replay"
 	dogstatsdServer "github.com/DataDog/datadog-agent/comp/dogstatsd/server"
 	dogstatsddebug "github.com/DataDog/datadog-agent/comp/dogstatsd/serverDebug"
+	dogstatsdStatusimpl "github.com/DataDog/datadog-agent/comp/dogstatsd/status/statusimpl"
 	"github.com/DataDog/datadog-agent/comp/forwarder"
 	"github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder"
 	orchestratorForwarderImpl "github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorimpl"
@@ -76,13 +79,17 @@ import (
 	netflowServer "github.com/DataDog/datadog-agent/comp/netflow/server"
 	"github.com/DataDog/datadog-agent/comp/otelcol"
 	otelcollector "github.com/DataDog/datadog-agent/comp/otelcol/collector"
+	processagentStatusImpl "github.com/DataDog/datadog-agent/comp/process/status/statusimpl"
 	"github.com/DataDog/datadog-agent/comp/remote-config/rcclient"
+	traceagentStatusImpl "github.com/DataDog/datadog-agent/comp/trace/status/statusimpl"
 	"github.com/DataDog/datadog-agent/pkg/api/healthprobe"
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/providers"
 	"github.com/DataDog/datadog-agent/pkg/cloudfoundry/containertagger"
 	"github.com/DataDog/datadog-agent/pkg/collector"
 	"github.com/DataDog/datadog-agent/pkg/collector/check"
 	"github.com/DataDog/datadog-agent/pkg/collector/corechecks/embed/jmx"
+	"github.com/DataDog/datadog-agent/pkg/collector/corechecks/net"
+	"github.com/DataDog/datadog-agent/pkg/collector/python"
 	"github.com/DataDog/datadog-agent/pkg/commonchecks"
 	pkgconfig "github.com/DataDog/datadog-agent/pkg/config"
 	"github.com/DataDog/datadog-agent/pkg/config/remote/data"
@@ -92,8 +99,16 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/pidfile"
 	"github.com/DataDog/datadog-agent/pkg/serializer"
 	"github.com/DataDog/datadog-agent/pkg/snmp/traps"
+	snmpStatus "github.com/DataDog/datadog-agent/pkg/snmp/traps/status"
+	autodiscoveryStatus "github.com/DataDog/datadog-agent/pkg/status/autodiscovery"
+	clusteragentStatus "github.com/DataDog/datadog-agent/pkg/status/clusteragent"
+	collectorStatus "github.com/DataDog/datadog-agent/pkg/status/collector"
+	endpointsStatus "github.com/DataDog/datadog-agent/pkg/status/endpoints"
 	"github.com/DataDog/datadog-agent/pkg/status/health"
+	httpproxyStatus "github.com/DataDog/datadog-agent/pkg/status/httpproxy"
+	jmxStatus "github.com/DataDog/datadog-agent/pkg/status/jmx"
 	otlpStatus "github.com/DataDog/datadog-agent/pkg/status/otlp"
+	systemprobeStatus "github.com/DataDog/datadog-agent/pkg/status/systemprobe"
 	pkgTelemetry "github.com/DataDog/datadog-agent/pkg/telemetry"
 	"github.com/DataDog/datadog-agent/pkg/util"
 	pkgcommon "github.com/DataDog/datadog-agent/pkg/util/common"
@@ -189,6 +204,7 @@ func run(log log.Component,
 	_ langDetectionCl.Component,
 	agentAPI internalAPI.Component,
 	_ packagesigning.Component,
+	statusComponent status.Component,
 ) error {
 	defer func() {
 		stopAgent(cliParams, server, demultiplexer, agentAPI)
@@ -249,6 +265,7 @@ func run(log log.Component,
 		invAgent,
 		agentAPI,
 		invChecks,
+		statusComponent,
 	); err != nil {
 		return err
 	}
@@ -282,6 +299,24 @@ func getSharedFxOption() fx.Option {
 		collectors.GetCatalog(),
 		fx.Provide(defaults.DefaultParams),
 		workloadmeta.Module(),
+		fx.Supply(
+			status.Params{
+				PythonVersionGetFunc: func() string { return python.GetPythonVersion() },
+			},
+			status.NewInformationProvider(collectorStatus.Provider{}),
+			status.NewHeaderInformationProvider(net.Provider{}),
+			status.NewInformationProvider(jmxStatus.Provider{}),
+			status.NewInformationProvider(endpointsStatus.Provider{}),
+			status.NewInformationProvider(snmpStatus.GetProvider()),
+			status.NewInformationProvider(clusteragentStatus.GetProvider()),
+			status.NewInformationProvider(systemprobeStatus.GetProvider()),
+			status.NewInformationProvider(httpproxyStatus.GetProvider()),
+			status.NewInformationProvider(autodiscoveryStatus.GetProvider()),
+		),
+		traceagentStatusImpl.Module(),
+		processagentStatusImpl.Module(),
+		dogstatsdStatusimpl.Module(),
+		statusimpl.Module(),
 		apiimpl.Module(),
 
 		dogstatsd.Bundle(),
@@ -352,6 +387,7 @@ func startAgent(
 	invAgent inventoryagent.Component,
 	agentAPI internalAPI.Component,
 	invChecks inventorychecks.Component,
+	_ status.Component,
 ) error {
 
 	var err error

cmd/agent/subcommands/run/command_windows.go

@@ -40,6 +40,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/log"
 	"github.com/DataDog/datadog-agent/comp/core/log/logimpl"
 	"github.com/DataDog/datadog-agent/comp/core/secrets"
+	"github.com/DataDog/datadog-agent/comp/core/status"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	"github.com/DataDog/datadog-agent/comp/core/tagger"
@@ -104,6 +105,7 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error
 			_ netflowServer.Component,
 			agentAPI internalAPI.Component,
 			pkgSigning packagesigning.Component,
+			statusComponent status.Component,
 		) error {
 
 			defer StopAgentWithDefaults(server, demultiplexer, agentAPI)
@@ -127,6 +129,7 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error
 				invAgent,
 				agentAPI,
 				invChecks,
+				statusComponent,
 			)
 			if err != nil {
 				return err

cmd/agent/subcommands/status/command.go

@@ -25,7 +25,6 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	"github.com/DataDog/datadog-agent/pkg/api/util"
 	pkgconfig "github.com/DataDog/datadog-agent/pkg/config"
-	"github.com/DataDog/datadog-agent/pkg/status/render"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 	"github.com/DataDog/datadog-agent/pkg/util/scrubber"
 
@@ -150,6 +149,12 @@ func requestStatus(config config.Component, cliParams *cliParams) error {
 		v.Set("verbose", "true")
 	}
 
+	if cliParams.prettyPrintJSON || cliParams.jsonStatus {
+		v.Set("format", "json")
+	} else {
+		v.Set("format", "text")
+	}
+
 	url := url.URL{
 		Scheme:   "https",
 		Host:     fmt.Sprintf("%v:%v", ipcAddress, config.GetInt("cmd_port")),
@@ -170,11 +175,7 @@ func requestStatus(config config.Component, cliParams *cliParams) error {
 	} else if cliParams.jsonStatus {
 		s = string(r)
 	} else {
-		formattedStatus, err := render.FormatStatus(r)
-		if err != nil {
-			return err
-		}
-		s = scrubMessage(formattedStatus)
+		s = scrubMessage(string(r))
 	}
 
 	if cliParams.statusFilePath != "" {

comp/README.md

@@ -135,6 +135,10 @@ Package serverdebug implements a component to run the dogstatsd server debug
 
 Package statsd implements a component to get a statsd client.
 
+### [comp/dogstatsd/status](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/dogstatsd/status)
+
+Package status implements the core status component information provider interface
+
 ## [comp/etw](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/etw) (Component Bundle)
 
 *Datadog Team*: windows-agent
@@ -323,6 +327,10 @@ Package rtcontainercheck implements a component to handle realtime Container dat
 
 Package runner implements a component to run data collection checks in the Process Agent.
 
+### [comp/process/status](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/process/status)
+
+Package status implements the core status component information provider interface
+
 ### [comp/process/submitter](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/process/submitter)
 
 Package submitter implements a component to submit collected data in the Process Agent to
@@ -362,3 +370,7 @@ Package trace implements the "trace" bundle, providing components for the Trace
 
 Package config implements a component to handle trace-agent configuration.  This
 component temporarily wraps pkg/trace/config.
+
+### [comp/trace/status](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/trace/status)
+
+Package status implements the core status component information provider interface

comp/aggregator/demultiplexer/demultiplexerimpl/demultiplexer.go

@@ -9,16 +9,18 @@ package demultiplexerimpl
 import (
 	"context"
 
+	"go.uber.org/fx"
+
 	demultiplexerComp "github.com/DataDog/datadog-agent/comp/aggregator/demultiplexer"
 	"github.com/DataDog/datadog-agent/comp/aggregator/diagnosesendermanager"
 	"github.com/DataDog/datadog-agent/comp/core/log"
+	"github.com/DataDog/datadog-agent/comp/core/status"
 	"github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder"
 	orchestratorforwarder "github.com/DataDog/datadog-agent/comp/forwarder/orchestrator"
 	"github.com/DataDog/datadog-agent/pkg/aggregator"
 	"github.com/DataDog/datadog-agent/pkg/aggregator/sender"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 	"github.com/DataDog/datadog-agent/pkg/util/hostname"
-	"go.uber.org/fx"
 )
 
 // Module defines the fx options for this component.
@@ -51,7 +53,8 @@ type provides struct {
 	// implements diagnosesendermanager.Component). This has the nice consequence of preventing having
 	// demultiplexerimpl.Module and diagnosesendermanagerimpl.Module in the same fx.App because there would
 	// be two ways to create diagnosesendermanager.Component.
-	SenderManager diagnosesendermanager.Component
+	SenderManager  diagnosesendermanager.Component
+	StatusProvider status.InformationProvider
 }
 
 func newDemultiplexer(deps dependencies) (provides, error) {
@@ -78,6 +81,9 @@ func newDemultiplexer(deps dependencies) (provides, error) {
 	return provides{
 		Comp:          demultiplexer,
 		SenderManager: demultiplexer,
+		StatusProvider: status.NewInformationProvider(demultiplexerStatus{
+			Log: deps.Log,
+		}),
 	}, nil
 }
 

comp/aggregator/demultiplexer/demultiplexerimpl/status.go

@@ -0,0 +1,74 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2023-present Datadog, Inc.
+
+// Package demultiplexerimpl defines the aggregator demultiplexer
+package demultiplexerimpl
+
+import (
+	"embed"
+	"encoding/json"
+	"expvar"
+	"io"
+
+	checkstats "github.com/DataDog/datadog-agent/pkg/collector/check/stats"
+
+	"github.com/DataDog/datadog-agent/comp/core/log"
+	"github.com/DataDog/datadog-agent/comp/core/status"
+)
+
+//go:embed status_templates
+var templatesFS embed.FS
+
+type demultiplexerStatus struct {
+	Log log.Component
+}
+
+func (d demultiplexerStatus) getStatusInfo() map[string]interface{} {
+	stats := make(map[string]interface{})
+
+	d.populateStatus(stats)
+
+	return stats
+}
+
+func (d demultiplexerStatus) populateStatus(stats map[string]interface{}) {
+	aggregatorStatsJSON := []byte(expvar.Get("aggregator").String())
+	aggregatorStats := make(map[string]interface{})
+	json.Unmarshal(aggregatorStatsJSON, &aggregatorStats) //nolint:errcheck
+	stats["aggregatorStats"] = aggregatorStats
+	s, err := checkstats.TranslateEventPlatformEventTypes(stats["aggregatorStats"])
+	if err != nil {
+		d.Log.Debugf("failed to translate event platform event types in aggregatorStats: %s", err.Error())
+	} else {
+		stats["aggregatorStats"] = s
+	}
+}
+
+// Name returns the name
+func (d demultiplexerStatus) Name() string {
+	return "Aggregator"
+}
+
+// Section return the section
+func (d demultiplexerStatus) Section() string {
+	return "aggregator"
+}
+
+// JSON populates the status map
+func (d demultiplexerStatus) JSON(_ bool, stats map[string]interface{}) error {
+	d.populateStatus(stats)
+
+	return nil
+}
+
+// Text renders the text output
+func (d demultiplexerStatus) Text(_ bool, buffer io.Writer) error {
+	return status.RenderText(templatesFS, "aggregator.tmpl", buffer, d.getStatusInfo())
+}
+
+// HTML renders the html output
+func (d demultiplexerStatus) HTML(_ bool, buffer io.Writer) error {
+	return status.RenderHTML(templatesFS, "aggregatorHTML.tmpl", buffer, d.getStatusInfo())
+}

comp/aggregator/demultiplexer/demultiplexerimpl/status_templates/aggregator.tmpl

@@ -0,0 +1,52 @@
+{{- with .aggregatorStats }}
+{{- if .ChecksMetricSample }}
+  Checks Metric Sample: {{humanize .ChecksMetricSample}}
+{{- end }}
+{{- if .DogstatsdMetricSample}}
+  Dogstatsd Metric Sample: {{humanize .DogstatsdMetricSample}}
+{{- end }}
+{{- if .Event}}
+  Event: {{humanize .Event}}
+{{- end }}
+{{- if .EventsFlushed}}
+  Events Flushed: {{humanize .EventsFlushed}}
+{{- end }}
+{{- if .EventsFlushErrors}}
+  Events Flush Errors: {{humanize .EventsFlushErrors}}
+{{- end }}
+{{- if .NumberOfFlush}}
+  Number Of Flushes: {{humanize .NumberOfFlush}}
+{{- end }}
+{{- if .SeriesFlushed}}
+  Series Flushed: {{humanize .SeriesFlushed}}
+{{- end }}
+{{- if .SeriesFlushErrors}}
+  Series Flush Errors: {{humanize .SeriesFlushErrors}}
+{{- end }}
+{{- if .ServiceCheck}}
+  Service Check: {{humanize .ServiceCheck}}
+{{- end }}
+{{- if .ServiceCheckFlushed}}
+  Service Checks Flushed: {{humanize .ServiceCheckFlushed}}
+{{- end }}
+{{- if .ServiceCheckFlushErrors}}
+  Service Checks Flush Errors: {{humanize .ServiceCheckFlushErrors}}
+{{- end }}
+{{- if .SketchesFlushed}}
+  Sketches Flushed: {{humanize .SketchesFlushed}}
+{{- end }}
+{{- if .SketchesFlushErrors}}
+  Sketches Flush Errors: {{humanize .SketchesFlushErrors}}
+{{- end }}
+{{- if .ChecksHistogramBucketMetricSample }}
+  Checks Histogram Bucket Metric Sample: {{humanize .ChecksHistogramBucketMetricSample}}
+{{- end }}
+{{- if .EventPlatformEvents }}
+{{- range $k, $v := .EventPlatformEvents }}
+  {{ $k }}: {{humanize $v}}
+{{- end }}
+{{- end }}
+{{- if .HostnameUpdate}}
+  Hostname Update: {{humanize .HostnameUpdate}}
+{{- end }}
+{{- end }}