-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Adds a "type" field to the filesystem beat #4717
Adds a "type" field to the filesystem beat #4717
Conversation
Can one of the admins verify this patch? |
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically on build-eu-00. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
90f093e
to
903013d
Compare
@cv Thanks for working on this. Run |
d8ba66a
to
08eece1
Compare
@tsg you're most welcome, and I'm sorry I can't seem to fix the build breakage through |
When I run
Do you get the same? Or some error during |
|
Oh, this could be it. I get no changes when I run it. Could it be an env difference? Output: https://gist.github.com/cv/4b596841382fb6d4193a86d95ba05d38 |
Can you try a rebase to master (make sure master is up to date, then |
4066ab0
to
7c78677
Compare
Done… still, no files get updated. I'm going to set up a Linux build environment to see if there are any differences. |
4f75473
to
c5bc748
Compare
Ok, so when running on Linux (a little docker image did the job), the files do get updated and I get the same result as you, @tsg. I'm wondering why the builds failed even so, as nothing in the output immediately jumps at me. |
jenkins, test it |
@cv Travis is green now, we had some issues lately with Travis timing out on some of our stuff, so it's flaky at the moment. We're looking for solutions. |
@cv can you add a line in the |
metricbeat/docs/fields.asciidoc
Outdated
@@ -8762,6 +8762,14 @@ The disk name. For example: `/dev/disk1` | |||
|
|||
|
|||
[float] | |||
=== system.filesystem.device_type |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm thinking if we shouldn't name this simpler as system.filesystem.type
. I usually think of ext4
(for example) as a filesystem type, so that seems to fit. device_type
, on the other had, makes me think of hardware.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good rationale. I'll change it in a few minutes.
32aac60
to
86abc67
Compare
This last build looks like the least fail-y so far :) @tsg, I'd say work here is done, and unless you have any other points you'd like me to work on, can I clean up / rebase the commit history? Or do you typically do that when squashing into master? |
@cv Yes, please rebase & squash. I'd do it on merging, but now there's a conflict anyway. Thanks a lot for your work! |
Its value is copied from sigar.FileSystem.SysTypeName (on Windows, sigar.FileSystem.TypeName) and passed through so that it becomes possible to filter out `overlay`, `tmpfs` or otherwise uninteresting filesystems. Fixes elastic#3459.
8a34b57
to
3344656
Compare
All squashed (except for the merge conflict fix, which I left as its own commit so it can be reviewed). |
Its value is copied from sigar.FileSystem.SysTypeName (on Windows, sigar.FileSystem.TypeName) and passed through so that it becomes possible to filter out `overlay`, `tmpfs` or otherwise uninteresting filesystems. Fixes elastic#3459. (cherry picked from commit 94a197b)
…4991) * Adds a "type" field to the filesystem beat (#4717) (#4717) Its value is copied from sigar.FileSystem.SysTypeName (on Windows, sigar.FileSystem.TypeName) and passed through so that it becomes possible to filter out `overlay`, `tmpfs` or otherwise uninteresting filesystems. Fixes #3459. (cherry picked from commit 94a197b)
…m beat (elastic#4991) * Adds a "type" field to the filesystem beat (elastic#4717) (elastic#4717) Its value is copied from sigar.FileSystem.SysTypeName (on Windows, sigar.FileSystem.TypeName) and passed through so that it becomes possible to filter out `overlay`, `tmpfs` or otherwise uninteresting filesystems. Fixes elastic#3459. (cherry picked from commit 7e2396a)
Its value is copied from
sigar.FileSystem.SysTypeName
and passed through so that it becomes possible to filter outoverlay
,tmpfs
or otherwise uninteresting filesystems.Fixes #3459.