Skip to content

Commit 6eb6928

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/index-documents
2 parents 411c590 + 13242b1 commit 6eb6928

File tree

31 files changed

+1509
-2220
lines changed

31 files changed

+1509
-2220
lines changed

.github/actions/aws-auth/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
with open(os.environ["GITHUB_OUTPUT"], "a") as f:
3838
f.write(f"result=arn:aws:iam::{os.environ["AWS_ACCOUNT_ID"]}:role/{prefix}{hash}")
3939
- name: Configure AWS Credentials
40-
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
40+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
4141
with:
4242
role-to-assume: ${{ steps.role_arn.outputs.result }}
4343
aws-region: ${{ inputs.aws_region }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
run: |
100100
zip -j "${ZIP_FILE}" ./bootstrap
101101
102-
- uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
102+
- uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
103103
with:
104104
role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-link-index-updater-deployer
105105
aws-region: us-east-2

actions/update-link-index/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ runs:
4242
with open(os.environ["GITHUB_OUTPUT"], "a") as f:
4343
f.write(f"result=arn:aws:iam::{aws_account_id}:role/{prefix}{hash}")
4444
- name: Configure AWS Credentials
45-
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
45+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
4646
with:
4747
role-to-assume: ${{ steps.role_arn.outputs.result }}
4848
aws-region: us-east-1

docs/contribute/locally.md

Lines changed: 61 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Follow these steps to contribute to Elastic docs.
55
* [Prerequisites](#prerequisites)
66
* [Step 1: Install `docs-builder`](#step-one)
77
* [Step 2: Clone a content repository](#step-two)
8-
* [Step 3: Serve the Documentation](#step-three)
9-
* [Step 4: Write docs!](#step-four)
8+
* [Step 3: Serve the documentation](#step-three)
9+
* [Step 4: Write the docs](#step-four)
1010
* [Step 5: Push your changes](#step-five)
1111

1212
## Prerequisites
@@ -35,10 +35,13 @@ This guide uses the first option. If you'd like to clone the repository and buil
3535
Run this command to download and install the latest version of `docs-builder`:
3636

3737
```sh
38-
sudo curl -L https://raw.githubusercontent.com/elastic/docs-builder/refs/heads/main/install.sh | sh
38+
curl -sL https://ela.st/docs-builder-install | sh
3939
```
40+
4041
This downloads the latest binary, makes it executable, and installs it to your user PATH.
4142

43+
To download and install the binary file manually, refer to [Releases](https://github.com/elastic/docs-builder/releases) on GitHub.
44+
4245
2. **Run docs-builder from a docs folder**
4346

4447
Use the `serve` command from any docs folder to start serving the documentation at http://localhost:3000. The path to the `docset.yml` file that you want to build can be specified with `-p`:
@@ -47,7 +50,9 @@ This guide uses the first option. If you'd like to clone the repository and buil
4750
docs-builder serve
4851
```
4952

50-
To download and install the binary file manually, refer to [Releases](https://github.com/elastic/docs-builder/releases) on GitHub.
53+
To download and install the binary file manually, refer to [Releases](https://github.com/elastic/docs-builder/releases) on GitHub.
54+
55+
If you get a `Permission denied` error, make sure that you aren't trying to run a directory instead of a file. Also, grant the binary file execution permissions using `chmod +x docs-builder`.
5156

5257
:::
5358

@@ -58,27 +63,24 @@ To download and install the binary file manually, refer to [Releases](https://gi
5863
Run this command to download and install the latest version of `docs-builder`:
5964

6065
```powershell
61-
iex (New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/elastic/docs-builder/refs/heads/main/install.ps1')
66+
iex (New-Object System.Net.WebClient).DownloadString('https://ela.st/docs-builder-install-win')
6267
```
6368

6469
This downloads the latest binary, makes it executable, and installs it to your user PATH.
6570

71+
To download and install the binary file manually, refer to [Releases](https://github.com/elastic/docs-builder/releases) on GitHub.
72+
6673
2. **Run docs-builder from a docs folder**
6774

6875
Use the `serve` command from any docs folder to start serving the documentation at http://localhost:3000. The path to the `docset.yml` file that you want to build can be specified with `-p`:
6976

7077
```sh
7178
docs-builder serve
7279
```
73-
74-
To download and install the binary file manually, refer to [Releases](https://github.com/elastic/docs-builder/releases) on GitHub.
75-
80+
7681
:::
7782
::::
7883

79-
:::{tip}
80-
Place the `docs-builder` binary file in a system path so that you can run it from any folder. On macOS, you can do this by running `sudo mv docs-builder /usr/local/bin/docs-builder`.
81-
:::
8284

8385
## Clone a content repository [#step-two]
8486

@@ -87,42 +89,71 @@ Documentation lives in many repositories across Elastic. If you're unsure which
8789
:::
8890

8991
In this guide, we'll clone the [`docs-content`](https://github.com/elastic/docs-content) repository. The `docs-content` repository is the home for narrative documentation at Elastic. Clone this repo to a directory of your choice:
92+
9093
```sh
9194
git clone https://github.com/elastic/docs-content.git
9295
```
9396

94-
## Serve the Documentation [#step-three]
97+
## Serve the documentation [#step-three]
9598

96-
1. **Navigate to the `docs-builder` clone location:**
97-
```sh
98-
cd docs-content
99-
```
99+
Static-site generators like docs-builder can serve docs locally. This means you can edit the source and see the result in the browser in real time.
100100

101-
1. **Run the Binary:**
102-
Run the binary with the `serve` command to build and serve the content set to http://localhost:3000. Specify the path to the `docset.yml` file that you want to build with `-p`.
101+
To serve the local copy of the documentation in your browser, follow these steps:
103102

104-
For example, if `docs-builder` and `docs-content` are in the same top-level directory, you would run:
105-
```sh
106-
# macOS/Linux
107-
./docs-builder serve -p ./migration-test
103+
::::::{stepper}
108104

109-
# Windows
110-
.\docs-builder serve -p .\migration-test
111-
```
105+
:::::{step} Go to the docs-builder clone location
106+
107+
```sh
108+
cd docs-content
109+
```
110+
:::::
111+
112+
:::::{step} Run docs-builder
113+
114+
Run the `docs-builder` binary with the `serve` command to build and serve the content set to http://localhost:3000. Specify the path to the `docset.yml` file that you want to build with `-p`.
112115

116+
For example:
117+
118+
::::{tab-set}
119+
120+
:::{tab-item} macOS & Linux
121+
122+
```sh
123+
docs-builder serve -p ./migration-test
124+
```
125+
:::
126+
127+
:::{tab-item} Windows
128+
129+
```powershell
130+
docs-builder serve -p .\migration-test
131+
```
132+
:::
133+
::::
134+
:::::
135+
136+
:::::{step} Open the documentation in the browser
113137
Now you should be able to view the documentation locally by navigating to http://localhost:3000.
138+
:::::
139+
::::::
114140

115-
## Step 4: Write docs [#step-four]
141+
## Step 4: Write the docs [#step-four]
116142

117-
We write docs in markdown. See our [syntax](../syntax/index.md) guide for the flavor of markdown that we support and all of our custom directives that enable you to add a little extra pizazz to your docs.
143+
We write docs in Markdown. Refer to our [syntax](../syntax/index.md) guide for the flavor of Markdown that we support and all of our custom directives that enable you to add a little extra pizzazz to your docs.
118144

119145
## Step 5: Push your changes [#step-five]
120146

121-
After you've made your changes locally,
147+
After you've made your changes locally:
122148

123149
* [Push your commits](https://docs.github.com/en/get-started/using-git/pushing-commits-to-a-remote-repository)
124150
* [Open a Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)
125151

126-
## Step 5: View on elastic.co/docs
152+
## Step 5: View the preview
153+
154+
You can open a docs preview from the Deployments page of the repository. For example, [https://github.com/elastic/docs-content/deployments](https://github.com/elastic/docs-content/deployments).
155+
156+
1. Select the pull request or branch.
157+
2. Select the ↗ icon next to the timestamp.
127158

128-
soon...
159+
The preview URL is in the form `https://docs-v3-preview.elastic.dev/elastic/<repository>/tree/branch`.

docs/syntax/applies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ discontinued 9.2.0
4747
all
4848
```
4949

50-
`all` and empty string mean generally available for all active versions
50+
`all` means generally available for all active versions
5151

5252
```yaml
5353
applies_to:
5454
serverless: all
5555
```
5656
57-
`all` and empty string can also be specified at a version level
57+
`all` can also be specified at a version level
5858

5959
```yaml
6060
applies_to:
6161
stack: beta all
6262
serverless: beta
6363
```
6464

65-
Both are equivalent, note `all` just means we won't be rendering the version portion in the html.
65+
Note `all` just means we won't be rendering the version portion in the HTML.
6666

6767

6868
## Structured model

docs/syntax/frontmatter.md

Lines changed: 23 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ description: This is a description of the page <2>
1313
applies_to: <3>
1414
serverless: all
1515
products: <4>
16-
- id: apm-java-agent
17-
- id: edot-java
16+
- id: apm-agent
17+
- id: edot-sdk
1818
---
1919
```
2020

@@ -50,73 +50,35 @@ The products frontmatter is a list of objects, each object has an `id` field.
5050
| Product ID | Product Name |
5151
|---------------------------------------------|-----------------------------------------------|
5252
| `apm` | APM |
53-
| `apm-android-agent` | APM Android Agent |
54-
| `apm-attacher` | APM Attacher |
55-
| `apm-aws-lambda-extension` | APM AWS Lambda extension |
56-
| `apm-dotnet-agent` | APM .NET Agent |
57-
| `apm-go-agent` | APM Go Agent |
58-
| `apm-ios-agent` | APM iOS Agent |
59-
| `apm-java-agent` | APM Java Agent |
60-
| `apm-node-agent` | APM Node.js Agent |
61-
| `apm-php-agent` | APM PHP Agent |
62-
| `apm-python-agent` | APM Python Agent |
63-
| `apm-ruby-agent` | APM Ruby Agent |
64-
| `apm-rum-agent` | APM RUM Agent |
65-
| `beats-logging-plugin` | Beats Logging plugin |
66-
| `cloud-control-ecctl` | Cloud Control ECCTL |
67-
| `cloud-enterprise` | Cloud Enterprise |
68-
| `cloud-hosted` | Cloud Hosted |
69-
| `cloud-kubernetes` | Cloud Kubernetes |
70-
| `cloud-native-ingest` | Cloud Native Ingest |
71-
| `cloud-serverless` | Cloud Serverless |
72-
| `cloud-terraform` | Cloud Terraform |
53+
| `apm-agent` | APM Agent |
54+
| `auditbeat` | Auditbeat |
55+
| `beats` | Beats |
56+
| `cloud-control-ecctl` | Elastic Cloud Control ECCTL |
57+
| `cloud-enterprise` | Elastic Cloud Enterprise |
58+
| `cloud-hosted` | Elastic Cloud Hosted |
59+
| `cloud-kubernetes` | Elastic Cloud Kubernetes |
60+
| `cloud-serverless` | Elastic Cloud Serverless |
61+
| `cloud-terraform` | Elastic Cloud Terraform |
7362
| `ecs` | Elastic Common Schema (ECS) |
74-
| `ecs-logging-dotnet` | ECS Logging .NET |
75-
| `ecs-logging-go-logrus` | ECS Logging Go Logrus |
76-
| `ecs-logging-go-zap` | ECS Logging Go Zap |
77-
| `ecs-logging-go-zerolog` | ECS Logging Go Zerolog |
78-
| `ecs-logging-java` | ECS Logging Java |
79-
| `ecs-logging-node` | ECS Logging Node.js |
80-
| `ecs-logging-php` | ECS Logging PHP |
81-
| `ecs-logging-python` | ECS Logging Python |
82-
| `ecs-logging-ruby` | ECS Logging Ruby |
83-
| `edot-android` | Elastic Distribution of OpenTelemetry Android |
63+
| `ecs-logging` | ECS Logging |
64+
| `edot-sdk` | Elastic Distribution of OpenTelemetry SDK |
8465
| `edot-collector` | Elastic Distribution of OpenTelemetry Collector |
85-
| `edot-dotnet` | Elastic Distribution of OpenTelemetry .NET |
86-
| `edot-ios` | Elastic Distribution of OpenTelemetry iOS |
87-
| `edot-java` | Elastic Distribution of OpenTelemetry Java |
88-
| `edot-nodejs` | Elastic Distribution of OpenTelemetry Node.js |
89-
| `edot-php` | Elastic Distribution of OpenTelemetry PHP |
90-
| `edot-python` | Elastic Distribution of OpenTelemetry Python |
9166
| `elastic-agent` | Elastic Agent |
92-
| `elastic-products-platform` | Elastic Products platform |
67+
| `elastic-serverless-forwarder` | Elastic Serverless Forwarder |
9368
| `elastic-stack` | Elastic Stack |
9469
| `elasticsearch` | Elasticsearch |
95-
| `elasticsearch-apache-hadoop` | Elasticsearch Apache Hadoop |
96-
| `elasticsearch-cloud-hosted-heroku` | Elasticsearch Cloud Hosted Heroku |
97-
| `elasticsearch-community-clients` | Elasticsearch community clients |
98-
| `elasticsearch-curator` | Elasticsearch Curator |
99-
| `elasticsearch-dotnet-client` | Elasticsearch .NET Client |
100-
| `elasticsearch-eland-python-client` | Elasticsearch Eland Python Client |
101-
| `elasticsearch-go-client` | Elasticsearch Go Client |
102-
| `elasticsearch-groovy-client` | Elasticsearch Groovy Client |
103-
| `elasticsearch-java-client` | Elasticsearch Java Client |
104-
| `elasticsearch-java-script-client` | Elasticsearch JavaScript Client |
105-
| `elasticsearch-painless-scripting-language` | Elasticsearch Painless scripting language |
106-
| `elasticsearch-perl-client` | Elasticsearch Perl Client |
107-
| `elasticsearch-php-client` | Elasticsearch PHP Client |
108-
| `elasticsearch-plugins` | Elasticsearch plugins |
109-
| `elasticsearch-python-client` | Elasticsearch Python Client |
110-
| `elasticsearch-resiliency-status` | Elasticsearch Resiliency Status |
111-
| `elasticsearch-ruby-client` | Elasticsearch Ruby Client |
112-
| `elasticsearch-rust-client` | Elasticsearch Rust Client |
70+
| `elasticsearch-client` | Elasticsearch Client |
71+
| `filebeat` | Filebeat |
11372
| `fleet` | Fleet |
114-
| `ingest` | Ingest |
73+
| `heartbeat` | Heartbeat |
11574
| `integrations` | Integrations |
11675
| `kibana` | Kibana |
11776
| `logstash` | Logstash |
11877
| `machine-learning` | Machine Learning |
119-
| `observability` | Observability |
120-
| `reference-architectures` | Reference Architectures |
78+
| `metricbeat` | Metricbeat |
79+
| `observability` | Elastic Observability |
80+
| `packetbeat` | Packetbeat |
81+
| `painless` | Painless |
12182
| `search-ui` | Search UI |
122-
| `security` | Security |
83+
| `security` | Elastic Security |
84+
| `winlogbeat` | Winlogbeat |

install.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
set -e
2+
set -euo pipefail
33

44
# Determine OS type and architecture
55
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -56,11 +56,22 @@ fi
5656
echo "Downloading docs-builder for $OS/$ARCH..."
5757

5858
# Download the appropriate binary
59-
curl -LO "https://github.com/elastic/docs-builder/releases/latest/download/$BINARY"
59+
if ! curl -LO "https://github.com/elastic/docs-builder/releases/latest/download/$BINARY"; then
60+
echo "Error: Failed to download $BINARY. Please check your internet connection."
61+
exit 1
62+
fi
63+
64+
# Validate the downloaded file
65+
if [ ! -s "$BINARY" ]; then
66+
echo "Error: Downloaded file $BINARY is missing or empty."
67+
exit 1
68+
fi
6069

6170
# Extract only the docs-builder file to /tmp directory
62-
# Use -o flag to always overwrite files without prompting
63-
unzip -j -o "$BINARY" docs-builder -d /tmp
71+
if ! unzip -j -o "$BINARY" docs-builder -d /tmp; then
72+
echo "Error: Failed to extract docs-builder from $BINARY."
73+
exit 1
74+
fi
6475

6576
# Ensure the binary is executable
6677
chmod +x /tmp/docs-builder

0 commit comments

Comments
 (0)