Skip to content

Commit b65f88b

Browse files
authored
Merge branch 'main' into fix/test-elastic-nav
2 parents 7a75f9d + 4509194 commit b65f88b

262 files changed

Lines changed: 42886 additions & 4154 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/settings.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(find:*)",
5+
"Bash(wc:*)",
6+
"Bash(dotnet build:*)",
7+
"Bash(npm run compile:check:*)",
8+
"Bash(npx tsc:*)",
9+
"Bash(npm exec:*)",
10+
"Bash(npm install:*)",
11+
"Bash(npm run build:*)",
12+
"Bash(git grep:*)"
13+
]
14+
}
15+
}

.github/workflows/assembler-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ concurrency:
2626

2727
jobs:
2828
build:
29-
runs-on: ubuntu-latest
29+
runs-on: docs-internal-latest-16
3030
env:
3131
PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
3232
ASSEMBLER_PREVIEW_PATH_PREFIX: ${{ github.repository }}/docs/${{ github.event.pull_request.number || inputs.pr_number }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
.artifacts
7+
.claude
8+
!.claude/settings.json
79

810
# User-specific files
911
*.rsuser

.vscode/launch.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
// Use IntelliSense to find out which attributes exist for C# debugging
6+
// Use hover for the description of the existing attributes
7+
// For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/.artifacts/bin/docs-builder/debug/docs-builder.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/src/tooling/docs-builder",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach"
24+
}
25+
]
26+
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dotnet.defaultSolution": "docs-builder.sln"
3+
}

.vscode/tasks.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/docs-builder.sln",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary;ForceNoAlign"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/docs-builder.sln",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary;ForceNoAlign"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"--project",
36+
"${workspaceFolder}/docs-builder.sln"
37+
],
38+
"problemMatcher": "$msCompile"
39+
}
40+
]
41+
}

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<PackageVersion Include="Amazon.Lambda.AspNetCoreServer.Hosting" Version="1.9.0" />
1717
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
1818
<PackageVersion Include="Amazon.Lambda.Core" Version="2.8.0" />
19-
<PackageVersion Include="Amazon.Lambda.S3Events" Version="3.1.0" />
20-
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
21-
<PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
19+
<PackageVersion Include="Amazon.Lambda.S3Events" Version="3.1.2" />
20+
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.5" />
21+
<PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.1" />
2222
<PackageVersion Include="AngleSharp" Version="1.4.0" />
2323
<PackageVersion Include="Aspire.Hosting" Version="13.0.0" />
2424
<PackageVersion Include="Aspire.Hosting.Testing" Version="13.0.0" />
25-
<PackageVersion Include="AWSSDK.Core" Version="4.0.3.8" />
25+
<PackageVersion Include="AWSSDK.Core" Version="4.0.3.9" />
2626
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.10.5" />
27-
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.11" />
27+
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.12" />
2828
<PackageVersion Include="AWSSDK.S3" Version="4.0.16.2" />
2929
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
3030
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />

config/assembler.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ environments:
2828
google_tag_manager:
2929
enabled: false
3030
feature_flags:
31-
LAZY_LOAD_NAVIGATION: true
3231
SEARCH_OR_ASK_AI: true
3332
dev:
3433
uri: http://localhost:4000
@@ -48,7 +47,7 @@ environments:
4847
shared_configuration:
4948
stack: &stack
5049
current: 9.2
51-
next: main
50+
next: 9.3
5251
edge: main
5352

5453
master: &master
@@ -102,6 +101,8 @@ references:
102101
ecs-logging-python:
103102
ecs-logging-ruby:
104103
ecs-logging:
104+
edot-cloud-forwarder-aws:
105+
private: true
105106
elastic-agent:
106107
elastic-otel-dotnet:
107108
elastic-otel-java:

config/changelog.example.yml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# Changelog Configuration
2+
# This file configures the valid values for changelog fields.
3+
# Place this file as `changelog.yml` in the `docs/` directory
4+
5+
# Available types for changelog entries
6+
available_types:
7+
- breaking-change
8+
- bug-fix
9+
- deprecation
10+
- docs
11+
- enhancement
12+
- feature
13+
- known-issue
14+
- other
15+
- regression
16+
- security
17+
18+
# Available subtypes for breaking changes
19+
available_subtypes:
20+
- api
21+
- behavioral
22+
- configuration
23+
- dependency
24+
- subscription
25+
- plugin
26+
- security
27+
- other
28+
29+
# Available lifecycle values
30+
available_lifecycles:
31+
- preview
32+
- beta
33+
- ga
34+
35+
# Available areas (optional - if not specified, all areas are allowed)
36+
available_areas:
37+
# - Autoscaling
38+
# - Search
39+
# - Security
40+
# - Watcher
41+
# Add more areas as needed
42+
43+
# Available products (optional - if not specified, all products are allowed)
44+
available_products:
45+
# - elasticsearch
46+
# - kibana
47+
# - apm
48+
# - beats
49+
# - elastic-agent
50+
# - fleet
51+
# - cloud-hosted
52+
# - cloud-serverless
53+
# - cloud-enterprise
54+
# Add more products as needed
55+
56+
# GitHub label mappings (optional - used when --pr option is specified)
57+
# Maps GitHub PR labels to changelog type values
58+
# When a PR has a label that matches a key, the corresponding type value is used
59+
label_to_type:
60+
# Example mappings - customize based on your label naming conventions
61+
# ">breaking": breaking-change
62+
# ">bug": bug-fix
63+
# ">docs": docs
64+
# ">enhancement": enhancement
65+
# ">feature": feature
66+
67+
# Maps GitHub PR labels to changelog area values
68+
# Multiple labels can map to the same area, and a single label can map to multiple areas (comma-separated)
69+
label_to_areas:
70+
# Example mappings - customize based on your label naming conventions
71+
# ":Distributed Coordination/Autoscaling": Autoscaling
72+
# ":Search/Search": Search
73+
# ":Security/Security": Security
74+
# ":Data Management/Watcher": Watcher
75+
# "area:multiple": "Search, Security" # Multiple areas comma-separated
76+
77+
# Product-specific label blockers (optional)
78+
# Maps product IDs to lists of pull request labels that prevent changelog creation for that product
79+
# If you run the changelog add command with the --prs option and a PR has any of these labels, the changelog is not created
80+
# Product IDs can be comma-separated to share the same list of labels across multiple products
81+
add_blockers:
82+
# Example: Skip changelog creation for elasticsearch product when PR has these labels
83+
# elasticsearch:
84+
# - ">non-issue"
85+
# - ">test"
86+
# - ">refactoring"
87+
# Example: Share the same blockers across multiple products using comma-separated product IDs
88+
# elasticsearch, cloud-serverless:
89+
# - ">non-issue"
90+
91+
# Render blockers (optional - used by the "docs-builder changelog render" command)
92+
# Changelogs matching the specified products and areas/types will be commented out in rendered output files
93+
# Dictionary key can be a single product ID or comma-separated product IDs (e.g., "elasticsearch, cloud-serverless")
94+
# Dictionary value contains areas and/or types that should be blocked for those products
95+
render_blockers:
96+
# Multiple products (comma-separated) with areas and types that should be blocked
97+
"cloud-hosted, cloud-serverless":
98+
areas: # List of area values that should be blocked (commented out) during render
99+
- Autoscaling
100+
- Watcher
101+
types: # List of type values that should be blocked (commented out) during render
102+
- docs
103+
# Single product with areas that should be blocked
104+
elasticsearch:
105+
areas:
106+
- Security

config/changelog.yml.example

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)