Skip to content

Commit ccc2aaf

Browse files
authored
Merge branch 'main' into replace-subs-versions
2 parents 1e914cd + 1ede61e commit ccc2aaf

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ updates:
99
interval: "weekly"
1010
day: "sunday"
1111
time: "22:00"
12-
reviewers:
13-
- "elastic/observablt-ci"
1412
groups:
1513
github-actions:
1614
patterns:

.github/workflows/jekyll.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Checkout
3535
uses: actions/checkout@v4
3636
- name: Setup Ruby
37-
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
37+
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
3838
with:
3939
ruby-version: '3.4.1' # Not needed with a .ruby-version file
4040
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

docs/reference/edot-collector/config/default-config-standalone.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,15 @@ In Gateway mode, the Collector ingests data from other Collectors running in Age
9797

9898
## Sample configuration
9999

100-
The following sample configuration file is available for the Gateway mode:
101-
102-
- [Gateway mode]
100+
The following sample configuration files are available for the Gateway mode:
101+
102+
| Version | Configuration |
103+
|---------|----------------|
104+
| 8.17 | [Gateway mode](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v9.0.4/internal/pkg/otel/samples/linux/gateway.yml) |
105+
| 8.18 | [Gateway mode](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v9.0.4/internal/pkg/otel/samples/linux/gateway.yml) |
106+
| 9.0 | [Gateway mode](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v9.0.4/internal/pkg/otel/samples/linux/gateway.yml) |
107+
% | 8.19 | [Gateway mode](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v8.19.0/internal/pkg/otel/samples/linux/gateway.yml) |
108+
% | 9.1 | [Gateway mode](https://raw.githubusercontent.com/elastic/elastic-agent/refs/tags/v9.1.0/internal/pkg/otel/samples/linux/gateway.yml) |
103109

104110
Use the previous example configuration as a reference when configuring your Gateway Collector or customizing your EDOT Collector configuration.
105111

0 commit comments

Comments
 (0)