rahultoppurandLucas Manuel Rodriguez
06bc81106e
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #48006. Adds a new field `socket_path` in both `containerd_containers` and `containerd_mounts`. We keep the previous default when no `socket_path` is requested in the filter; otherwise, we honor the value passed from the incoming query. Test case: Ran a `make fleetd-tables-linux`, started some containers, then used osquery: <img width="2494" height="1408" alt="Screenshot from 2026-06-22 12-48-43" src="https://github.com/user-attachments/assets/ed65d16c-8aa8-4fc7-890e-4f200752e6e2" /> # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters. - [ ] Timeouts are implemented and retries are limited to avoid infinite loops - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [ ] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [ ] Confirmed that the fix is not expected to adversely impact load test results - [ ] Alerted the release DRI if additional load testing is needed ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). ## New Fleet configuration settings - [ ] Setting(s) is/are explicitly excluded from GitOps If you didn't check the box above, follow this checklist for GitOps-enabled settings: - [ ] Verified that the setting is exported via `fleetctl generate-gitops` - [ ] Verified the setting is documented in a separate PR to [the GitOps documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485) - [ ] Verified that the setting is cleared on the server if it is not supplied in a YAML file (or that it is documented as being optional) - [ ] Verified that any relevant UI is disabled when GitOps mode is enabled ## fleetd/orbit/Fleet Desktop - [ ] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [ ] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [ ] Verified that fleetd runs on macOS, Linux and Windows - [ ] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit * **New Features** * Added an optional `socket_path` column to `containerd_containers` and `containerd_mounts`. * Containerd queries can now target a specific socket path, and results report the socket path used (defaulting to `/run/containerd/containerd.sock` when not provided). * **Documentation** * Updated Fleet and table schemas with the new `socket_path` column and example queries (including common k3s socket paths). * **Tests** * Added Linux-only coverage to verify default vs explicitly provided `socket_path` behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Lucas Manuel Rodriguez <lucarodriguez@gmail.com>
85 lines
2.2 KiB
YAML
85 lines
2.2 KiB
YAML
name: containerd_containers
|
|
platforms:
|
|
- linux
|
|
description: Information about containerd containers.
|
|
evented: false
|
|
columns:
|
|
- name: namespace
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Namespace of the container.
|
|
- name: id
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Container ID.
|
|
- name: image
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Image name.
|
|
- name: image_digest
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Image digest (SHA256).
|
|
- name: state
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Container state (e.g. running, stopped).
|
|
- name: created
|
|
type: integer
|
|
required: false
|
|
description: |-
|
|
Unix timestamp of when the container was created.
|
|
- name: runtime
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Name of the container runtime (e.g. io.containerd.runc.v2).
|
|
- name: command
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Command used to start the container.
|
|
- name: pid
|
|
type: integer
|
|
required: false
|
|
description: |-
|
|
PID of the container process.
|
|
- name: socket_path
|
|
type: text
|
|
required: false
|
|
description: |-
|
|
Path to the containerd socket to query (default: /run/containerd/containerd.sock).
|
|
examples: |-
|
|
Get all containers from all namespaces:
|
|
|
|
```
|
|
SELECT * FROM containerd_containers;
|
|
```
|
|
|
|
Get only running containers in the `default` namespace:
|
|
|
|
```
|
|
SELECT * FROM containerd_containers WHERE namespace='default' AND state='running';
|
|
```
|
|
|
|
Query containers from a k3s containerd socket:
|
|
|
|
```
|
|
SELECT * FROM containerd_containers WHERE socket_path = '/run/k3s/containerd/containerd.sock';
|
|
```
|
|
|
|
notes: |-
|
|
This table is not a core osquery table. It is included as part of Fleet's agent
|
|
([fleetd](https://fleetdm.com/docs/get-started/anatomy#fleetd)).
|
|
|
|
The `containerd` table is available on Linux systems with containerd installed. It provides
|
|
information about the containers managed by containerd, including their state, image, and runtime.
|
|
|
|
This table is useful for systems using containerd as a container runtime, such as those running
|
|
Kubernetes. See the `docker_containers` table for information about containers managed by Docker.
|