<!-- 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>
111 lines
3.0 KiB
Go
111 lines
3.0 KiB
Go
//go:build linux
|
|
|
|
package containerd
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/containerd/containerd/cio"
|
|
"github.com/containerd/containerd/namespaces"
|
|
"github.com/osquery/osquery-go/plugin/table"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
// ContainersColumns is the schema of the containerd_containers table.
|
|
func ContainersColumns() []table.ColumnDefinition {
|
|
return []table.ColumnDefinition{
|
|
table.TextColumn("namespace"),
|
|
table.TextColumn("id"),
|
|
table.TextColumn("image"),
|
|
table.TextColumn("image_digest"),
|
|
table.TextColumn("state"),
|
|
table.BigIntColumn("created"),
|
|
table.TextColumn("runtime"),
|
|
table.TextColumn("command"),
|
|
table.BigIntColumn("pid"),
|
|
table.TextColumn("socket_path"),
|
|
}
|
|
}
|
|
|
|
// GenerateContainers is called to return the results for the containerd_containers table at query time.
|
|
// Constraints for generating can be retrieved from the queryContext.
|
|
func GenerateContainers(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {
|
|
client, socketPath, err := newClient(queryContext)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("Failed to connect to containerd: %v", err)
|
|
}
|
|
defer client.Close()
|
|
|
|
// Get all namespaces so we can iterate over them
|
|
namespacesList, err := client.NamespaceService().List(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("Failed to list namespaces: %v", err)
|
|
}
|
|
|
|
rows := []map[string]string{}
|
|
for _, namespace := range namespacesList {
|
|
nsCtx := namespaces.WithNamespace(ctx, namespace)
|
|
|
|
containers, err := client.Containers(nsCtx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("Failed to list containers: %v", err)
|
|
}
|
|
|
|
for _, container := range containers {
|
|
info, err := container.Info(nsCtx)
|
|
if err != nil {
|
|
log.Printf("Failed to get info for container %s: %v", container.ID(), err)
|
|
continue
|
|
}
|
|
|
|
// Get image digest if possible
|
|
imageDigest := ""
|
|
img, err := container.Image(nsCtx)
|
|
if err == nil {
|
|
imageDigest = img.Target().Digest.String()
|
|
}
|
|
|
|
// Get state and pid from task if possible
|
|
state := "unknown"
|
|
pid := ""
|
|
command := ""
|
|
task, err := container.Task(nsCtx, cio.Load)
|
|
if err == nil {
|
|
status, err := task.Status(nsCtx)
|
|
if err == nil {
|
|
state = string(status.Status)
|
|
}
|
|
taskPid := task.Pid()
|
|
if taskPid > 0 {
|
|
pid = fmt.Sprintf("%d", taskPid)
|
|
}
|
|
// Try to get the command from the process spec
|
|
spec, err := container.Spec(nsCtx)
|
|
if err == nil && spec.Process != nil && len(spec.Process.Args) > 0 {
|
|
command = strings.Join(spec.Process.Args, " ")
|
|
}
|
|
} else {
|
|
state = "stopped"
|
|
}
|
|
|
|
row := map[string]string{
|
|
"namespace": namespace,
|
|
"id": info.ID,
|
|
"image": info.Image,
|
|
"image_digest": imageDigest,
|
|
"state": state,
|
|
"created": fmt.Sprintf("%d", info.CreatedAt.Unix()),
|
|
"runtime": info.Runtime.Name,
|
|
"pid": pid,
|
|
"command": command,
|
|
"socket_path": socketPath,
|
|
}
|
|
rows = append(rows, row)
|
|
}
|
|
}
|
|
|
|
return rows, nil
|
|
}
|