Merge branch 'main' into feature/search-enhancements-again

Author: cotti

config/assembler.yml

@@ -30,6 +30,8 @@ environments:
     uri: http://localhost:4000
     content_source: current
     path_prefix: docs
+    feature_flags:
+      SEARCH_OR_ASK_AI: true
 
 shared_configuration:
   stack: &stack
@@ -76,7 +78,7 @@ references:
   apm-aws-lambda:
   apm-k8s-attacher:
   ecs:
-    current: 9.0 # releases do not always align with the Stack version
+    current: 9.1 # releases do not always align with the Stack version
     next: main
   ecs-dotnet:
   ecs-logging-go-logrus:

config/versions.yml

@@ -3,7 +3,7 @@ versioning_systems:
   # Updates for Stack versions are manual
   stack: &stack
     base: 9.0
-    current: 9.1.1
+    current: 9.1.2
 
   # Using an unlikely high version
   # So that our logic that would display "planned" doesn't trigger

src/Elastic.Documentation.Site/Layout/_Footer.cshtml

@@ -27,9 +27,14 @@
 				© @(DateTime.Today.Year) Elasticsearch B.V. All Rights Reserved.
 			</p>
 		</div>
-		<p class="mt-4">
-			Elasticsearch is a trademark of Elasticsearch B.V., registered in the U.S. and in other countries. Apache, Apache Lucene, Apache Hadoop, Hadoop, HDFS and the yellow elephant logo are trademarks of the Apache Software Foundation in the United States and/or other countries.
-		</p>
+		<div class="mt-4">
+			<p>
+				This content is available in different formats for convenience only. All original licensing terms apply.
+			</p>
+			<p class="mt-4">
+				Elasticsearch is a trademark of Elasticsearch B.V., registered in the U.S. and in other countries. Apache, Apache Lucene, Apache Hadoop, Hadoop, HDFS and the yellow elephant logo are trademarks of the Apache Software Foundation in the United States and/or other countries. 
+			</p>
+		</div>
 	</div>
 	</div>
 </footer>

src/Elastic.Documentation.Site/_static/elasticon-2025-docs-page-banner-v3.png

@@ -34,7 +34,9 @@
 				}
 			</div>
 			<div class="flex justify-center items-center">
-				<img src="@Model.Static("web-documentation-hero-illustration.svg")" alt="" width="400">
+				<a href="https://www.elastic.co/events/elasticon" target="_blank">
+					<img src="@Model.Static("elasticon-2025-docs-page-banner-v3.png")" alt="Register now for ElasticON" width="1200">
+				</a>
 			</div>
 		</div>
 	</section>

src/Elastic.Markdown/Layout/_LandingPage.cshtml

@@ -45,6 +45,11 @@ public async Task<int> ValidateRedirects([Argument] string? path = null, Cancel
 		var sourceFile = buildContext.ConfigurationPath;
 		var redirectFileName = sourceFile.Name.StartsWith('_') ? "_redirects.yml" : "redirects.yml";
 		var redirectFileInfo = sourceFile.FileSystem.FileInfo.New(Path.Combine(sourceFile.Directory!.FullName, redirectFileName));
+		if (!redirectFileInfo.Exists)
+		{
+			await collector.StopAsync(ctx);
+			return 0;
+		}
 
 		var redirectFileParser = new RedirectFile(redirectFileInfo, buildContext);
 		var redirects = redirectFileParser.Redirects;

src/tooling/docs-builder/Cli/DiffCommands.cs

@@ -144,7 +144,6 @@ private void SetUpRoutes()
 		_ = _webApplication.MapGet("/api/{**slug}", (string slug, ReloadableGeneratorState holder, Cancel ctx) =>
 			ServeApiFile(holder, slug, ctx));
 
-
 		var apiV1 = _webApplication.MapGroup("/docs/_api/v1");
 		apiV1.MapElasticDocsApiEndpoints();
 

src/tooling/docs-builder/Http/DocumentationWebHost.cs

@@ -2,9 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using Elastic.Documentation.Api.Infrastructure;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.ServiceDefaults;
-using Elastic.Documentation.Tooling;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -28,6 +28,8 @@ public StaticWebHost(int port)
 
 		_ = builder.AddDocumentationServiceDefaults();
 
+		builder.Services.AddElasticDocsApiUsecases("dev");
+
 		_ = builder.Logging
 			.AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Error)
 			.AddFilter("Microsoft.AspNetCore.StaticFiles.StaticFileMiddleware", LogLevel.Error)
@@ -51,6 +53,10 @@ private void SetUpRoutes()
 		_ = WebApplication.MapGet("/", (Cancel _) => Results.Redirect("docs"));
 
 		_ = WebApplication.MapGet("{**slug}", ServeDocumentationFile);
+
+		var apiV1 = WebApplication.MapGroup("/docs/_api/v1");
+		apiV1.MapElasticDocsApiEndpoints();
+
 	}
 
 	private async Task<IResult> ServeDocumentationFile(string slug, Cancel _)

src/tooling/docs-builder/Http/StaticWebHost.cs

@@ -34,6 +34,9 @@ public async ValueTask InitializeAsync()
 		_ = builder.Services.AddElasticDocumentationLogging(LogLevel.Information);
 		_ = builder.Services.AddLogging(c => c.AddXUnit());
 		_ = builder.Services.AddLogging(c => c.AddInMemory());
+		// TODO expose this as secrets for now not needed integration tests
+		_ = builder.AddParameter("LlmGatewayUrl", "");
+		_ = builder.AddParameter("LlmGatewayServiceAccountPath", "");
 		DistributedApplication = await builder.BuildAsync();
 		InMemoryLogger = DistributedApplication.Services.GetService<InMemoryLogger>()!;
 		await DistributedApplication.StartAsync();

tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs

@@ -19,19 +19,39 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 
+// Add a secret parameter named "secret"
+var llmUrl = builder.AddParameter("LlmGatewayUrl", secret: true);
+var llmServiceAccountPath = builder.AddParameter("LlmGatewayServiceAccountPath", secret: true);
+
 var cloneAll = builder.AddProject<Projects.docs_assembler>("DocsAssemblerCloneAll").WithArgs(["repo", "clone-all", .. globalArguments]);
 
 var buildAll = builder.AddProject<Projects.docs_assembler>("DocsAssemblerBuildAll").WithArgs(["repo", "build-all", .. globalArguments])
 	.WaitForCompletion(cloneAll);
 
-var elasticsearch = builder.AddElasticsearch("elasticsearch");
+var elasticsearch = builder.AddElasticsearch("elasticsearch")
+	.WithEnvironment("LICENSE", "trial");
 
 var api = builder.AddProject<Projects.Elastic_Documentation_Api_Lambda>("ApiLambda").WithArgs(globalArguments)
+	.WithEnvironment("ENVIRONMENT", "dev")
+	.WithEnvironment("LLM_GATEWAY_FUNCTION_URL", llmUrl)
+	.WithEnvironment("LLM_GATEWAY_SERVICE_ACCOUNT_KEY_PATH", llmServiceAccountPath)
 	.WaitFor(elasticsearch)
 	.WithReference(elasticsearch);
 
 var indexElasticsearch = builder.AddProject<Projects.docs_assembler>("DocsAssemblerElasticsearch")
-	.WithArgs(["repo", "build-all", "--exporters", "html,elasticsearch", .. globalArguments])
+	.WithArgs(["repo", "build-all", "--exporters", "elasticsearch", .. globalArguments])
+	.WithEnvironment("DOCUMENTATION_ELASTIC_URL", elasticsearch.GetEndpoint("http"))
+	.WithEnvironment(context =>
+	{
+		context.EnvironmentVariables["DOCUMENTATION_ELASTIC_PASSWORD"] = elasticsearch.Resource.PasswordParameter;
+	})
+	.WithReference(elasticsearch)
+	.WithExplicitStart()
+	.WaitFor(elasticsearch)
+	.WaitForCompletion(cloneAll);
+
+var indexElasticsearchSemantic = builder.AddProject<Projects.docs_assembler>("DocsAssemblerElasticsearchSemantic")
+	.WithArgs(["repo", "build-all", "--exporters", "semantic", .. globalArguments])
 	.WithEnvironment("DOCUMENTATION_ELASTIC_URL", elasticsearch.GetEndpoint("http"))
 	.WithEnvironment(context =>
 	{
@@ -44,11 +64,17 @@
 
 var serveStatic = builder.AddProject<Projects.docs_builder>("DocsBuilderServeStatic")
 	.WithReference(elasticsearch)
+	.WithEnvironment("LLM_GATEWAY_FUNCTION_URL", llmUrl)
+	.WithEnvironment("LLM_GATEWAY_SERVICE_ACCOUNT_KEY_PATH", llmServiceAccountPath)
+	.WithEnvironment("DOCUMENTATION_ELASTIC_URL", elasticsearch.GetEndpoint("http"))
+	.WithEnvironment(context =>
+	{
+		context.EnvironmentVariables["DOCUMENTATION_ELASTIC_PASSWORD"] = elasticsearch.Resource.PasswordParameter;
+	})
 	.WithHttpEndpoint(port: 4000, isProxied: false)
 	.WithArgs(["serve-static", .. globalArguments])
 	.WithHttpHealthCheck("/", 200)
+	.WaitFor(elasticsearch)
 	.WaitForCompletion(buildAll);
 
-
-
 builder.Build().Run();