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

permit index-pattern only setup #7285

Merged
merged 2 commits into from
Jun 11, 2018
Merged

permit index-pattern only setup #7285

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
e15f9fb
permit index-pattern only setup
graphaelli Jun 7, 2018
c005619
add test + update changelog
graphaelli Jun 7, 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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
- Error out on invalid Autodiscover template conditions settings. {pull}7200[7200]
- Do not emit Kubernetes autodiscover events for Pods without IP address. {pull}7235[7235]
- Allow to override the `ignore_above` option when defining new field with the type keyword. {pull}7238[7238]
- Allow index-pattern only setup when setup.dashboards.only_index=true. {pull}7285[7285]

*Auditbeat*

Expand Down
4 changes: 3 additions & 1 deletion libbeat/dashboards/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,10 @@ func (imp Importer) ImportKibanaDir(dir string) error {
if !imp.cfg.OnlyDashboards {
check = append(check, "index-pattern")
}
wantDashboards := false
if !imp.cfg.OnlyIndex {
check = append(check, "dashboard")
wantDashboards = true
}

types := []string{}
Expand All @@ -306,7 +308,7 @@ func (imp Importer) ImportKibanaDir(dir string) error {
}
}

if !importDashboards {
if wantDashboards && !importDashboards {
return fmt.Errorf("No dashboards to import. Please make sure the %s directory contains a dashboard directory.",
dir)
}
Expand Down
26 changes: 26 additions & 0 deletions libbeat/tests/system/test_dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,32 @@ def test_load_dashboard(self):

assert self.log_contains("Kibana dashboards successfully loaded") is True

@unittest.skipUnless(INTEGRATION_TESTS, "integration test")
@attr('integration')
def test_load_only_index_patterns(self):
"""
Test loading dashboards
"""
self.render_config_template()
beat = self.start_beat(
logging_args=["-e", "-d", "*"],
extra_args=["setup",
"--dashboards",
"-E", "setup.dashboards.file=" +
os.path.join(self.beat_path, "tests", "files", "testbeat-dashboards.zip"),
"-E", "setup.dashboards.beat=testbeat",
"-E", "setup.dashboards.only_index=true",
"-E", "setup.kibana.protocol=http",
"-E", "setup.kibana.host=" + self.get_kibana_host(),
"-E", "setup.kibana.port=" + self.get_kibana_port(),
"-E", "output.elasticsearch.hosts=['" + self.get_host() + "']",
"-E", "output.file.enabled=false"]
)

beat.check_wait(exit_code=0)

assert self.log_contains("Kibana dashboards successfully loaded") is True
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't we have a log message which reads more like index pattern successfully loaded?

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree it's confusing that the loading index patterns and dashboard are conflated but I think it would be best to tackle that as an enhancement rather than in this bugfix, that I'm hoping we can backport to 6.2

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, agree. I added the needs_backport label. Could you open a follow up PR with the change mentioned above?

Copy link
Member Author

Choose a reason for hiding this comment

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

Will do, thanks @ruflin


@unittest.skipUnless(INTEGRATION_TESTS, "integration test")
@attr('integration')
def test_export_dashboard(self):
Expand Down