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

[Auditbeat] Disable packages metricset #9495

Merged
merged 2 commits into from
Dec 12, 2018
Merged

[Auditbeat] Disable packages metricset #9495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc3f44
Disable packages metricset.
Dec 11, 2018
415a0ac
Disable registration and tests instead of excluding from build.
Dec 12, 2018
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
3 changes: 0 additions & 3 deletions x-pack/auditbeat/auditbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ auditbeat.modules:

metricsets:
- host
- packages
- process
- socket
- user
Expand All @@ -124,8 +123,6 @@ auditbeat.modules:
# detect any changes.
user.detect_password_changes: true

report_changes: true


#================================ General ======================================

Expand Down
3 changes: 0 additions & 3 deletions x-pack/auditbeat/auditbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ auditbeat.modules:

metricsets:
- host
- packages
- process
- socket
- user
Expand All @@ -62,8 +61,6 @@ auditbeat.modules:
# detect any changes.
user.detect_password_changes: true

report_changes: true


#==================== Elasticsearch template setting ==========================
setup.template.settings:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/auditbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion x-pack/auditbeat/module/system/_meta/config.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

metricsets:
- host
{{ if false -}}
- packages
{{- end -}}
- process
{{ if eq .GOOS "linux" -}}
- socket
Expand All @@ -20,8 +22,10 @@
# detect any changes.
user.detect_password_changes: true
{{- end }}

{{- if false -}}
{{/* Only remaining use in packages, to be removed completely. */}}
report_changes: true
{{- end -}}
{{- end }}
{{ if .Reference }}
{{- end }}
0 ...odule/system/packages/_meta/docs.asciidoc → ...tem/packages/_meta/docs.asciidoc.disabled
View file
Open in desktop
File renamed without changes.
0 ...t/module/system/packages/_meta/fields.yml → ...system/packages/_meta/fields.yml.disabled
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions x-pack/auditbeat/module/system/packages/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ const (
)

func init() {
mb.Registry.MustAddMetricSet(moduleName, metricsetName, New,
/*mb.Registry.MustAddMetricSet(moduleName, metricsetName, New,
mb.DefaultMetricSet(),
)
)*/
}

// MetricSet collects data about the host.
Expand Down
2 changes: 2 additions & 0 deletions x-pack/auditbeat/module/system/packages/packages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
)

func TestData(t *testing.T) {
t.Skip("Packages metricset is disabled")

f := mbtest.NewReportingMetricSetV2(t, getConfig())
err := mbtest.WriteEventsReporterV2(f, t, "")
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions x-pack/auditbeat/tests/system/test_metricsets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def test_metricset_host(self):
if "event.kind" not in str(e):
raise

@unittest.skip("Packages metricset is disabled")
def test_metricset_packages(self):
"""
packages metricset collects information about installed packages on a system.
Expand Down