Skip to content

Same agent Smaller bill. The tools and infrastructure to get more work from your AI. Fewer tokens. Less compute. Lower cost.

fix: controller migrations (#1179)

Aman Agarwalbeba4b6d6c6b
diff --git a/src/client/src/app/api/controller/poll/route.ts b/src/client/src/app/api/controller/poll/route.ts
index 67e26281..228be258 100644
--- a/src/client/src/app/api/controller/poll/route.ts
+++ b/src/client/src/app/api/controller/poll/route.ts
@@ -137,26 +137,6 @@ async function phaseUpsertServices(
return reportedServices;
}
- const workloadKeys = body.services
- .map((s: any) => s.workload_key)
- .filter(Boolean) as string[];
-
- const desiredRes = await getFeatureDesiredStates(
- workloadKeys,
- clusterId,
- ["instrumentation", "agent"],
- dbId
- );
- const desiredMap = new Map<string, { instr: string; agent: string }>();
- for (const d of desiredRes.data || []) {
- if (!desiredMap.has(d.workload_key)) {
- desiredMap.set(d.workload_key, { instr: "none", agent: "none" });
- }
- const entry = desiredMap.get(d.workload_key)!;
- if (d.feature === "instrumentation") entry.instr = d.desired_status;
- if (d.feature === "agent") entry.agent = d.desired_status;
- }
-
const rows = body.services.map((svc: any) => {
if (!svc.workload_key) {
throw new Error(
@@ -165,7 +145,6 @@ async function phaseUpsertServices(
}
const ns = svc.namespace || "";
const name = svc.service_name || "";
- const desired = desiredMap.get(svc.workload_key);
reportedServices.push({
workload_key: svc.workload_key,
@@ -194,12 +173,6 @@ async function phaseUpsertServices(
exe_path: svc.exe_path || "",
instrumentation_status:
svc.instrumentation_status || "discovered",
- desired_instrumentation_status: (desired?.instr || "none") as
- | "none"
- | "instrumented",
- desired_agent_status: (desired?.agent || "none") as
- | "none"
- | "enabled",
resource_attributes: svc.resource_attributes || {},
first_seen: svc.first_seen || now,
last_seen: now,
diff --git a/src/client/src/clickhouse/migrations/add-controller-desired-state-migration.ts b/src/client/src/clickhouse/migrations/add-controller-desired-state-migration.ts
deleted file mode 100644
index 7030fc6c..00000000
--- a/src/client/src/clickhouse/migrations/add-controller-desired-state-migration.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { dataCollector } from "@/lib/platform/common";
-
-export default async function AddControllerDesiredStateMigration(
- databaseConfigId?: string
-) {
- const queries = [
- `ALTER TABLE openlit_controller_services ADD COLUMN IF NOT EXISTS desired_instrumentation_status Enum8('none' = 0, 'instrumented' = 1) DEFAULT 'none'`,
- `ALTER TABLE openlit_controller_services ADD COLUMN IF NOT EXISTS desired_agent_status Enum8('none' = 0, 'enabled' = 1) DEFAULT 'none'`,
- ];
-
- for (const query of queries) {
- await dataCollector({ query }, "query", databaseConfigId);
- }
-}
diff --git a/src/client/src/clickhouse/migrations/create-controller-desired-states-migration.ts b/src/client/src/clickhouse/migrations/create-controller-desired-states-migration.ts
deleted file mode 100644
index 351f37c5..00000000
--- a/src/client/src/clickhouse/migrations/create-controller-desired-states-migration.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
- CONTROLLER_DESIRED_STATES_TABLE,
- CONTROLLER_SERVICES_TABLE,
-} from "@/lib/platform/controller/table-details";
-import migrationHelper from "./migration-helper";
-
-const MIGRATION_ID = "create-controller-desired-states-table";
-
-export default async function CreateControllerDesiredStatesTableMigration(
- databaseConfigId?: string
-) {
- const queries = [
- `
- CREATE TABLE IF NOT EXISTS ${CONTROLLER_DESIRED_STATES_TABLE} (
- workload_key String,
- cluster_id String DEFAULT 'default',
- desired_instrumentation_status Enum8('none' = 0, 'instrumented' = 1) DEFAULT 'none',
- desired_agent_status Enum8('none' = 0, 'enabled' = 1) DEFAULT 'none',
- updated_at DateTime DEFAULT now()
- ) ENGINE = ReplacingMergeTree(updated_at)
- ORDER BY (workload_key, cluster_id)
- SETTINGS index_granularity = 8192
- `,
- `
- INSERT INTO ${CONTROLLER_DESIRED_STATES_TABLE} (workload_key, cluster_id, desired_instrumentation_status, desired_agent_status, updated_at)
- SELECT
- workload_key,
- cluster_id,
- argMax(desired_instrumentation_status, updated_at) AS latest_instrumentation_status,
- argMax(desired_agent_status, updated_at) AS latest_agent_status,
- max(updated_at)
- FROM ${CONTROLLER_SERVICES_TABLE}
- FINAL
- WHERE workload_key != ''
- GROUP BY workload_key, cluster_id
- HAVING latest_instrumentation_status != 'none' OR latest_agent_status != 'none'
- `,
- ];
-
- return migrationHelper({
- clickhouseMigrationId: MIGRATION_ID,
- databaseConfigId,
- queries,
- });
-}
diff --git a/src/client/src/clickhouse/migrations/create-controller-migration.ts b/src/client/src/clickhouse/migrations/create-controller-migration.ts
index 91e83bab..0039731c 100644
--- a/src/client/src/clickhouse/migrations/create-controller-migration.ts
+++ b/src/client/src/clickhouse/migrations/create-controller-migration.ts
@@ -3,6 +3,8 @@ import {
CONTROLLER_INSTANCES_TABLE,
CONTROLLER_CONFIG_TABLE,
CONTROLLER_ACTIONS_TABLE,
+ CONTROLLER_DESIRED_STATES_V2_TABLE,
+ CONTROLLER_ENV_CONFIGS_TABLE,
} from "@/lib/platform/controller/table-details";
import migrationHelper from "./migration-helper";
@@ -80,6 +82,29 @@ export default async function CreateControllerMigration(
) ENGINE = ReplacingMergeTree(updated_at)
ORDER BY (instance_id, id);
`,
+ `
+ CREATE TABLE IF NOT EXISTS ${CONTROLLER_DESIRED_STATES_V2_TABLE} (
+ workload_key String,
+ cluster_id String DEFAULT 'default',
+ feature LowCardinality(String),
+ desired_status LowCardinality(String) DEFAULT 'none',
+ config String DEFAULT '{}',
+ updated_at DateTime DEFAULT now()
+ ) ENGINE = ReplacingMergeTree(updated_at)
+ ORDER BY (workload_key, cluster_id, feature)
+ SETTINGS index_granularity = 8192
+ `,
+ `
+ CREATE TABLE IF NOT EXISTS ${CONTROLLER_ENV_CONFIGS_TABLE} (
+ environment String DEFAULT 'default',
+ cluster_id String DEFAULT 'default',
+ feature LowCardinality(String),
+ config String DEFAULT '{}',
+ updated_at DateTime DEFAULT now()
+ ) ENGINE = ReplacingMergeTree(updated_at)
+ ORDER BY (environment, cluster_id, feature)
+ SETTINGS index_granularity = 8192
+ `,
];
return migrationHelper({
diff --git a/src/client/src/clickhouse/migrations/generalize-controller-desired-states-migration.ts b/src/client/src/clickhouse/migrations/generalize-controller-desired-states-migration.ts
index 86f8f0d2..43ed024f 100644
--- a/src/client/src/clickhouse/migrations/generalize-controller-desired-states-migration.ts
+++ b/src/client/src/clickhouse/migrations/generalize-controller-desired-states-migration.ts
@@ -1,8 +1,4 @@
-import {
- CONTROLLER_ACTIONS_TABLE,
- CONTROLLER_DESIRED_STATES_V2_TABLE,
- CONTROLLER_ENV_CONFIGS_TABLE,
-} from "@/lib/platform/controller/table-details";
+import { CONTROLLER_ACTIONS_TABLE } from "@/lib/platform/controller/table-details";
import migrationHelper from "./migration-helper";
const MIGRATION_ID = "generalize-controller-desired-states-v2";
@@ -12,65 +8,6 @@ export default async function GeneralizeControllerDesiredStatesMigration(
) {
const queries = [
`ALTER TABLE ${CONTROLLER_ACTIONS_TABLE} MODIFY COLUMN action_type LowCardinality(String)`,
-
- `
- CREATE TABLE IF NOT EXISTS ${CONTROLLER_DESIRED_STATES_V2_TABLE} (
- workload_key String,
- cluster_id String DEFAULT 'default',
- feature LowCardinality(String),
- desired_status LowCardinality(String) DEFAULT 'none',
- config String DEFAULT '{}',
- updated_at DateTime DEFAULT now()
- ) ENGINE = ReplacingMergeTree(updated_at)
- ORDER BY (workload_key, cluster_id, feature)
- SETTINGS index_granularity = 8192
- `,
-
- `
- INSERT INTO ${CONTROLLER_DESIRED_STATES_V2_TABLE}
- (workload_key, cluster_id, feature, desired_status, config, updated_at)
- SELECT
- workload_key,
- cluster_id,
- 'instrumentation' AS feature,
- argMax(desired_instrumentation_status, updated_at) AS desired_status,
- '{}' AS config,
- max(updated_at)
- FROM openlit_controller_desired_states
- FINAL
- WHERE workload_key != ''
- GROUP BY workload_key, cluster_id
- HAVING desired_status != 'none'
- `,
-
- `
- INSERT INTO ${CONTROLLER_DESIRED_STATES_V2_TABLE}
- (workload_key, cluster_id, feature, desired_status, config, updated_at)
- SELECT
- workload_key,
- cluster_id,
- 'agent' AS feature,
- argMax(desired_agent_status, updated_at) AS desired_status,
- '{}' AS config,
- max(updated_at)
- FROM openlit_controller_desired_states
- FINAL
- WHERE workload_key != ''
- GROUP BY workload_key, cluster_id
- HAVING desired_status != 'none'
- `,
-
- `
- CREATE TABLE IF NOT EXISTS ${CONTROLLER_ENV_CONFIGS_TABLE} (
- environment String DEFAULT 'default',
- cluster_id String DEFAULT 'default',
- feature LowCardinality(String),
- config String DEFAULT '{}',
- updated_at DateTime DEFAULT now()
- ) ENGINE = ReplacingMergeTree(updated_at)
- ORDER BY (environment, cluster_id, feature)
- SETTINGS index_granularity = 8192
- `,
];
return migrationHelper({
diff --git a/src/client/src/clickhouse/migrations/index.ts b/src/client/src/clickhouse/migrations/index.ts
index bcbd9571..fa87b6aa 100644
--- a/src/client/src/clickhouse/migrations/index.ts
+++ b/src/client/src/clickhouse/migrations/index.ts
@@ -12,10 +12,8 @@ import AddControllerResourceAttrsMigration from "./add-controller-resource-attrs
import AddControllerWorkloadKeyMigration from "./add-controller-workload-key-migration";
import AddControllerSDKActionsMigration from "./add-controller-sdk-actions-migration";
import AddControllerTTLMigration from "./add-controller-ttl-migration";
-import AddControllerDesiredStateMigration from "./add-controller-desired-state-migration";
import AddControllerClusterIdMigration from "./add-controller-cluster-id-migration";
import UpdateControllerActionsTTLMigration from "./update-controller-actions-ttl-migration";
-import CreateControllerDesiredStatesTableMigration from "./create-controller-desired-states-migration";
import GeneralizeControllerDesiredStatesMigration from "./generalize-controller-desired-states-migration";
import CreateChatMigration from "./create-chat-migration";
import CreateProvidersMigration from "./create-providers-migration";
@@ -46,10 +44,8 @@ export default async function migrations(databaseConfigId?: string) {
await AddControllerWorkloadKeyMigration(databaseConfigId);
await AddControllerSDKActionsMigration(databaseConfigId);
await AddControllerTTLMigration(databaseConfigId);
- await AddControllerDesiredStateMigration(databaseConfigId);
await AddControllerClusterIdMigration(databaseConfigId);
await UpdateControllerActionsTTLMigration(databaseConfigId);
- await CreateControllerDesiredStatesTableMigration(databaseConfigId);
await GeneralizeControllerDesiredStatesMigration(databaseConfigId);
await AddControllerSkippingIndexesMigration(databaseConfigId);
diff --git a/src/client/src/lib/platform/controller/table-details.ts b/src/client/src/lib/platform/controller/table-details.ts
index cc71aa54..93649058 100644
--- a/src/client/src/lib/platform/controller/table-details.ts
+++ b/src/client/src/lib/platform/controller/table-details.ts
@@ -2,6 +2,5 @@ export const CONTROLLER_SERVICES_TABLE = "openlit_controller_services";
export const CONTROLLER_INSTANCES_TABLE = "openlit_controller_instances";
export const CONTROLLER_CONFIG_TABLE = "openlit_controller_config";
export const CONTROLLER_ACTIONS_TABLE = "openlit_controller_actions";
-export const CONTROLLER_DESIRED_STATES_TABLE = "openlit_controller_desired_states";
export const CONTROLLER_DESIRED_STATES_V2_TABLE = "openlit_controller_desired_states_v2";
export const CONTROLLER_ENV_CONFIGS_TABLE = "openlit_controller_env_configs";