Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: usm: Added USM to system-probe.yaml.example file #14908

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkg/config/config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,20 @@ api_key:

{{ end -}}

{{- if .UniversalServiceMonitoringModule }}

#############################################################
## System Probe Universal Service monitoring Configuration ##
#############################################################

# service_monitoring_config:
## @param enabled - boolean - optional - default: false
## Set to true to enable the Universal Service Monitoring Module of the System Probe
#
# enabled: false

{{ end -}}

{{- if .SecurityModule }}

##########################################
Expand Down
78 changes: 40 additions & 38 deletions pkg/config/render_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,41 +19,42 @@ import (

// context contains the context used to render the config file template
type context struct {
OS string
Common bool
Agent bool
Python bool // Sub-option of Agent
BothPythonPresent bool // Sub-option of Agent - Python
Metadata bool
InternalProfiling bool
Dogstatsd bool
LogsAgent bool
JMX bool
Autoconfig bool
Logging bool
Autodiscovery bool
DockerTagging bool
Kubelet bool
KubernetesTagging bool
ECS bool
Containerd bool
CRI bool
ProcessAgent bool
SystemProbe bool
KubeApiServer bool
TraceAgent bool
ClusterAgent bool
ClusterChecks bool
AdmissionController bool
CloudFoundryBBS bool
CloudFoundryCC bool
Compliance bool
SNMP bool
SecurityModule bool
SecurityAgent bool
NetworkModule bool // Sub-module of System Probe
PrometheusScrape bool
OTLP bool
OS string
Common bool
Agent bool
Python bool // Sub-option of Agent
BothPythonPresent bool // Sub-option of Agent - Python
Metadata bool
InternalProfiling bool
Dogstatsd bool
LogsAgent bool
JMX bool
Autoconfig bool
Logging bool
Autodiscovery bool
DockerTagging bool
Kubelet bool
KubernetesTagging bool
ECS bool
Containerd bool
CRI bool
ProcessAgent bool
SystemProbe bool
KubeApiServer bool
TraceAgent bool
ClusterAgent bool
ClusterChecks bool
AdmissionController bool
CloudFoundryBBS bool
CloudFoundryCC bool
Compliance bool
SNMP bool
SecurityModule bool
SecurityAgent bool
NetworkModule bool // Sub-module of System Probe
UniversalServiceMonitoringModule bool // Sub-module of System Probe
PrometheusScrape bool
OTLP bool
}

func mkContext(buildType string) context {
Expand Down Expand Up @@ -104,9 +105,10 @@ func mkContext(buildType string) context {
}
case "system-probe":
return context{
SystemProbe: true,
NetworkModule: true,
SecurityModule: true,
SystemProbe: true,
NetworkModule: true,
UniversalServiceMonitoringModule: true,
SecurityModule: true,
}
case "dogstatsd":
return context{
Expand Down