Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
fix(metabase): extend revenue tenant exclusions (#7228)
r33drichardsfbf9f9e63061
diff --git a/libs/fleet/backend/database/migrations/000009_extend_metabase_revenue_tenant_exclusions.sql b/libs/fleet/backend/database/migrations/000009_extend_metabase_revenue_tenant_exclusions.sqlnew file mode 100644index 0000000000..394c72d1d7--- /dev/null+++ b/libs/fleet/backend/database/migrations/000009_extend_metabase_revenue_tenant_exclusions.sql@@ -0,0 +1,35 @@+SET LOCAL ROLE k8s_reporting_owner;++CREATE OR REPLACE VIEW k8s_reporting.hourly_reservation_usage_excluding_tenants+WITH (security_barrier = true, security_invoker = false) AS+SELECT+ collection.cluster_id,+ collection.hour_start,+ collection.hour_end,+ collection.covered_seconds,+ count(DISTINCT fact.sandbox_uid)::integer AS discovered_sandboxes,+ count(fact.fact_id)::bigint AS reservation_fact_count,+ coalesce(sum(fact.virtual_cpu_core_seconds), 0)::numeric AS virtual_cpu_core_seconds,+ coalesce(sum(fact.virtual_memory_byte_seconds), 0)::numeric AS virtual_memory_byte_seconds,+ coalesce(sum(fact.ready_seconds), 0)::numeric AS ready_seconds+FROM billing_meter.reservation_hour_collection_current AS collection+LEFT JOIN billing_meter.reservation_hour_current AS fact+ ON fact.cluster_id = collection.cluster_id+ AND fact.hour_start = collection.hour_start+ AND fact.hour_end = collection.hour_end+ AND fact.capsule_tenant NOT IN (+ 'user-f039fe89-9b5f-43dc-8ccd-d100ae732246',+ 'user-30a53246-881d-4f1a-8005-979f2a07933e',+ 'user-0ea07f31-b7bd-4e99-b29a-2376f6fde1be',+ 'user-a89b2628-9656-4ef0-bf01-e925b120ed1d'+ )+GROUP BY+ collection.cluster_id,+ collection.hour_start,+ collection.hour_end,+ collection.covered_seconds;++REVOKE ALL ON k8s_reporting.hourly_reservation_usage_excluding_tenants FROM PUBLIC;+GRANT SELECT ON k8s_reporting.hourly_reservation_usage_excluding_tenants TO k8s_metabase;++RESET ROLE;diff --git a/libs/fleet/backend/database/migrator_pg_test.go b/libs/fleet/backend/database/migrator_pg_test.goindex a7d9333702..e133ea687d 100644--- a/libs/fleet/backend/database/migrator_pg_test.go+++ b/libs/fleet/backend/database/migrator_pg_test.go@@ -117,6 +117,7 @@ func TestInitialMigrationBuildsCompleteDatabase(t *testing.T) {})tenantURL := createTenantRolePath(t, ctx, credentials.RoleAdmin, tenantRole, tenantPassword, "tenant-alice")seedStateBoundaryData(t, ctx, inspectionURL)+ assertFilteredReservationUsageTenantContract(t, ctx, migrationURL, credentials.Metabase)assertWriterBoundary(t, ctx, credentials.Writer)assertExporterBoundary(t, ctx, credentials.Exporter)@@ -189,14 +190,14 @@ func TestRunUpgradesVersionOneAndThenNoOps(t *testing.T) {upgrade := captureRunSummary(t, func() error {return Run(ctx, Config{MigrationURL: migrationURL, Credentials: credentials})})- if upgrade.Current != 1 || upgrade.Target != 8 || upgrade.Pending != 7 || upgrade.Applied != 7 || upgrade.Skipped != 1 || upgrade.Result != "success" {+ if upgrade.Current != 1 || upgrade.Target != 9 || upgrade.Pending != 8 || upgrade.Applied != 8 || upgrade.Skipped != 1 || upgrade.Result != "success" {t.Fatalf("version-one upgrade summary = %+v", upgrade)}noOp := captureRunSummary(t, func() error {return Run(ctx, Config{MigrationURL: migrationURL, Credentials: credentials})})- if noOp.Current != 8 || noOp.Target != 8 || noOp.Pending != 0 || noOp.Applied != 0 || noOp.Skipped != 8 || noOp.Result != "success" {+ if noOp.Current != 9 || noOp.Target != 9 || noOp.Pending != 0 || noOp.Applied != 0 || noOp.Skipped != 9 || noOp.Result != "success" {t.Fatalf("post-upgrade no-op summary = %+v", noOp)}}@@ -1592,8 +1593,8 @@ func migrationLedgerRows(t *testing.T, ctx context.Context, adminURL string) []lif err := rows.Err(); err != nil {t.Fatal("iterate migration ledger")}- if len(ledger) != 8 {- t.Fatalf("migration ledger row count = %d, want 8", len(ledger))+ if len(ledger) != 9 {+ t.Fatalf("migration ledger row count = %d, want 9", len(ledger))}for index, want := range []struct {version int64@@ -1607,6 +1608,7 @@ func migrationLedgerRows(t *testing.T, ctx context.Context, adminURL string) []l{6, "000006_chat_conversations.sql"},{7, "000007_metabase_hourly_reservation_usage.sql"},{8, "000008_metabase_hourly_reservation_usage_excluding_tenants.sql"},+ {9, "000009_extend_metabase_revenue_tenant_exclusions.sql"},} {if ledger[index].Version != want.version || ledger[index].ApplicationOrder != int64(index+1) || ledger[index].Filename != want.filename {t.Fatalf("migration ledger row %d = version:%d order:%d filename:%q", index, ledger[index].Version, ledger[index].ApplicationOrder, ledger[index].Filename)@@ -1941,7 +1943,7 @@ func assertRuntimeLedgerAccess(t *testing.T, ctx context.Context, credentials Crvar count interr := connection.QueryRow(ctx, `select count(*) from cyclops_migrations.applied_migrations`).Scan(&count)connection.Close(ctx)- if err != nil || count != 8 {+ if err != nil || count != 9 {t.Errorf("%s ledger select = count:%d err:%v", role, count, err)}assertStatementFails(t, ctx, databaseURL, `insert into cyclops_migrations.applied_migrations (version, filename, sha256) values (99, 'invalid.sql', 'invalid')`)@@ -2135,6 +2137,49 @@ func seedStateBoundaryData(t *testing.T, ctx context.Context, adminURL string) {}}+func assertFilteredReservationUsageTenantContract(t *testing.T, ctx context.Context, migrationURL, metabaseURL string) {+ t.Helper()+ connection := connect(t, ctx, migrationURL)+ defer connection.Close(ctx)+ if _, err := connection.Exec(ctx, `+ set role billing_meter_owner;+ insert into billing_meter.reservation_hour_collection+ (collection_run_id, logical_key, revision, cluster_id, hour_start, hour_end, covered_seconds, discovered_sandboxes, inserted_facts, unchanged_facts, source_sha256)+ values+ ('00000000-0000-0000-0000-000000000101', 'filtered-tenant-contract', 1, 'filtered-tenant-contract', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 3600, 5, 5, 0, repeat('a', 64));+ insert into billing_meter.reservation_hour_fact+ (fact_id, logical_key, revision, cluster_id, capsule_tenant, namespace, sandbox_uid, sandbox_name, pool_name, runtime, hour_start, hour_end, virtual_cpu_core_seconds, virtual_memory_byte_seconds, ready_seconds, covered_seconds, scrape_interval_seconds, source_sha256, collection_run_id)+ values+ ('00000000-0000-0000-0000-000000000102', 'filtered-tenant-contract-1', 1, 'filtered-tenant-contract', 'user-f039fe89-9b5f-43dc-8ccd-d100ae732246', 'contract', 'excluded-1', 'excluded-1', 'pool', 'runtime', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 10, 100, 10, 3600, 60, repeat('b', 64), '00000000-0000-0000-0000-000000000101'),+ ('00000000-0000-0000-0000-000000000103', 'filtered-tenant-contract-2', 1, 'filtered-tenant-contract', 'user-30a53246-881d-4f1a-8005-979f2a07933e', 'contract', 'excluded-2', 'excluded-2', 'pool', 'runtime', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 20, 200, 20, 3600, 60, repeat('c', 64), '00000000-0000-0000-0000-000000000101'),+ ('00000000-0000-0000-0000-000000000104', 'filtered-tenant-contract-3', 1, 'filtered-tenant-contract', 'user-0ea07f31-b7bd-4e99-b29a-2376f6fde1be', 'contract', 'excluded-3', 'excluded-3', 'pool', 'runtime', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 30, 300, 30, 3600, 60, repeat('d', 64), '00000000-0000-0000-0000-000000000101'),+ ('00000000-0000-0000-0000-000000000105', 'filtered-tenant-contract-4', 1, 'filtered-tenant-contract', 'user-a89b2628-9656-4ef0-bf01-e925b120ed1d', 'contract', 'excluded-4', 'excluded-4', 'pool', 'runtime', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 40, 400, 40, 3600, 60, repeat('e', 64), '00000000-0000-0000-0000-000000000101'),+ ('00000000-0000-0000-0000-000000000106', 'filtered-tenant-contract-5', 1, 'filtered-tenant-contract', 'included-tenant', 'contract', 'included', 'included', 'pool', 'runtime', '2026-08-27 00:00:00+00', '2026-08-27 01:00:00+00', 50, 500, 50, 3600, 60, repeat('f', 64), '00000000-0000-0000-0000-000000000101');+ reset role`); err != nil {+ t.Fatal("seed filtered reservation usage contract: ", err)+ }++ metabase := connect(t, ctx, metabaseURL)+ defer metabase.Close(ctx)+ var discoveredSandboxes, reservationFacts int+ var includedCPU, includedMemory, includedReady bool+ if err := metabase.QueryRow(ctx, `+ select+ discovered_sandboxes,+ reservation_fact_count,+ virtual_cpu_core_seconds = 50,+ virtual_memory_byte_seconds = 500,+ ready_seconds = 50+ from k8s_reporting.hourly_reservation_usage_excluding_tenants+ where cluster_id = 'filtered-tenant-contract'+ and hour_start = '2026-08-27 00:00:00+00'`).Scan(&discoveredSandboxes, &reservationFacts, &includedCPU, &includedMemory, &includedReady); err != nil {+ t.Fatal("query filtered reservation usage view: ", err)+ }+ if discoveredSandboxes != 1 || reservationFacts != 1 || !includedCPU || !includedMemory || !includedReady {+ t.Fatalf("filtered reservation usage = sandboxes:%d facts:%d cpu:%t memory:%t ready:%t, want only included tenant", discoveredSandboxes, reservationFacts, includedCPU, includedMemory, includedReady)+ }+}+func assertWriterBoundary(t *testing.T, ctx context.Context, writerURL string) {t.Helper()connection := connect(t, ctx, writerURL)diff --git a/libs/fleet/backend/database/migrator_test.go b/libs/fleet/backend/database/migrator_test.goindex 38d49fff63..666ff5c1e1 100644--- a/libs/fleet/backend/database/migrator_test.go+++ b/libs/fleet/backend/database/migrator_test.go@@ -8,6 +8,7 @@ import ("log/slog""os""reflect"+ "regexp""strings""testing""time"@@ -520,8 +521,8 @@ func TestEmbeddedMigrationsAreOrderedAndImmutable(t *testing.T) {if err != nil {t.Fatal(err)}- if len(files) != 8 {- t.Fatalf("expected exactly eight migrations, got %d", len(files))+ if len(files) != 9 {+ t.Fatalf("expected exactly nine migrations, got %d", len(files))}initial := files[0]if initial.Version != 1 || initial.Name != "000001_initial_schema.sql" {@@ -676,6 +677,39 @@ func TestEmbeddedMigrationsAreOrderedAndImmutable(t *testing.T) {t.Errorf("filtered Metabase usage migration is missing contract %q", expected)}}+ extendedFilteredMetabaseUsage := files[8]+ if extendedFilteredMetabaseUsage.Version != 9 || extendedFilteredMetabaseUsage.Name != "000009_extend_metabase_revenue_tenant_exclusions.sql" {+ t.Fatalf("expected version 9 extended filtered Metabase usage migration, got version=%d name=%q", extendedFilteredMetabaseUsage.Version, extendedFilteredMetabaseUsage.Name)+ }+ for _, expected := range []string{+ "CREATE OR REPLACE VIEW k8s_reporting.hourly_reservation_usage_excluding_tenants",+ "GRANT SELECT ON k8s_reporting.hourly_reservation_usage_excluding_tenants TO k8s_metabase",+ } {+ if !strings.Contains(extendedFilteredMetabaseUsage.SQL, expected) {+ t.Errorf("extended filtered Metabase usage migration is missing contract %q", expected)+ }+ }+ predicate := regexp.MustCompile(`(?s)\bfact\.capsule_tenant\s+NOT\s+IN\s*\((.*?)\)`).FindStringSubmatch(extendedFilteredMetabaseUsage.SQL)+ if len(predicate) != 2 {+ t.Fatal("version 9 migration does not contain a fact.capsule_tenant NOT IN predicate")+ }+ quotedLabel := regexp.MustCompile(`'([^']*)'`)+ labels := make([]string, 0)+ for _, match := range quotedLabel.FindAllStringSubmatch(predicate[1], -1) {+ labels = append(labels, match[1])+ }+ wantLabels := []string{+ "user-f039fe89-9b5f-43dc-8ccd-d100ae732246",+ "user-30a53246-881d-4f1a-8005-979f2a07933e",+ "user-0ea07f31-b7bd-4e99-b29a-2376f6fde1be",+ "user-a89b2628-9656-4ef0-bf01-e925b120ed1d",+ }+ if !reflect.DeepEqual(labels, wantLabels) {+ t.Fatalf("version 9 filtered tenant labels = %#v, want %#v", labels, wantLabels)+ }+ if remaining := strings.Trim(quotedLabel.ReplaceAllString(predicate[1], ""), " \t\r\n,"); remaining != "" {+ t.Fatalf("version 9 filtered tenant predicate contains non-label content %q", remaining)+ }}func TestReservationMeterMigrationRetainsRecordedChecksum(t *testing.T) {