Skip to content

Commit 82656b8

Browse files
Merge branch 'master' of github.com:elastic/docs into bump-current-819
2 parents a9b835a + ae4b674 commit 82656b8

File tree

7 files changed

+142
-180
lines changed

7 files changed

+142
-180
lines changed

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# and takes longer to build but that is worth it.
1111
FROM bitnami/minideb:buster AS base
1212

13+
RUN echo "deb http://archive.debian.org/debian/ buster main" > /etc/apt/sources.list && \
14+
echo "deb http://archive.debian.org/debian-security/ buster/updates main" >> /etc/apt/sources.list
15+
1316
# TODO install_packages calls apt-get update and then nukes the list files after. We should avoid multiple calls to apt-get update.....
1417
# We could probably fix this by running the update and installs ourself with `RUN --mount type=cache` but that is "experimental"
1518

build_docs.pl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,7 @@ sub check_kibana_links {
413413
$branch = "main"
414414
}
415415
else {
416-
if ($version eq "8.x") {
417-
$branch = "8.19"
418-
}
419-
else {
420-
$branch = $version
421-
}
416+
$branch = $version
422417
}
423418
# $branch = $version eq "master" ? "main" : $version;
424419
say " Branch: $branch, Version: $version";

conf.yaml

Lines changed: 50 additions & 85 deletions
Large diffs are not rendered by default.

shared/versions/stack/8.17.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
:version: 8.17.8
1+
:version: 8.17.9
22
////
33
bare_version never includes -alpha or -beta
44
////
5-
:bare_version: 8.17.8
6-
:logstash_version: 8.17.8
7-
:elasticsearch_version: 8.17.8
8-
:kibana_version: 8.17.8
9-
:apm_server_version: 8.17.8
5+
:bare_version: 8.17.9
6+
:logstash_version: 8.17.9
7+
:elasticsearch_version: 8.17.9
8+
:kibana_version: 8.17.9
9+
:apm_server_version: 8.17.9
1010
// branch is 8.17 instead of 8.x for long-term linking purposes
1111
:branch: 8.17
1212
:minor-version: 8.17

shared/versions/stack/8.18.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
:version: 8.18.3
1+
:version: 8.18.4
22
////
33
bare_version never includes -alpha or -beta
44
////
5-
:bare_version: 8.18.3
6-
:logstash_version: 8.18.3
7-
:elasticsearch_version: 8.18.3
8-
:kibana_version: 8.18.3
9-
:apm_server_version: 8.18.3
5+
:bare_version: 8.18.4
6+
:logstash_version: 8.18.4
7+
:elasticsearch_version: 8.18.4
8+
:kibana_version: 8.18.4
9+
:apm_server_version: 8.18.4
1010
// branch is 8.18 instead of 8.x for long-term linking purposes
1111
:branch: 8.18
1212
:minor-version: 8.18

shared/versions/stack/8.19.asciidoc

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
:version: 8.19.0
2+
////
3+
bare_version never includes -alpha or -beta
4+
////
5+
:bare_version: 8.19.0
6+
:logstash_version: 8.19.0
7+
:elasticsearch_version: 8.19.0
8+
:kibana_version: 8.19.0
9+
:apm_server_version: 8.19.0
10+
:branch: 8.19
11+
:minor-version: 8.19
12+
:major-version: 8.x
13+
:prev-major-version: 7.x
14+
:prev-major-last: 7.17
15+
:major-version-only: 8
16+
:ecs_version: 8.17
17+
:esf_version: master
18+
:ece-version-link: current
19+
//////////
20+
Keep the :esf_version: attribute value as master.
21+
//////////
22+
23+
//////////
24+
release-state can be: released | prerelease | unreleased
25+
//////////
26+
:release-state: unreleased
27+
28+
//////////
29+
is-current-version can be: true | false
30+
//////////
31+
:is-current-version: false
32+
33+
//////////
34+
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
35+
//////////
36+
:hide-xpack-tags: true
37+
38+
////
39+
APM Agent versions
40+
////
41+
:apm-android-branch: 1.x
42+
:apm-go-branch: 2.x
43+
:apm-ios-branch: 1.x
44+
:apm-java-branch: 1.x
45+
:apm-rum-branch: 5.x
46+
:apm-node-branch: 4.x
47+
:apm-php-branch: 1.x
48+
:apm-py-branch: 6.x
49+
:apm-ruby-branch: 4.x
50+
:apm-dotnet-branch: 1.x
51+
52+
////
53+
ECS Logging
54+
////
55+
:ecs-logging: master
56+
:ecs-logging-go-logrus: master
57+
:ecs-logging-go-zap: master
58+
:ecs-logging-go-zerolog: master
59+
:ecs-logging-java: 1.x
60+
:ecs-logging-dotnet: master
61+
:ecs-logging-nodejs: master
62+
:ecs-logging-php: master
63+
:ecs-logging-python: master
64+
:ecs-logging-ruby: master
65+
66+
////
67+
Synthetics
68+
////
69+
:synthetics_version: v1.3.0
70+
71+
////
72+
API URLs
73+
////
74+
:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8
75+
:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8
76+
:api-ls: https://www.elastic.co/docs/api/doc/logstash

shared/versions/stack/8.x.asciidoc

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

0 commit comments

Comments
 (0)