From aafe716823d88b6d7c17a2fa3317ca6d1fa0bda9 Mon Sep 17 00:00:00 2001 From: centdix <40307056+centdix@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:25:34 +0100 Subject: [PATCH 01/58] chore: add env config for wmdev (#8209) * add wmdev startup envs * name --- .wmdev.yaml | 5 +++++ .workmux.yaml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.wmdev.yaml b/.wmdev.yaml index 8a5afce840..c028c8f3bf 100644 --- a/.wmdev.yaml +++ b/.wmdev.yaml @@ -1,3 +1,8 @@ +name: Windmill + +startupEnvs: + CARGO_FEATURES: "quickjs" + services: - name: BE portEnv: BACKEND_PORT diff --git a/.workmux.yaml b/.workmux.yaml index fcd1906080..46049109c0 100644 --- a/.workmux.yaml +++ b/.workmux.yaml @@ -1,5 +1,3 @@ -name: Windmill - main_branch: main merge_strategy: rebase From f331e1f0adacd5f2a8a995ca6b20f6f6a5d3fbb4 Mon Sep 17 00:00:00 2001 From: Henri Courdent <122811744+hcourdent@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:11:54 +0100 Subject: [PATCH 02/58] Error frontend links (#8210) --- frontend/src/lib/components/InstanceSettings.svelte | 2 +- .../components/workspaceSettings/WorkspaceIntegrations.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte index 10f65061bf..152b58dc96 100644 --- a/frontend/src/lib/components/InstanceSettings.svelte +++ b/frontend/src/lib/components/InstanceSettings.svelte @@ -913,7 +913,7 @@ {:else if category == 'Indexer'} {#if pendingCallback} From 7b6f1deeb125c59c9ca6609825171d6a92c0d360 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 3 Mar 2026 16:25:05 +0000 Subject: [PATCH 03/58] update ee ref --- backend/ee-repo-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 516de61c27..a04b5844ea 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -8ffae1f43b31dc8136714fa612d22b6301773e27 +8ffae1f43b31dc8136714fa612d22b6301773e27 \ No newline at end of file From ee01acd9a6a2cd68a3f226988bfb46f6a6e64c08 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 3 Mar 2026 16:46:10 +0000 Subject: [PATCH 04/58] feat: move index management out of /srch/, add storage size reporting (#8169) * feat: move index management endpoints out of /srch/, add storage size reporting - Mount management_service() at /api/indexer (authenticated) - Add management_service() OSS stub in indexer_oss.rs - Update OpenAPI: /indexer/delete/{idx_name} and /indexer/storage - Show disk + S3 storage sizes in IndexerMemorySettings UI Co-Authored-By: Claude Opus 4.6 * feat: add index storage section with refresh button Move storage sizes into a dedicated "Index storage" section with a refresh button to reload sizes after clearing an index. Co-Authored-By: Claude Opus 4.6 * feat: add indexer status endpoint with liveness detection and improve settings UI Add GET /indexer/status endpoint that combines lock-based liveness detection with storage sizes. Frontend now shows running/stopped indicators with last-active timestamps for each indexer. Co-Authored-By: Claude Opus 4.6 * update ee ref * fix --------- Co-authored-by: Claude Opus 4.6 --- backend/ee-repo-ref.txt | 2 +- backend/windmill-api/openapi.yaml | 96 +++++++++++- backend/windmill-api/src/indexer_oss.rs | 5 + backend/windmill-api/src/lib.rs | 17 ++- .../IndexerMemorySettings.svelte | 143 +++++++++++++++--- 5 files changed, 232 insertions(+), 31 deletions(-) diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index a04b5844ea..e0d990384a 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -8ffae1f43b31dc8136714fa612d22b6301773e27 \ No newline at end of file +9b3339730eb4bb0b564c7c56ac546f33fb3d8905 \ No newline at end of file diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml index 7e89e6dd0e..4dc1d252c4 100644 --- a/backend/windmill-api/openapi.yaml +++ b/backend/windmill-api/openapi.yaml @@ -16973,9 +16973,9 @@ paths: description: count of log lines that matched the query per hostname type: object - /srch/index/delete/{idx_name}: + /indexer/delete/{idx_name}: delete: - summary: Restart container and delete the index to recreate it. + summary: Clear an index and restart the indexer. operationId: clearIndex tags: - indexSearch @@ -16990,12 +16990,102 @@ paths: - ServiceLogIndex responses: "200": - description: idx to be deleted and container restarting + description: idx to be deleted and indexer restarting content: text/plain: schema: type: string + /indexer/storage: + get: + summary: Get index storage sizes (disk and S3). + operationId: getIndexStorageSizes + tags: + - indexSearch + responses: + "200": + description: storage sizes for each index + content: + application/json: + schema: + type: object + properties: + job_index: + type: object + properties: + disk_size_bytes: + type: integer + nullable: true + s3_size_bytes: + type: integer + nullable: true + service_log_index: + type: object + properties: + disk_size_bytes: + type: integer + nullable: true + s3_size_bytes: + type: integer + nullable: true + + /indexer/status: + get: + summary: Get indexer status including liveness and storage sizes. + operationId: getIndexerStatus + tags: + - indexSearch + responses: + "200": + description: indexer status for each index + content: + application/json: + schema: + type: object + properties: + job_indexer: + type: object + properties: + is_alive: + type: boolean + last_locked_at: + type: string + format: date-time + nullable: true + owner: + type: string + nullable: true + storage: + type: object + properties: + disk_size_bytes: + type: integer + nullable: true + s3_size_bytes: + type: integer + nullable: true + log_indexer: + type: object + properties: + is_alive: + type: boolean + last_locked_at: + type: string + format: date-time + nullable: true + owner: + type: string + nullable: true + storage: + type: object + properties: + disk_size_bytes: + type: integer + nullable: true + s3_size_bytes: + type: integer + nullable: true + /w/{workspace}/assets/list: get: summary: List all assets in the workspace with cursor pagination diff --git a/backend/windmill-api/src/indexer_oss.rs b/backend/windmill-api/src/indexer_oss.rs index eee87acdcb..fd87c10fe2 100644 --- a/backend/windmill-api/src/indexer_oss.rs +++ b/backend/windmill-api/src/indexer_oss.rs @@ -14,3 +14,8 @@ pub fn workspaced_service() -> Router { pub fn global_service() -> Router { Router::new() } + +#[cfg(not(feature = "private"))] +pub fn management_service() -> Router { + Router::new() +} diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs index 76fe0224ed..9b713cad0a 100644 --- a/backend/windmill-api/src/lib.rs +++ b/backend/windmill-api/src/lib.rs @@ -58,10 +58,7 @@ use windmill_common::db::UserDB; use windmill_common::worker::CLOUD_HOSTED; #[allow(unused_imports)] pub(crate) use windmill_common::BASE_URL; -use windmill_common::{ - utils::GIT_VERSION, - INSTANCE_NAME, -}; +use windmill_common::{utils::GIT_VERSION, INSTANCE_NAME}; use crate::scim_oss::has_scim_token; use windmill_common::error::AppError; @@ -550,6 +547,7 @@ pub async fn run_server( .nest("/embeddings", embeddings::global_service()) .nest("/ai", ai::global_service()) .nest("/inkeep", inkeep_oss::global_service()) + .nest("/indexer", indexer_oss::management_service()) .nest("/mcp/w/:workspace_id/list_tools", mcp_list_tools_service) .nest("/health/detailed", health::detailed_service()) .route_layer(from_extractor::()) @@ -612,8 +610,10 @@ pub async fn run_server( if let Some(agent_workers_job_completed_tx) = agent_workers_job_completed_tx.clone() { - windmill_api_agent_workers::global_service(agent_workers_job_completed_tx) - .layer(Extension(agent_cache.clone())) + windmill_api_agent_workers::global_service( + agent_workers_job_completed_tx, + ) + .layer(Extension(agent_cache.clone())) } else { Router::new() } @@ -785,7 +785,10 @@ pub async fn run_server( }, ) // JWKS endpoint for HashiCorp Vault JWT authentication (must be outside /api prefix) - .route("/.well-known/jwks.json", get(windmill_api_settings::get_jwks)) + .route( + "/.well-known/jwks.json", + get(windmill_api_settings::get_jwks), + ) .fallback(static_assets::static_handler) .layer(middleware_stack); diff --git a/frontend/src/lib/components/instanceSettings/IndexerMemorySettings.svelte b/frontend/src/lib/components/instanceSettings/IndexerMemorySettings.svelte index 4044c141fc..5a9dfb496a 100644 --- a/frontend/src/lib/components/instanceSettings/IndexerMemorySettings.svelte +++ b/frontend/src/lib/components/instanceSettings/IndexerMemorySettings.svelte @@ -2,11 +2,14 @@ import { Button } from '$lib/components/common' import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte' import { IndexSearchService } from '$lib/gen' + import type { GetIndexerStatusResponse } from '$lib/gen' import { sendUserToast } from '$lib/toast' + import { displaySize } from '$lib/utils' import Tooltip from '../Tooltip.svelte' import IntegerInput from '../IntegerInput.svelte' import InputError from '../InputError.svelte' import Label from '../Label.svelte' + import { Loader2, RefreshCw } from 'lucide-svelte' import type { Writable } from 'svelte/store' interface Props { @@ -19,6 +22,35 @@ let clearJobsIndexModalOpen = $state(false) let clearServiceLogsIndexModalOpen = $state(false) + + let status: GetIndexerStatusResponse | undefined = $state(undefined) + let statusLoading = $state(true) + let statusError = $state(false) + + function formatTimeAgo(isoDate: string): string { + const diffMs = Date.now() - new Date(isoDate).getTime() + const diffSecs = Math.floor(diffMs / 1000) + if (diffSecs < 60) return `${diffSecs}s ago` + const diffMins = Math.floor(diffSecs / 60) + if (diffMins < 60) return `${diffMins}m ago` + const diffHours = Math.floor(diffMins / 60) + return `${diffHours}h ago` + } + + async function loadStatus() { + statusLoading = true + statusError = false + try { + status = await IndexSearchService.getIndexerStatus() + } catch (e) { + status = undefined + statusError = true + } finally { + statusLoading = false + } + } + + loadStatus()
@@ -52,30 +84,101 @@ />
+ +