Add dedot to templates #2830

fearful-symmetry · 2022-03-15T23:59:44Z

What does this PR do?

~~This adds the new skip_major option to the docker/diskio integration.~~ I also noticed that the actual entry for the DeDot value was missing from most of the handlebars files, so I added those in as well.

This also fixes some missing fields in the mapping that were breaking CI.

Checklist

I have reviewed tips for building integrations and this pull request is aligned with them.
I have verified that all data streams collect metrics or logs.
I have added an entry to my package's changelog.yml file.
I have verified that Kibana version constraints are current according to guidelines.

elasticmachine · 2022-03-15T23:59:46Z

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

elasticmachine · 2022-03-16T00:18:16Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-04-29T17:26:52.159+0000
Duration: 21 min 10 sec

Test stats 🧪

Test	Results
Failed	0
Passed	36
Skipped	0
Total	36

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.

cmacknz · 2022-03-17T19:42:40Z

I don't see anything obviously wrong but I haven't really touched this repository. Is there a change log you need to update?

I would ping someone from the integrations side on Slack to look at this if you haven't already.

fearful-symmetry · 2022-04-01T21:03:45Z

Alright, finally managed to test this.

fearful-symmetry · 2022-04-04T21:31:55Z

/test

masci · 2022-04-08T08:21:44Z

packages/docker/manifest.yml

  - os_system
 conditions:
-  kibana.version: ^8.0.0
+  kibana.version: ^8.2.0


Does this PR contain anything that can't work with 8.0? If not, I'd keep the constraint on the lower version

The skip_major config opt is new to 8.2, yah.

Looking at this, would it make sense to split both changes? We could release first a version with the fix for dedotting, so this is fixed for current users, and then another version, targetting 8.2 with the skip_major config.

@fearful-symmetry thoughts about releasing this as two different issues?

sayden · 2022-04-27T09:32:53Z

packages/docker/data_stream/cpu/fields/fields.yml

  release: ga
  description: |
    Container labels
+- name: container.cpu.usage


I'm not fully sure but shouldn't those ECS fields be in the ecs.yml file?

sayden

I left one question but everything looks good to me

jsoriano · 2022-04-27T10:42:56Z

packages/docker/data_stream/cpu/fields/fields.yml

+- name: container.cpu.usage
+  type: scaled_float
+  format: percent
+  description: ECS field for container CPU usage


You can import definitions of ECS fields with external: ecs. Consider doing this at least for all the ECS fields added in this PR.

Suggested change

- name: container.cpu.usage

type: scaled_float

format: percent

description: ECS field for container CPU usage

- name: container.cpu.usage

external: ecs

ECS version used is defined in _dev/build/build.yml.

elasticmachine · 2022-04-27T16:30:17Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	100.0% (`0/0`)	💚
Files	100.0% (`0/0`)	💚 2.799
Classes	100.0% (`0/0`)	💚 2.799
Methods	100.0% (`27/27`)	💚 11.769
Lines	100.0% (`0/0`)	💚 11.068
Conditionals	100.0% (`0/0`)	💚

jsoriano

Looks good, wondering if this should be released as two different things, and as a new minor.

packages/docker/changelog.yml

packages/docker/manifest.yml

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

jsoriano · 2022-04-29T07:53:35Z

There is this open question #2830 (comment), it LGTM in either case, but I would like to have your thoughts on this.

fearful-symmetry · 2022-04-29T16:57:03Z

@jsoriano yah, how about I do the skip_major in a follow up...

jsoriano

👍

tetianakravchenko

LGTM

add dedot to templates, add skip_major config

e6bec6f

fearful-symmetry added bug Something isn't working, use only for issues Team:Elastic-Agent-Data-Plane Agent Data Plane team [elastic/elastic-agent-data-plane] labels Mar 15, 2022

fearful-symmetry requested a review from a team as a code owner March 15, 2022 23:59

fearful-symmetry self-assigned this Mar 15, 2022

fix constraints

ca9e443

fearful-symmetry requested a review from a team March 17, 2022 16:46

Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes

2bfce59

fearful-symmetry added 2 commits April 1, 2022 15:15

build

97a9e73

fix readme, again

cb3432e

fearful-symmetry added 3 commits April 6, 2022 14:04

Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes

1a8a970

fix unrelated ECS fields

4d047a3

add cpu ECS fields

dfe9223

masci reviewed Apr 8, 2022

View reviewed changes

Merge remote-tracking branch 'upstream/main' into docker-diskio-fixes

594f635

fearful-symmetry requested a review from a team April 26, 2022 19:41

sayden reviewed Apr 27, 2022

View reviewed changes

sayden approved these changes Apr 27, 2022

View reviewed changes

jsoriano reviewed Apr 27, 2022

View reviewed changes

jsoriano requested a review from a team April 27, 2022 10:46

fixed ecs

e79714d

fearful-symmetry requested a review from jsoriano April 27, 2022 18:44

jsoriano reviewed Apr 28, 2022

View reviewed changes

packages/docker/changelog.yml Outdated Show resolved Hide resolved

packages/docker/manifest.yml Show resolved Hide resolved

Update packages/docker/changelog.yml

587163b

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

fearful-symmetry and others added 3 commits April 28, 2022 10:21

Update packages/docker/manifest.yml

7c5bdcf

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

format package

a37749e

fix changelog

e9d70dd

fearful-symmetry requested a review from jsoriano April 28, 2022 21:02

remove skip_major

fd780b0

fearful-symmetry changed the title ~~Add dedot to templates, add skip_major config~~ Add dedot to templates Apr 29, 2022

ooops

f3caf87

jsoriano approved these changes May 2, 2022

View reviewed changes

tetianakravchenko approved these changes May 2, 2022

View reviewed changes

fearful-symmetry merged commit 60e6a90 into elastic:main May 2, 2022

Add dedot to templates #2830

Add dedot to templates #2830

Uh oh!

Conversation

fearful-symmetry commented Mar 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Checklist

Uh oh!

elasticmachine commented Mar 15, 2022

Uh oh!

elasticmachine commented Mar 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

🤖 GitHub comments

Uh oh!

cmacknz commented Mar 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fearful-symmetry commented Apr 1, 2022

Uh oh!

fearful-symmetry commented Apr 4, 2022

Uh oh!

masci Apr 8, 2022

Choose a reason for hiding this comment

Uh oh!

fearful-symmetry Apr 11, 2022

Choose a reason for hiding this comment

Uh oh!

jsoriano Apr 28, 2022

Choose a reason for hiding this comment

Uh oh!

jsoriano Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

sayden Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

sayden left a comment

Choose a reason for hiding this comment

Uh oh!

jsoriano Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Apr 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🌐 Coverage report

Uh oh!

jsoriano left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jsoriano commented Apr 29, 2022

Uh oh!

fearful-symmetry commented Apr 29, 2022

Uh oh!

jsoriano left a comment

Choose a reason for hiding this comment

Uh oh!

tetianakravchenko left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

fearful-symmetry commented Mar 15, 2022 •

edited

Loading

elasticmachine commented Mar 16, 2022 •

edited

Loading

cmacknz commented Mar 17, 2022 •

edited

Loading

elasticmachine commented Apr 27, 2022 •

edited

Loading