Skip to content
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.

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

clarify agent definition #192

Merged
merged 7 commits into from
Dec 4, 2018
Merged

Conversation

MikePaquette
Copy link
Contributor

Enhancing definition of agent object.

CONTRIBUTING.md Outdated
@@ -80,15 +80,6 @@ The `type` is the [Elasticsearch field type](https://www.elastic.co/guide/en/ela
`example` adds an sample value.
The `phase` field indicates the development status of the field. If `phase` is left out, the default is 0.

## Phases
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on removing this but it should not be in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, thanks. Will back this out and make new PR for removing Phase discussion.

CONTRIBUTING.md Outdated
@@ -59,7 +59,7 @@ The file structure is similar to this:
title: Agent fields
group: 2
description: >
The agent fields contain all the data about the agent/client/shipper that collected/generated the events.
The agent fields contain the data about the software entity, if any, that detects or observes events on a host, or takes measurements on a host. Examples include beats. Agents do not run on devices. ECS agent.* fields shall be populated with details of the agent running on the host where the event happened or the measurement was taken.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm running Filebeat and Metricbeat on my Ubiquity EdgeMax to collect logs and system metrics. In this case my agent runs on a device I think?

Could add detects, collects or observes events because I think collection is an important part of most beats.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruflin Thanks! yes, there are a few cases where an agent may run on devices. I will fix this language to allow for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... and yes, adding "collects" makes good sense. Will do.

@MikePaquette MikePaquette force-pushed the agent-mods branch 2 times, most recently from 974711c to 102203a Compare December 4, 2018 18:47
CHANGELOG.md Outdated
@@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file based on the

### Improvements
* Improved the definition of the file fields #196
Improved the definition of the agent fields two places #192
* Improved the definition of the agent fields two places #192
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like we had a git rebase issue here :-)

Just edit the file, commit again and push again (no need for the --force this time)

webmat
webmat previously requested changes Dec 4, 2018
Copy link
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog needs to be fixed. Once that's done, I'm good with this.

@MikePaquette MikePaquette dismissed webmat’s stale review December 4, 2018 19:42

made changes in local branch

@ruflin
Copy link
Contributor

ruflin commented Dec 4, 2018

@MikePaquette Seems like you need to run make locally again to update the template.

@MikePaquette
Copy link
Contributor Author

thanks @ruflin make is breaking on my local system. I pulled from master earlier this afternoon and now getting an error running template.go, which was updated just over 1 hour ago.

go run scripts/template.go > ./template.json
# command-line-arguments
scripts/template.go:49:13: undefined: common.MustNewVersion
make: *** [template] Error 2

@webmat
Copy link
Contributor

webmat commented Dec 4, 2018

@MikePaquette Ah yeah this is because the ECS scripts have a dependency on Beats. You need to go to the Beats repo on your local machine, check out master (on beats) and pull again. Then your make command will work in the ECS repo.

@MikePaquette MikePaquette merged commit 6e6529e into elastic:master Dec 4, 2018
@@ -86,7 +86,7 @@ The base set contains all fields which are on the top level. These fields are co

## <a name="agent"></a> Agent fields

The agent fields contain the data about the agent/client/shipper that created the event.
The agent fields contain the data about the software entity, if any, that collects, detects, or observes events on a host, or takes measurements on a host. Examples include beats. Agents may also run on devices. ECS agent.* fields shall be populated with details of the agent running on the host or device where the event happened or the measurement was taken.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: capitalize "Beats"

MikePaquette added a commit to MikePaquette/ecs-1 that referenced this pull request Dec 4, 2018
* clarify agent defintion

* Make same change in CONTRIBUTING.md, remove Phases, and update CHANGELOG.md

* Fix Format of CHANGELOG.md

* Tweak CHANGELOG.md

Co-Authored-By: MikePaquette <[email protected]>

* Changed wording per suggestion - backed out phase removal

* fix changelog conflict

* fix make error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants