Skip to content

Commit 4051b97

Browse files
authored
Merge branch 'main' into theletterf-add-kroki-caching
2 parents 2d7aae9 + 1122678 commit 4051b97

Some content is hidden

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

59 files changed

+12437
-4755
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
* @elastic/docs-engineering
2-
/docs/ @elastic/docs
3-
/config/ @elastic/docs-tech-leads
2+
/docs/ @elastic/docs @elastic/docs-engineering
3+
/config/ @elastic/docs-tech-leads @elastic/docs-engineering

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
build-lambda:
3636
uses: ./.github/workflows/build-link-index-updater-lambda.yml
3737

38-
lint:
38+
npm:
3939
runs-on: ubuntu-latest
4040
defaults:
4141
run:
@@ -57,6 +57,12 @@ jobs:
5757

5858
- name: Format
5959
run: npm run fmt:check
60+
61+
- name: Build
62+
run: npm run build
63+
64+
- name: Test
65+
run: npm run test
6066

6167

6268
build:

.github/workflows/updatecli.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
name: updatecli
3+
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
- cron: "0 5 * * 1-5"
8+
9+
permissions:
10+
contents: read
11+
12+
env:
13+
JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
14+
15+
jobs:
16+
bump:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
21+
- name: Get token
22+
id: get_token
23+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
24+
with:
25+
app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
26+
private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
27+
permissions: >-
28+
{
29+
"contents": "write",
30+
"pull_requests": "write"
31+
}
32+
repositories: >-
33+
["docs-builder"]
34+
35+
- uses: elastic/oblt-actions/updatecli/run@v1
36+
with:
37+
command: apply --config updatecli/updatecli.d/versions.yml --values updatecli/values.d/scm.yml
38+
env:
39+
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
40+
41+
- if: ${{ failure() }}
42+
uses: elastic/oblt-actions/slack/send@v1
43+
with:
44+
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
45+
channel-id: "#docs-team"
46+
message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, please look what's going on <${{ env.JOB_URL }}|here>"

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<PackageVersion Include="Markdig" Version="0.41.1" />
4444
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
4545
<PackageVersion Include="Proc" Version="0.9.1" />
46-
<PackageVersion Include="RazorSlices" Version="0.9.0" />
46+
<PackageVersion Include="RazorSlices" Version="0.9.2" />
4747
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
4848
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
4949
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
@@ -71,4 +71,4 @@
7171
</PackageVersion>
7272
<PackageVersion Include="xunit.v3" Version="2.0.2" />
7373
</ItemGroup>
74-
</Project>
74+
</Project>

config/assembler.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ environments:
3232

3333
shared_configuration:
3434
stack: &stack
35-
current: 9.0
36-
next: 9.1
35+
current: 9.1
36+
next: main
3737
edge: main
3838

3939
master: &master
@@ -136,3 +136,4 @@ references:
136136
current: 9.0
137137
next: main
138138
skip: true
139+
sparse_paths: ["docs", "config"]

config/legacy-url-mappings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mappings:
1111
en/apm/agent/dotnet/: [ '1.32.0', '1.8' ]
1212
en/apm/agent/go/: [ '2.7.1', '1.x', '0.5' ]
1313
en/apm/agent/java/: ['1.54.0', '0.7', '0.6']
14-
en/apm/agent/nodejs/: [ '3.x', '2.x', '1.x' ]
14+
en/apm/agent/nodejs/: [ '4.0+', '3.x', '2.x', '1.x' ]
1515
en/apm/agent/php/: []
1616
en/apm/agent/python/: [ '6.23.0', '5.x', '4.x', '3.x', '2.x', '1.x' ]
1717
en/apm/agent/ruby/: [ '4.7.3', '3.x', '2.x', '1.x' ]

config/versions.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
versioning_systems:
2+
# This file contains the version numbers for various Elastic products and tools.
3+
# Updates for Stack versions are manual
24
stack: &stack
35
base: 9.0
4-
current: 9.0.4
5-
6+
current: 9.1.0
7+
68
# Using an unlikely high version
79
# So that our logic that would display "planned" doesn't trigger
810
all: &all
911
base: 99999
1012
current: 99999
1113

12-
# deployment types
14+
# Deployment types
15+
# Ece version updates are manual
1316
ece:
1417
base: 4.0
1518
current: 4.1
1619
ech: *all
1720
eck:
1821
base: 3.0
19-
current: 3.0
22+
current: 3.0.0
2023
ess: *all
2124
self: *stack
22-
23-
# things that i don't know about
2425
ecctl:
2526
base: 1.0
26-
current: 1.15
27+
current: 1.15.0
2728
curator:
2829
base: 8.0
29-
current: 8.21
30-
31-
# serverless
30+
current: 8.0.21
31+
32+
# Serverless
3233
serverless: *all
3334
elasticsearch: *all
3435
observability: *all
3536
security: *all
3637

3738
# APM agents
3839
# apm_agent_android:
39-
# base: 1.0
40-
# current: 1.0.0
40+
# base: 1.0
41+
# current: 1.0.0
4142
apm_agent_dotnet:
4243
base: 1.0
43-
current: 1.32.0
44+
current: 1.32.2
4445
apm_agent_go:
4546
base: 2.0
46-
current: 2.71
47+
current: 2.7.1
4748
apm_agent_java:
4849
base: 1.0
49-
current: 1.54.0
50+
current: 1.55.0
5051
apm_agent_node:
5152
base: 4.0
5253
current: 4.13.0
5354
apm_agent_php:
5455
base: 1.0
55-
current: 1.15
56+
current: 1.15.1
5657
apm_agent_python:
5758
base: 6.0
5859
current: 6.23.0
5960
apm_agent_ruby:
6061
base: 4.0
61-
current: 4.7.3
62+
current: 4.8.0
6263
apm_agent_rum:
6364
base: 5.0
6465
current: 5.17.0
6566

6667
# EDOTs
6768
edot_collector:
6869
base: 9.0
69-
current: 9.0.3
70+
current: 9.1.0
7071
edot_ios:
7172
base: 1.0
7273
current: 1.2.1
7374
edot_android:
7475
base: 1.0
75-
current: 1.1.0
76+
current: 1.2.0
7677
edot_dotnet:
7778
base: 1.0
78-
current: 1.0.2
79+
current: 1.1.0
7980
edot_java:
8081
base: 1.0
81-
current: 1.4.1
82+
current: 1.5.0
8283
edot_node:
8384
base: 1.0
8485
current: 1.1.1
8586
edot_php:
8687
base: 1.0
87-
current: 1.0.0
88+
current: 1.1.1
8889
edot_python:
8990
base: 1.0
90-
current: 1.3.0
91+
current: 1.5.0
9192
edot_cf_aws:
9293
base: 0.1
9394
current: 0.1.6
94-

docs/_docset.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ subs:
2020
features:
2121
primary-nav: false
2222

23-
#api: kibana-openapi.json
24-
api: elasticsearch-openapi.json
23+
api:
24+
elasticsearch: elasticsearch-openapi.json
25+
kibana: kibana-openapi.json
2526

2627
toc:
2728
- file: index.md

docs/syntax-docs-builder.zip

-3.84 MB
Binary file not shown.

0 commit comments

Comments
 (0)