<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** For #44077 # Details This PR implements enforcement of the "disable dataset" feature. When a dataset is disabled globally, we: * Stop collecting all data for that dataset (the `Collect` method for that dataset is not called in the cron job) * Remove all previously-collected data for the dataset via an asynchronous job When a dataset is disabled for one or more fleets, we: * Provide the list of disabled fleets as an argument to each dataset's `Collect` method. Each dataset is responsible for filtering out hosts in the most efficient way possible * Scrub the data for the relevant datasets using a bitmask, so that all hosts from the disabled fleets are removed from the data. This is done via an asynchronous job. # 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. n/a, unreleased - [X] 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. - [X] Timeouts are implemented and retries are limited to avoid infinite loops ## Testing - [X] Added/updated automated tests - [X] 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 ### Prerequisites / Test Setup - [ ] Fleet running with at least 3 teams (call them T1, T2, T3) and ≥3 hosts in each, plus ≥2 hosts with no team - [ ] At least one host on each team has reported recent uptime (within the bucket window) - [ ] At least one host in each team is affected by a tracked CVE (so `host_scd_data` for `dataset='cve'` will have non-empty bitmaps) - [ ] AppConfig: both `features.historical_data.uptime` and `features.historical_data.vulnerabilities` start as `true`; same for every team - [ ] Let the collection cron run at least one full tick to populate baseline rows in `host_scd_data` for both `uptime` and `cve` - [ ] Note the current row count per dataset: `SELECT dataset, COUNT(*) FROM host_scd_data GROUP BY dataset;` --- ### 1. Cron Skips Globally-Disabled Datasets #### 1.1 Global disable of `uptime` - [x] Disable globally: `PATCH /api/v1/fleet/config` with `features.historical_data.uptime = false` - [x] Verify activity feed shows `disabled_historical_dataset` for `uptime` (existing behavior) - [x] Wait for next collection tick (or trigger it via fleetctl debug if available) - [x] Confirm **no new rows** appear for `dataset='uptime'`: `SELECT MAX(valid_from) FROM host_scd_data WHERE dataset='uptime';` should not advance after the disable - [x] Confirm cron still writes `cve` rows on the same tick (per-dataset isolation) - [x] Re-enable: PATCH `historical_data.uptime = true` - [x] Verify next tick resumes writing `uptime` rows #### 1.2 Global disable of `vulnerabilities` - [x] Repeat 1.1 with `features.historical_data.vulnerabilities` - [x] Confirm `cve` writes stop, `uptime` continues #### 1.3 Both disabled globally - [x] Disable both globally - [x] Confirm cron tick produces zero new rows for either dataset - [x] Confirm cron does not error or get stuck - [x] Re-enable both --- ### 2. Per-Fleet Disable — Cron Filters at SQL #### 2.1 Single team disabled for one dataset - [x] Disable uptime for T1 only: PATCH team T1 with `features.historical_data.uptime = false` - [x] Verify scoped `disabled_historical_dataset` activity emitted for T1 - [x] Wait for next cron tick / trigger cron - [x] Pick a host known to be in T1 (call it `H_T1`); confirm its bit is NOT set in any `uptime` row written *after* the disable by filtering the chart to that host - [x] Pick a host in T2 (`H_T2`); confirm its bit IS still set in the same rows (T2 is not disabled) - [x] Pick a no-team host (`H_none`); confirm its bit IS still set (no-team hosts follow the global value) #### 2.2 Same fleet, different dataset - [x] With T1's uptime disabled, confirm T1's hosts ARE still written into `cve` rows on subsequent ticks (per-dataset isolation) #### 2.3 All teams disabled, global on, no-team hosts - [x] Disable uptime on every team (T1, T2, T3) - [x] Confirm next tick still writes a row containing only no-team hosts' bits (global is on, no-team hosts always count) - [x] Re-enable uptime on all teams --- ### 3. Global Scrub — DELETE #### 3.1 Successful global scrub - [x] Note baseline: `SELECT COUNT(*) FROM host_scd_data WHERE dataset='uptime';` (should be > 5000 to exercise the loop; if not, manually insert filler rows or run multiple cron ticks) - [x] Disable uptime globally via the API - [x] Wait for the worker to pick up the scrub / trigger the job - [x] Confirm the count drops to 0: `SELECT COUNT(*) FROM host_scd_data WHERE dataset='uptime';` - [x] Confirm rows for **other datasets** are untouched - [ ] Test again but disable via GitOps --- ### 4. Per-Fleet Scrub — ANDNOT #### 4.1 Single-fleet scrub clears bits - [x] Identify hosts in T1 and record their IDs (call this set `S`) - [x] Pre-disable, confirm at least one `host_scd_data` row for `dataset='uptime'` has bits set at positions in `S` by filtering the chart to those hosts - [x] Disable uptime on T1 only, via the API - [x] Wait for the scrub to run / trigger it - [x] Confirm: every existing row for `dataset='uptime'` now has NO bits set at any position in `S`. Spot-check by filtering the chart to those hosts - [x] Confirm rows for `dataset='cve'` (different dataset) are untouched - [x] Confirm bits for hosts in T2/T3 (not disabled) are still set - [x] Run test again but disable via GitOps #### 4.2 Multi-fleet scrub via GitOps batch - [x] Apply a GitOps spec that flips cve to false on T1 and T3 in a single apply - [x] Wait for scrub(s) to complete - [x] Confirm bits for the union of T1∪T2 hosts are cleared from every row of `dataset='cve'` - [x] Confirm T2 hosts' bits remain set --- ### 5. Activity Feed Cross-Check - [x] Each global flip emits exactly one `disabled_historical_dataset` activity (existing behavior, unchanged) - [x] Each per-team flip emits one scoped activity with the team's ID and name - [x] PATCH submitting unchanged values emits **no** activity and causes **no** scrub (no `host_scd_data` data change observed after the cron tick) - [x] No new "scrub completed" or "scrub started" activity is emitted (out of scope for v1) - [x] Re-enable flips emit `enabled_historical_dataset` activities and do NOT emit any scrub-related activity --- ### 6. Regression Spot Checks - [x] With everything enabled (default), the chart UI renders the same data as before this change (no behavior change in the "all on" case) - [x] AppConfig YAML round-trip (`fleetctl apply`) is benign: applying the unchanged config produces no scrub jobs and no activities - [x] GitOps apply with `historical_data` omitted from team specs defaults to `true` (per the gitops-api change) and does not trigger spurious scrubs - [x] After a full disable+scrub of cve, the `host_scd_data` table has no `dataset='cve'` rows; the chart UI for "vulnerable hosts over time" shows an empty/zero state without errors --- <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Chart collection now supports per-dataset scoping and honors team-level disables; new scrub jobs are registered and worker handlers added. * New dataset scrub operations: global and fleet-scoped scrubs; scrubs can be enqueued and are deduplicated to avoid duplicate pending jobs. Historical-data changes enqueue scrubs after save (errors logged, non-blocking). * **Tests** * Added unit tests for scope resolution, scrub enqueue/dedup behavior, scrub workers, scrub application, and low-level blob scrub logic. * **Documentation** * Added OpenSpec metadata for the chart scrub change. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
151 lines
6.4 KiB
Go
151 lines
6.4 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
)
|
|
|
|
// SampleStrategy describes how a dataset's samples combine within a bucket and
|
|
// whether rows can collapse across buckets when the bitmap is unchanged.
|
|
type SampleStrategy string
|
|
|
|
const (
|
|
// SampleStrategyAccumulate means each sample is a partial observation.
|
|
// Writes: every row is born closed (valid_to set at insert time to bucketEnd).
|
|
// Within-bucket samples OR-merge into the existing row via ODKU; a sample in
|
|
// a new bucket just creates a new row with a new valid_from. No explicit
|
|
// close step, no cross-bucket collapse.
|
|
// Reads: bucket value = OR of every row whose interval overlaps the bucket
|
|
// ("hosts observed at any point during the bucket").
|
|
// Used for datasets like uptime and software usage.
|
|
// @todo: implement job to collapse identical consecutive rows
|
|
// to optimize storage and query performance.
|
|
SampleStrategyAccumulate SampleStrategy = "accumulate"
|
|
|
|
// SampleStrategySnapshot means each sample is the full state of a single moment.
|
|
// Writes: rows are always keyed to 1h boundaries (so row transitions align
|
|
// to hour marks regardless of tz). Within a 1h write-bucket, the latest
|
|
// sample's bitmap overwrites via ODKU — last sample wins. Across buckets,
|
|
// unchanged state keeps the row open (valid_to = sentinel); a changed sample
|
|
// closes the prior row at the new hour boundary and opens a new one.
|
|
// Reads: bucket value = OR across entities of each entity's row active at
|
|
// bucketEnd ("state as of the end of the bucket"). An entity whose row was
|
|
// closed mid-bucket with no replacement is absent at bucketEnd.
|
|
// Used for datasets like CVE and software inventory.
|
|
SampleStrategySnapshot SampleStrategy = "snapshot"
|
|
)
|
|
|
|
// Dataset defines the interface for a chartable dataset.
|
|
type Dataset interface {
|
|
// Name returns the dataset identifier used in the DB and API path.
|
|
Name() string
|
|
|
|
// DefaultResolutionHours returns the default display granularity in hours.
|
|
// Used when the caller doesn't specify RequestOpts.Resolution. Unrelated
|
|
// to write-side granularity — all collectors write at 1h regardless of
|
|
// display resolution; see SampleStrategy for details.
|
|
DefaultResolutionHours() int
|
|
|
|
// SampleStrategy returns how samples combine within and across buckets.
|
|
SampleStrategy() SampleStrategy
|
|
|
|
// Collect is called by the cron job to populate data in bulk.
|
|
//
|
|
// disabledFleetIDs scopes which fleets contribute to this collection. The
|
|
// orchestrator derives it from per-team config (teams whose Enabled(name)
|
|
// is false). Implementations should use this to filter out hosts from
|
|
// disabled fleets when collecting data.
|
|
//
|
|
// No-team hosts (team_id IS NULL) are always included when the orchestrator
|
|
// invokes Collect — the orchestrator skips Collect entirely if the global
|
|
// flag is off.
|
|
Collect(ctx context.Context, store DatasetStore, now time.Time, disabledFleetIDs []uint) error
|
|
|
|
// DefaultVisualization returns the default visualization type (e.g. "line", "heatmap").
|
|
DefaultVisualization() string
|
|
}
|
|
|
|
// DatasetStore is the narrow interface that datasets need for their Collect
|
|
// method. It is satisfied by the chart internal Datastore, keeping dataset
|
|
// implementations decoupled from internals.
|
|
type DatasetStore interface {
|
|
// FindRecentlySeenHostIDs returns host IDs that have reported since the
|
|
// given cutoff. Used by datasets like uptime that derive their sample from
|
|
// recent host activity.
|
|
FindRecentlySeenHostIDs(ctx context.Context, since time.Time, disabledFleetIDs []uint) ([]uint, error)
|
|
|
|
// AffectedHostIDsByCVE returns, for every CVE currently affecting any host,
|
|
// the slice of host IDs impacted by it. Unresolved-only is implicit in the
|
|
// underlying joins: a host's software/OS row transitions when it upgrades
|
|
// past the vulnerable version, so the join naturally stops matching.
|
|
AffectedHostIDsByCVE(ctx context.Context, disabledFleetIDs []uint) (map[string][]uint, error)
|
|
|
|
// RecordBucketData writes one or more entity bitmaps for the given bucket
|
|
// using the specified sample strategy. See SampleStrategy for semantics.
|
|
RecordBucketData(
|
|
ctx context.Context,
|
|
dataset string,
|
|
bucketStart time.Time,
|
|
bucketSize time.Duration,
|
|
strategy SampleStrategy,
|
|
entityBitmaps map[string][]byte,
|
|
) error
|
|
}
|
|
|
|
// Host is a minimal host type for authorization checks within the chart bounded context.
|
|
// The JSON tags matter: the OPA rego policy reads object.team_id via the JSON-encoded
|
|
// input, so renaming or dropping the tag silently breaks team-scoped authorization.
|
|
type Host struct {
|
|
ID uint `json:"id"`
|
|
TeamID *uint `json:"team_id"`
|
|
}
|
|
|
|
// AuthzType implements platform_authz.AuthzTyper.
|
|
func (h *Host) AuthzType() string { return "host" }
|
|
|
|
// DataPoint represents a single data point in the chart response.
|
|
type DataPoint struct {
|
|
Timestamp time.Time `json:"timestamp"`
|
|
Value int `json:"value"`
|
|
}
|
|
|
|
// Response is the API response for chart data.
|
|
type Response struct {
|
|
Metric string `json:"metric"`
|
|
Visualization string `json:"visualization"`
|
|
TotalHosts int `json:"total_hosts"`
|
|
Resolution string `json:"resolution"`
|
|
Days int `json:"days"`
|
|
Filters Filters `json:"filters"`
|
|
Data []DataPoint `json:"data"`
|
|
}
|
|
|
|
// RequestOpts captures the parsed query parameters for a chart request.
|
|
type RequestOpts struct {
|
|
Days int
|
|
// Resolution is the display granularity in hours. Must be 0 or a positive
|
|
// divisor of 24. 0 means "use the dataset's default resolution."
|
|
Resolution int
|
|
// TZOffsetMinutes is the client's UTC offset as reported by JavaScript's
|
|
// Date.getTimezoneOffset() (positive = west of UTC, e.g. CDT = 300).
|
|
// Used to align hourly bucket boundaries to local time.
|
|
TZOffsetMinutes int
|
|
// TeamID scopes the request to a single team. nil = global (authz + data
|
|
// both fall back to the user's accessible scope). *TeamID == 0 means
|
|
// hosts with no team assignment, matching Fleet's convention elsewhere.
|
|
TeamID *uint
|
|
LabelIDs []uint
|
|
Platforms []string
|
|
IncludeHostIDs []uint
|
|
ExcludeHostIDs []uint
|
|
}
|
|
|
|
// Filters captures the applied filters for a chart request.
|
|
type Filters struct {
|
|
TeamID *uint `json:"fleet_id,omitempty"`
|
|
LabelIDs []uint `json:"label_ids,omitempty"`
|
|
Platforms []string `json:"platforms,omitempty"`
|
|
IncludeHostIDs []uint `json:"include_host_ids,omitempty"`
|
|
ExcludeHostIDs []uint `json:"exclude_host_ids,omitempty"`
|
|
}
|