Skip to content

Commit 98f90bb

Browse files
YumasiYumasi
committed
discovery: add system-probe-lite support
1 parent a312b88 commit 98f90bb

12 files changed

Lines changed: 339 additions & 13 deletions

‎api/datadoghq/v2alpha1/datadogagent_types.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,20 @@ type ServiceDiscoveryFeatureConfig struct {
647647
// +optional
648648
Enabled *bool `json:"enabled,omitempty"`
649649

650+
// EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
651+
// This distinguishes explicit opt-in (fallback: full system-probe) from default-on
652+
// (fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
653+
// Default: false
654+
// +optional
655+
EnabledByDefault *bool `json:"enabledByDefault,omitempty"`
656+
657+
// UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
658+
// uses the lightweight system-probe-lite binary instead of full system-probe.
659+
// If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
660+
// Default: false
661+
// +optional
662+
UseSystemProbeLite *bool `json:"useSystemProbeLite,omitempty"`
663+
650664
// Enables the service discovery network stats collection.
651665
// Default: true
652666
// +optional

‎api/datadoghq/v2alpha1/zz_generated.deepcopy.go‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,6 +2488,13 @@ spec:
24882488
Enables the service discovery check.
24892489
Default: false
24902490
type: boolean
2491+
enabledByDefault:
2492+
description: |-
2493+
EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
2494+
This distinguishes explicit opt-in (fallback: full system-probe) from default-on
2495+
(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
2496+
Default: false
2497+
type: boolean
24912498
networkStats:
24922499
description: |-
24932500
Enables the service discovery network stats collection.
@@ -2499,6 +2506,13 @@ spec:
24992506
Default: true
25002507
type: boolean
25012508
type: object
2509+
useSystemProbeLite:
2510+
description: |-
2511+
UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
2512+
uses the lightweight system-probe-lite binary instead of full system-probe.
2513+
If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
2514+
Default: false
2515+
type: boolean
25022516
type: object
25032517
tcpQueueLength:
25042518
description: TCPQueueLength configuration.
@@ -10904,6 +10918,13 @@ spec:
1090410918
Enables the service discovery check.
1090510919
Default: false
1090610920
type: boolean
10921+
enabledByDefault:
10922+
description: |-
10923+
EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
10924+
This distinguishes explicit opt-in (fallback: full system-probe) from default-on
10925+
(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
10926+
Default: false
10927+
type: boolean
1090710928
networkStats:
1090810929
description: |-
1090910930
Enables the service discovery network stats collection.
@@ -10915,6 +10936,13 @@ spec:
1091510936
Default: true
1091610937
type: boolean
1091710938
type: object
10939+
useSystemProbeLite:
10940+
description: |-
10941+
UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
10942+
uses the lightweight system-probe-lite binary instead of full system-probe.
10943+
If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
10944+
Default: false
10945+
type: boolean
1091810946
type: object
1091910947
tcpQueueLength:
1092010948
description: TCPQueueLength configuration.

‎config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,6 +2588,10 @@
25882588
"description": "Enables the service discovery check.\nDefault: false",
25892589
"type": "boolean"
25902590
},
2591+
"enabledByDefault": {
2592+
"description": "EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.\nThis distinguishes explicit opt-in (fallback: full system-probe) from default-on\n(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.\nDefault: false",
2593+
"type": "boolean"
2594+
},
25912595
"networkStats": {
25922596
"additionalProperties": false,
25932597
"description": "Enables the service discovery network stats collection.\nDefault: true",
@@ -2598,6 +2602,10 @@
25982602
}
25992603
},
26002604
"type": "object"
2605+
},
2606+
"useSystemProbeLite": {
2607+
"description": "UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,\nuses the lightweight system-probe-lite binary instead of full system-probe.\nIf other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.\nDefault: false",
2608+
"type": "boolean"
26012609
}
26022610
},
26032611
"type": "object"
@@ -10738,6 +10746,10 @@
1073810746
"description": "Enables the service discovery check.\nDefault: false",
1073910747
"type": "boolean"
1074010748
},
10749+
"enabledByDefault": {
10750+
"description": "EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.\nThis distinguishes explicit opt-in (fallback: full system-probe) from default-on\n(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.\nDefault: false",
10751+
"type": "boolean"
10752+
},
1074110753
"networkStats": {
1074210754
"additionalProperties": false,
1074310755
"description": "Enables the service discovery network stats collection.\nDefault: true",
@@ -10748,6 +10760,10 @@
1074810760
}
1074910761
},
1075010762
"type": "object"
10763+
},
10764+
"useSystemProbeLite": {
10765+
"description": "UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,\nuses the lightweight system-probe-lite binary instead of full system-probe.\nIf other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.\nDefault: false",
10766+
"type": "boolean"
1075110767
}
1075210768
},
1075310769
"type": "object"

‎config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,6 +2488,13 @@ spec:
24882488
Enables the service discovery check.
24892489
Default: false
24902490
type: boolean
2491+
enabledByDefault:
2492+
description: |-
2493+
EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
2494+
This distinguishes explicit opt-in (fallback: full system-probe) from default-on
2495+
(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
2496+
Default: false
2497+
type: boolean
24912498
networkStats:
24922499
description: |-
24932500
Enables the service discovery network stats collection.
@@ -2499,6 +2506,13 @@ spec:
24992506
Default: true
25002507
type: boolean
25012508
type: object
2509+
useSystemProbeLite:
2510+
description: |-
2511+
UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
2512+
uses the lightweight system-probe-lite binary instead of full system-probe.
2513+
If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
2514+
Default: false
2515+
type: boolean
25022516
type: object
25032517
tcpQueueLength:
25042518
description: TCPQueueLength configuration.

‎config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,6 +2592,10 @@
25922592
"description": "Enables the service discovery check.\nDefault: false",
25932593
"type": "boolean"
25942594
},
2595+
"enabledByDefault": {
2596+
"description": "EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.\nThis distinguishes explicit opt-in (fallback: full system-probe) from default-on\n(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.\nDefault: false",
2597+
"type": "boolean"
2598+
},
25952599
"networkStats": {
25962600
"additionalProperties": false,
25972601
"description": "Enables the service discovery network stats collection.\nDefault: true",
@@ -2602,6 +2606,10 @@
26022606
}
26032607
},
26042608
"type": "object"
2609+
},
2610+
"useSystemProbeLite": {
2611+
"description": "UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,\nuses the lightweight system-probe-lite binary instead of full system-probe.\nIf other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.\nDefault: false",
2612+
"type": "boolean"
26052613
}
26062614
},
26072615
"type": "object"

‎config/crd/bases/v1/datadoghq.com_datadogagents.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,6 +2488,13 @@ spec:
24882488
Enables the service discovery check.
24892489
Default: false
24902490
type: boolean
2491+
enabledByDefault:
2492+
description: |-
2493+
EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
2494+
This distinguishes explicit opt-in (fallback: full system-probe) from default-on
2495+
(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
2496+
Default: false
2497+
type: boolean
24912498
networkStats:
24922499
description: |-
24932500
Enables the service discovery network stats collection.
@@ -2499,6 +2506,13 @@ spec:
24992506
Default: true
25002507
type: boolean
25012508
type: object
2509+
useSystemProbeLite:
2510+
description: |-
2511+
UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
2512+
uses the lightweight system-probe-lite binary instead of full system-probe.
2513+
If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
2514+
Default: false
2515+
type: boolean
25022516
type: object
25032517
tcpQueueLength:
25042518
description: TCPQueueLength configuration.
@@ -10954,6 +10968,13 @@ spec:
1095410968
Enables the service discovery check.
1095510969
Default: false
1095610970
type: boolean
10971+
enabledByDefault:
10972+
description: |-
10973+
EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.
10974+
This distinguishes explicit opt-in (fallback: full system-probe) from default-on
10975+
(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.
10976+
Default: false
10977+
type: boolean
1095710978
networkStats:
1095810979
description: |-
1095910980
Enables the service discovery network stats collection.
@@ -10965,6 +10986,13 @@ spec:
1096510986
Default: true
1096610987
type: boolean
1096710988
type: object
10989+
useSystemProbeLite:
10990+
description: |-
10991+
UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,
10992+
uses the lightweight system-probe-lite binary instead of full system-probe.
10993+
If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.
10994+
Default: false
10995+
type: boolean
1096810996
type: object
1096910997
tcpQueueLength:
1097010998
description: TCPQueueLength configuration.

‎config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,6 +2588,10 @@
25882588
"description": "Enables the service discovery check.\nDefault: false",
25892589
"type": "boolean"
25902590
},
2591+
"enabledByDefault": {
2592+
"description": "EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.\nThis distinguishes explicit opt-in (fallback: full system-probe) from default-on\n(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.\nDefault: false",
2593+
"type": "boolean"
2594+
},
25912595
"networkStats": {
25922596
"additionalProperties": false,
25932597
"description": "Enables the service discovery network stats collection.\nDefault: true",
@@ -2598,6 +2602,10 @@
25982602
}
25992603
},
26002604
"type": "object"
2605+
},
2606+
"useSystemProbeLite": {
2607+
"description": "UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,\nuses the lightweight system-probe-lite binary instead of full system-probe.\nIf other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.\nDefault: false",
2608+
"type": "boolean"
26012609
}
26022610
},
26032611
"type": "object"
@@ -10803,6 +10811,10 @@
1080310811
"description": "Enables the service discovery check.\nDefault: false",
1080410812
"type": "boolean"
1080510813
},
10814+
"enabledByDefault": {
10815+
"description": "EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set.\nThis distinguishes explicit opt-in (fallback: full system-probe) from default-on\n(fallback: sleep infinity). Ignored when Enabled is explicitly set to false.\nDefault: false",
10816+
"type": "boolean"
10817+
},
1080610818
"networkStats": {
1080710819
"additionalProperties": false,
1080810820
"description": "Enables the service discovery network stats collection.\nDefault: true",
@@ -10813,6 +10825,10 @@
1081310825
}
1081410826
},
1081510827
"type": "object"
10828+
},
10829+
"useSystemProbeLite": {
10830+
"description": "UseSystemProbeLite, when true and discovery is the only system-probe feature enabled,\nuses the lightweight system-probe-lite binary instead of full system-probe.\nIf other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored.\nDefault: false",
10831+
"type": "boolean"
1081610832
}
1081710833
},
1081810834
"type": "object"

‎docs/configuration.v2alpha1.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ spec:
200200
| features.sbom.host.analyzers | To use for SBOM collection. |
201201
| features.sbom.host.enabled | Enable this option to activate SBOM collection. Default: false |
202202
| features.serviceDiscovery.enabled | Enables the service discovery check. Default: false |
203+
| features.serviceDiscovery.enabledByDefault | EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set. This distinguishes explicit opt-in (fallback: full system-probe) from default-on (fallback: sleep infinity). Ignored when Enabled is explicitly set to false. Default: false |
203204
| features.serviceDiscovery.networkStats.enabled | Enables the Service Discovery Network Stats feature. Default: true |
205+
| features.serviceDiscovery.useSystemProbeLite | UseSystemProbeLite, when true and discovery is the only system-probe feature enabled, uses the lightweight system-probe-lite binary instead of full system-probe. If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored. Default: false |
204206
| features.tcpQueueLength.enabled | Enables the TCP queue length eBPF-based check. Default: false |
205207
| features.usm.enabled | Enables Universal Service Monitoring. Default: false |
206208
| global.checksTagCardinality | ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`). See also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality. Not set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low. Ref: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625. |

‎docs/configuration_public.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,15 @@ spec:
384384
`features.serviceDiscovery.enabled`
385385
: Enables the service discovery check. Default: false
386386

387+
`features.serviceDiscovery.enabledByDefault`
388+
: EnabledByDefault, when true, considers discovery enabled even if Enabled is not explicitly set. This distinguishes explicit opt-in (fallback: full system-probe) from default-on (fallback: sleep infinity). Ignored when Enabled is explicitly set to false. Default: false
389+
387390
`features.serviceDiscovery.networkStats.enabled`
388391
: Enables the Service Discovery Network Stats feature. Default: true
389392

393+
`features.serviceDiscovery.useSystemProbeLite`
394+
: UseSystemProbeLite, when true and discovery is the only system-probe feature enabled, uses the lightweight system-probe-lite binary instead of full system-probe. If other system-probe features are active (NPM, CWS, USM, etc.), this is silently ignored. Default: false
395+
390396
`features.tcpQueueLength.enabled`
391397
: Enables the TCP queue length eBPF-based check. Default: false
392398

0 commit comments

Comments
 (0)