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.

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

[Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor #36506

Merged
merged 15 commits into from
Sep 8, 2023
Merged

[Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor #36506

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7a20b7
adding check for host processor in case of K8s
gizas Jun 29, 2023
3c9f832
adding check for host processor in case of K8s
gizas Jun 29, 2023
9dbd74f
Updating root file to only have env variable check
gizas Sep 5, 2023
37b40d9
Adding comment
gizas Sep 5, 2023
96f32f9
Adding CHANGELOG.next.asciidoc
gizas Sep 5, 2023
41c0534
Adding comments for the change introduced
gizas Sep 5, 2023
beb7e85
Adding comments for the change introduced
gizas Sep 5, 2023
1daafec
Merge branch 'main' of github.com:elastic/beats into fixinghostips
gizas Sep 5, 2023
1c5541e
Adding comments for the change introduced
gizas Sep 5, 2023
c1313cf
Adding filebeat fix
gizas Sep 6, 2023
bc4f64e
Adding fix only t add-host-metadata processor and removed per beats
gizas Sep 6, 2023
27d147a
Adding fix only t add-host-metadata processor and removed per beats
gizas Sep 6, 2023
6a03eb4
Adding comments
gizas Sep 6, 2023
d26c658
Changing variable to ELASTIC_NETINFO
gizas Sep 7, 2023
a7ed8ee
Updating changelof for variable ELASTIC_NETINFO
gizas Sep 7, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ automatic splitting at root level, if root level element is an array. {pull}3415
- Add new parameter `include_linked_accounts` to enable/disable metrics collection from multiple linked AWS Accounts {pull}35648[35648]
- Migrate Azure Billing, Monitor, and Storage metricsets to the newer SDK. {pull}33585[33585]
- Add support for float64 values parsing for statsd metrics of counter type. {pull}35099[35099]
- [Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor {pull}36506[36506]

*Osquerybeat*

Expand Down
26 changes: 21 additions & 5 deletions x-pack/metricbeat/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package cmd
import (
"flag"
"fmt"
"os"

"github.com/spf13/pflag"

Expand Down Expand Up @@ -71,10 +72,25 @@ func defaultProcessors() []mapstr.M {
// - add_cloud_metadata: ~
// - add_docker_metadata: ~
// - add_kubernetes_metadata: ~
return []mapstr.M{
{"add_host_metadata": nil},
{"add_cloud_metadata": nil},
{"add_docker_metadata": nil},
{"add_kubernetes_metadata": nil},

// We check for the existance of environmental variable NETINFO. Related to https://github.com/elastic/integrations/issues/6674
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets have some more details here in the code docs. Jumping to the very long Github issue is not helpful. We can still leave the reference in, but lets add more details here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added some comments in beb7e85

valueNETINFO, status := os.LookupEnv("NETINFO")

if valueNETINFO == "false" && status == true {
return []mapstr.M{
{"add_host_metadata": mapstr.M{
"netinfo.enabled": "false",
Copy link
Member

@ChrsMark ChrsMark Sep 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Why to enable/disable this at this level and not inside the processor's implementation?
Wouldn't that be more generic without the need to configure every single Beat (also covering Agent)? And that would cover @ruflin 's concern at #36506 (comment), right?

Copy link
Member

Choose a reason for hiding this comment

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

👍 to do that inside the processor implementation. I think in the implementation we could even automatically check if this is running inside k8s or inside a container and either disable netinfo completely or filter out link-local addresses. See also elastic/integrations#6674 (comment).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you all team.
Reverted changes per beat module and made those inside the processor. Building a new image and retesting and let you know

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adding the fix only to add-host-metadata processor (https://github.com/elastic/beats/pull/36506/files#diff-03b979565735e6707425275586e3215f44192f46e1ac3b456516d93c653eba13R38) seems that works only for metricbeat. Somehow seems we override it for filestream? Will keep looking

}},
{"add_cloud_metadata": nil},
{"add_docker_metadata": nil},
{"add_kubernetes_metadata": nil},
}
} else {
return []mapstr.M{
{"add_host_metadata": nil},
{"add_cloud_metadata": nil},
{"add_docker_metadata": nil},
{"add_kubernetes_metadata": nil},
}
}
}