Skip to content

Commit 998a797

Browse files
authored
Merge branch 'main' into szabosteve/applies-to-table
2 parents 9925726 + 3a95c53 commit 998a797

File tree

27 files changed

+641
-56
lines changed

27 files changed

+641
-56
lines changed
File renamed without changes.
File renamed without changes.

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,11 @@ jobs:
9797
run: dotnet run --project build -c release -- publishbinaries
9898

9999
integration:
100+
runs-on: docs-builder-latest-16
100101
if: false
101-
runs-on: ubuntu-latest
102102
steps:
103103
- uses: actions/checkout@v4
104104

105-
- name: Free Disk Space
106-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
107-
with:
108-
tool-cache: false
109-
dotnet: true
110-
111105
- name: Bootstrap Action Workspace
112106
id: bootstrap
113107
uses: ./.github/actions/bootstrap

.github/workflows/updatecli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
3535
- uses: elastic/oblt-actions/updatecli/run@v1
3636
with:
37-
command: apply --config updatecli/updatecli.d/versions.yml --values updatecli/values.d/scm.yml
37+
command: apply --config .github/updatecli/updatecli.d/versions.yml --values .github/updatecli/values.d/scm.yml
3838
env:
3939
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
4040

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<PackageVersion Include="Proc" Version="0.9.1" />
5757
<PackageVersion Include="RazorSlices" Version="0.9.4" />
5858
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
59+
<PackageVersion Include="Sep" Version="0.11.0" />
5960
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
6061
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
6162
<PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />

config/assembler.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ references:
100100
private: true
101101
integrations:
102102
logstash-docs-md:
103+
private: true
103104
opentelemetry:
104105

105106
#stack aligned using gated deploys

config/versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versioning_systems:
4141
# current: 1.0.0
4242
apm_agent_dotnet:
4343
base: 1.0
44-
current: 1.32.2
44+
current: 1.33.0
4545
apm_agent_go:
4646
base: 2.0
4747
current: 2.7.1

docs/_docset.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ toc:
9696
- file: code.md
9797
- file: comments.md
9898
- file: conditionals.md
99+
- file: csv-include.md
99100
- hidden: diagrams.md
100101
- file: dropdowns.md
101102
- file: definition-lists.md

docs/_redirects.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ redirects:
2727
'docs/versions/content-patterns.md': 'contribute/cumulative-docs/example-scenarios.md'
2828
'docs/versions/index.md': 'contribute/cumulative-docs/index.md'
2929
# I shouldn't need to do this should I?
30-
'docs/versions/_snippets/content-patterns-list.md': 'contribute/cumulative-docs/index.md'
30+
# I'm just going to do it to get the preview to build...
31+
'docs/versions/_snippets/content-patterns-list.md': 'contribute/cumulative-docs/index.md'
32+
'docs/contribute/cumulative-docs/images/example-not-one-section.png': 'contribute/cumulative-docs/example-scenarios.md'
33+
'docs/contribute/cumulative-docs/images/example-one-section.png': 'contribute/cumulative-docs/example-scenarios.md'

docs/_snippets/sample-data.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Name,Age,City,Occupation
2+
John Doe,30,New York,Software Engineer
3+
Jane Smith,25,Los Angeles,Product Manager
4+
Bob Johnson,35,Chicago,Data Scientist
5+
Alice Brown,28,San Francisco,UX Designer
6+
Charlie Wilson,32,Boston,DevOps Engineer

0 commit comments

Comments
 (0)