Skip to content

Commit 76a7fbd

Browse files
authored
Merge branch 'main' into add-new-repo-docs
2 parents 6f50da8 + 2e4796a commit 76a7fbd

File tree

30 files changed

+578
-162
lines changed

30 files changed

+578
-162
lines changed

docs/syntax/applies.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ There are 3 typical scenarios to start from:
184184
stack: ga
185185
serverless: ga
186186
products:
187-
-id: kibana
188-
-id: elasticsearch
189-
-id: elastic-stack
187+
- id: kibana
188+
- id: elasticsearch
189+
- id: elastic-stack
190190
---
191191
```
192192
@@ -201,10 +201,10 @@ There are 3 typical scenarios to start from:
201201
ece: ga
202202
eck: ga
203203
products:
204-
-id: cloud-serverless
205-
-id: cloud-hosted
206-
-id: cloud-enterprise
207-
-id: cloud-kubernetes
204+
- id: cloud-serverless
205+
- id: cloud-hosted
206+
- id: cloud-enterprise
207+
- id: cloud-kubernetes
208208
---
209209
```
210210
@@ -215,7 +215,7 @@ There are 3 typical scenarios to start from:
215215
applies_to:
216216
product: ga
217217
products:
218-
-id: edot-collector
218+
- id: edot-collector
219219
---
220220
```
221221
@@ -363,4 +363,4 @@ applies_to:
363363
product:
364364
---
365365
```
366-
This allows you to annotate various facets as defined in [](../migration/versioning.md)
366+
This allows you to annotate various facets as defined in [](../migration/versioning.md)

docs/testing/req.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
1+
---
2+
applies_to:
3+
stack: ga 9.1
4+
---
5+
16
# Requirements
27

8+
Current version: **9.0.0**
9+
10+
| `applies_to` | result |
11+
|--------------------------------------------|--------------------------------------|
12+
| `` {applies_to}`stack: preview` `` | {applies_to}`stack: preview` |
13+
| `` {applies_to}`stack: preview 8.18` `` | {applies_to}`stack: preview 8.18` |
14+
| `` {applies_to}`stack: preview 9.0` `` | {applies_to}`stack: preview 9.0` |
15+
| `` {applies_to}`stack: preview 9.1` `` | {applies_to}`stack: preview 9.1` |
16+
| `` {applies_to}`stack: ga` `` | {applies_to}`stack: ga` |
17+
| `` {applies_to}`stack: ga 8.18` `` | {applies_to}`stack: ga 8.18` |
18+
| `` {applies_to}`stack: ga 9.0` `` | {applies_to}`stack: ga 9.0` |
19+
| `` {applies_to}`stack: ga 9.1` `` | {applies_to}`stack: ga 9.1` |
20+
| `` {applies_to}`stack: beta` `` | {applies_to}`stack: beta` |
21+
| `` {applies_to}`stack: beta 8.18` `` | {applies_to}`stack: beta 8.18` |
22+
| `` {applies_to}`stack: beta 9.0` `` | {applies_to}`stack: beta 9.0` |
23+
| `` {applies_to}`stack: beta 9.1` `` | {applies_to}`stack: beta 9.1` |
24+
| `` {applies_to}`stack: deprecated` `` | {applies_to}`stack: deprecated` |
25+
| `` {applies_to}`stack: deprecated 8.18` `` | {applies_to}`stack: deprecated 8.18` |
26+
| `` {applies_to}`stack: deprecated 9.0` `` | {applies_to}`stack: deprecated 9.0` |
27+
| `` {applies_to}`stack: deprecated 9.1` `` | {applies_to}`stack: deprecated 9.1` |
28+
| `` {applies_to}`stack: removed` `` | {applies_to}`stack: removed` |
29+
| `` {applies_to}`stack: removed 8.18` `` | {applies_to}`stack: removed 8.18` |
30+
| `` {applies_to}`stack: removed 9.0` `` | {applies_to}`stack: removed 9.0` |
31+
| `` {applies_to}`stack: removed 9.1` `` | {applies_to}`stack: removed 9.1` |
32+
33+
{applies_to}`stack: deprecated 9.1, removed 9.4`
34+
35+
336
To follow this tutorial you will need to install the following components:
437

538
- An installation of Elasticsearch, based on our hosted [Elastic Cloud](https://www.elastic.co/cloud) service (which includes a free trial period), or a self-hosted service that you run on your own computer. See the Install Elasticsearch section above for installation instructions.
@@ -9,4 +42,4 @@ The tutorial assumes that you have no previous knowledge of Elasticsearch or gen
942

1043
- Python development
1144
- The [Flask](https://flask.palletsprojects.com/) web framework for Python.
12-
- The command prompt or terminal application in your operating system.
45+
- The command prompt or terminal application in your operating system.

docs/versions/content-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ See [Versions and lifecycle states](/versions/index.md#versions-and-lifecycle-st
3535
stack: ga 9.1
3636
deployment:
3737
eck: ga 9.0
38-
ece: discontinued 9.2.0
38+
ece: removed 9.2.0
3939
self: unavailable 9.3.0
4040
```
4141

src/Elastic.Documentation.Configuration/Assembler/VersionEntry.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ public record VersionEntry
1313

1414
[YamlMember(Alias = "current")]
1515
public string? Current { get; set; }
16-
17-
[YamlMember(Alias = "legacy_versions")]
18-
public IReadOnlyList<string> LegacyVersions { get; set; } = [];
1916
}

src/Elastic.Documentation.Site/Assets/main.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import 'htmx-ext-head-support'
1111
import 'htmx-ext-preload'
1212
import 'htmx.org'
1313
import { $, $$ } from 'select-dom'
14+
import tippy from 'tippy.js'
1415
import { UAParser } from 'ua-parser-js'
1516

1617
const { getOS } = new UAParser()
@@ -24,6 +25,9 @@ document.addEventListener('htmx:load', function () {
2425
initSmoothScroll()
2526
openDetailsWithAnchor()
2627
initDismissibleBanner()
28+
tippy('[data-tippy-content]:not([data-tippy-content=""])', {
29+
delay: [400, 100],
30+
})
2731
})
2832

2933
// Don't remove style tags because they are used by the elastic global nav.

src/Elastic.Documentation.Site/Assets/styles.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
@import './archive.css';
1818
@import './markdown/stepper.css';
1919
@import './api-docs.css';
20+
@import 'tippy.js/dist/tippy.css';
2021

2122
:root {
2223
--outline-size: max(2px, 0.08em);
@@ -162,6 +163,7 @@
162163
}
163164

164165
.applicable-info {
166+
cursor: default;
165167
padding: calc(var(--spacing) * 0.5);
166168
padding-left: calc(var(--spacing) * 2);
167169
padding-right: calc(var(--spacing) * 2);
@@ -173,6 +175,9 @@
173175
background-color: var(--color-white);
174176
border: 1px solid var(--color-grey-20);
175177
font-weight: normal;
178+
&[data-tippy-content]:not([data-tippy-content='']) {
179+
cursor: help;
180+
}
176181
}
177182
.applicable-version {
178183
font-weight: bold;

src/Elastic.Documentation.Site/Assets/web-components/VersionDropdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ const VersionDropdown = ({
172172
renderItem: () => (
173173
<EuiPanel paddingSize="s" hasShadow={false}>
174174
<EuiText size="xs" color="subdued">
175-
This page was fully migrated to the
176-
current version.
175+
There are no other versions available
176+
for this page.
177177
</EuiText>
178178
</EuiPanel>
179179
),

src/Elastic.Documentation.Site/package-lock.json

Lines changed: 22 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Elastic.Documentation.Site/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"moment": "2.30.1",
4242
"parcel": "2.15.4",
4343
"postcss": "8.5.6",
44-
"postcss-import": "16.1.0",
44+
"postcss-import": "16.1.1",
4545
"prettier": "3.5.3",
4646
"prettier-plugin-tailwindcss": "0.6.13",
4747
"react": "18.3.1",
@@ -59,6 +59,7 @@
5959
"htmx.org": "2.0.5",
6060
"select-dom": "9.3.1",
6161
"tailwindcss": "4.1.10",
62+
"tippy.js": "6.3.7",
6263
"ua-parser-js": "2.0.3"
6364
}
6465
}

src/Elastic.Markdown/Extensions/DetectionRules/DetectionRuleFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public DetectionRuleOverviewFile(IFileInfo sourceFile, IDirectoryInfo rootPath,
2727

2828
protected override Task<MarkdownDocument> GetMinimalParseDocumentAsync(Cancel ctx)
2929
{
30-
Title = "Detection Rules Overview";
30+
Title = "Prebuilt detection rules reference";
3131
var markdown = GetMarkdown();
3232
var document = MarkdownParser.MinimalParseStringAsync(markdown, SourceFile, null);
3333
return Task.FromResult(document);

0 commit comments

Comments
 (0)