Skip to content

Commit 9d08b86

Browse files
Merge branch 'main' into jose/disk_feature_parity
2 parents bce779a + d4dc7b5 commit 9d08b86

File tree

16 files changed

+201
-118
lines changed

16 files changed

+201
-118
lines changed

.gitlab/package_build/installer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ installer-install-scripts:
100100
- mkdir -p $OMNIBUS_PACKAGE_DIR
101101
- tar -xJOf $OMNIBUS_PACKAGE_DIR/datadog-installer-7*amd64.tar.xz --wildcards "opt/datadog-packages/datadog-installer/*/bin/installer/installer" > installer-amd64
102102
- tar -xJOf $OMNIBUS_PACKAGE_DIR/datadog-installer-7*arm64.tar.xz --wildcards "opt/datadog-packages/datadog-installer/*/bin/installer/installer" > installer-arm64
103-
- dda inv -- -e installer.build-linux-script "default" "$VERSION" "installer-amd64" "installer-arm64" "install.sh"
103+
- dda inv -- -e installer.build-linux-script "default" "$VERSION" "installer-amd64" "installer-arm64" "install.sh" --package="agent-package"
104104
- dda inv -- -e installer.build-linux-script "databricks" "$VERSION" "installer-amd64" "installer-arm64" "install-databricks.sh"
105105
- dda inv -- -e installer.build-linux-script "emr" "$VERSION" "installer-amd64" "installer-arm64" "install-emr.sh"
106106
- dda inv -- -e installer.build-linux-script "dataproc" "$VERSION" "installer-amd64" "installer-arm64" "install-dataproc.sh"

comp/core/autodiscovery/autodiscoveryimpl/configmgr.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ func (cm *reconcilingConfigManager) resolveTemplateForService(tpl integration.Co
368368
config, err := configresolver.Resolve(tpl, svc)
369369
if err != nil {
370370
msg := fmt.Sprintf("error resolving template %s for service %s: %v", tpl.Name, svc.GetServiceID(), err)
371+
log.Debug(msg)
371372
errorStats.setResolveWarning(tpl.Name, msg)
372373
return tpl, false
373374
}

docs/cloud-workload-security/backend_linux.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ Workload Protection events for Linux systems have the following JSON schema:
223223
"manager": {
224224
"type": "string",
225225
"description": "CGroup manager"
226+
},
227+
"variables": {
228+
"$ref": "#/$defs/Variables",
229+
"description": "Variables values"
226230
}
227231
},
228232
"additionalProperties": false,
@@ -2372,6 +2376,10 @@ Workload Protection events for Linux systems have the following JSON schema:
23722376
"manager": {
23732377
"type": "string",
23742378
"description": "CGroup manager"
2379+
},
2380+
"variables": {
2381+
"$ref": "#/$defs/Variables",
2382+
"description": "Variables values"
23752383
}
23762384
},
23772385
"additionalProperties": false,
@@ -2385,7 +2393,11 @@ Workload Protection events for Linux systems have the following JSON schema:
23852393
| ----- | ----------- |
23862394
| `id` | CGroup ID |
23872395
| `manager` | CGroup manager |
2396+
| `variables` | Variables values |
23882397

2398+
| References |
2399+
| ---------- |
2400+
| [Variables](#variables) |
23892401

23902402
## `ConnectEvent`
23912403

docs/cloud-workload-security/backend_linux.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,10 @@
212212
"manager": {
213213
"type": "string",
214214
"description": "CGroup manager"
215+
},
216+
"variables": {
217+
"$ref": "#/$defs/Variables",
218+
"description": "Variables values"
215219
}
216220
},
217221
"additionalProperties": false,

pkg/collector/corechecks/net/wlan/wlan.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,24 +140,24 @@ func (c *WLANCheck) Run() error {
140140
tags = append(tags, "bssid:"+bssid)
141141
tags = append(tags, "mac_address:"+macAddress)
142142

143-
sender.Gauge("wlan.rssi", float64(wi.rssi), "", tags)
143+
sender.Gauge("system.wlan.rssi", float64(wi.rssi), "", tags)
144144
if wi.noiseValid {
145-
sender.Gauge("wlan.noise", float64(wi.noise), "", tags)
145+
sender.Gauge("system.wlan.noise", float64(wi.noise), "", tags)
146146
}
147-
sender.Gauge("wlan.transmit_rate", float64(wi.transmitRate), "", tags)
147+
sender.Gauge("system.wlan.txrate", float64(wi.transmitRate), "", tags)
148148
if wi.receiveRateValid {
149-
sender.Gauge("wlan.receive_rate", float64(wi.receiveRate), "", tags)
149+
sender.Gauge("system.wlan.rxrate", float64(wi.receiveRate), "", tags)
150150
}
151151

152152
if c.isRoaming(&wi) {
153-
sender.Count("wlan.roaming_events", 1.0, "", tags)
154-
sender.Count("wlan.channel_swap_events", 0.0, "", tags)
153+
sender.Count("system.wlan.roaming_events", 1.0, "", tags)
154+
sender.Count("system.wlan.channel_swap_events", 0.0, "", tags)
155155
} else if c.isChannelSwap(&wi) {
156-
sender.Count("wlan.roaming_events", 0.0, "", tags)
157-
sender.Count("wlan.channel_swap_events", 1.0, "", tags)
156+
sender.Count("system.wlan.roaming_events", 0.0, "", tags)
157+
sender.Count("system.wlan.channel_swap_events", 1.0, "", tags)
158158
} else {
159-
sender.Count("wlan.roaming_events", 0.0, "", tags)
160-
sender.Count("wlan.channel_swap_events", 0.0, "", tags)
159+
sender.Count("system.wlan.roaming_events", 0.0, "", tags)
160+
sender.Count("system.wlan.channel_swap_events", 0.0, "", tags)
161161
}
162162

163163
// update last values

0 commit comments

Comments
 (0)