Skip to content

Add dedot to templates #2830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 2, 2022
Merged

Add dedot to templates #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e6bec6f
add dedot to templates, add skip_major config
fearful-symmetry Mar 15, 2022
ca9e443
fix constraints
fearful-symmetry Mar 16, 2022
2bfce59
Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes
fearful-symmetry Apr 1, 2022
97a9e73
build
fearful-symmetry Apr 1, 2022
cb3432e
fix readme, again
fearful-symmetry Apr 4, 2022
1a8a970
Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes
fearful-symmetry Apr 6, 2022
4d047a3
fix unrelated ECS fields
fearful-symmetry Apr 7, 2022
dfe9223
add cpu ECS fields
fearful-symmetry Apr 7, 2022
594f635
Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes
fearful-symmetry Apr 19, 2022
e79714d
fixed ecs
fearful-symmetry Apr 27, 2022
587163b
Update packages/docker/changelog.yml
fearful-symmetry Apr 28, 2022
7c5bdcf
Update packages/docker/manifest.yml
fearful-symmetry Apr 28, 2022
a37749e
format package
fearful-symmetry Apr 28, 2022
e9d70dd
fix changelog
fearful-symmetry Apr 28, 2022
fd780b0
remove skip_major
fearful-symmetry Apr 29, 2022
f3caf87
ooops
fearful-symmetry Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/docker/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# newer versions go on top

- version: "2.1.1"
changes:
- description: Fix missing dedot options
type: bugfix
link: http://github.com/elastic/integrations/pull/2830
- version: "2.1.0"
changes:
- description: Add new ECS container fields
Expand Down
3 changes: 2 additions & 1 deletion packages/docker/data_stream/container/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["container"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/cpu/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["cpu"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/diskio/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["diskio"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/event/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["event"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/healthcheck/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["healthcheck"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
2 changes: 1 addition & 1 deletion packages/docker/data_stream/image/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
metricsets: ["image"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/memory/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["memory"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
3 changes: 2 additions & 1 deletion packages/docker/data_stream/network/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
metricsets: ["network"]
hosts:
{{#each hosts}}
- {{this}}
- {{this}}
{{/each}}
period: {{period}}
labels.dedot: {{labels.dedot}}
2 changes: 1 addition & 1 deletion packages/docker/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: docker
title: Docker Metrics
version: 2.1.0
version: 2.1.1
release: ga
description: Collect metrics from Docker instances with Elastic Agent.
type: integration
Expand Down