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

Change the wording on the Licenser.Enforce when the endpoint is not reachable. #13771

Merged
merged 3 commits into from
Oct 2, 2019
Merged

Change the wording on the Licenser.Enforce when the endpoint is not reachable. #13771

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7074c43
Change the wording on the Licenser.Enforce when the endpoint is not
ph Sep 23, 2019
caf47c4
capitalize
ph Sep 23, 2019
741e88d
Merge branch 'master' into better-wording-on-access-denied
ph Oct 1, 2019
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 @@ -102,6 +102,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix mapping for kubernetes.labels and kubernetes.annotations in add_kubernetes_metadata. {issue}12638[12638] {pull}13226[13226]
- Fix case insensitive regular expressions not working correctly. {pull}13250[13250]
- Disable `add_kubernetes_metadata` if no matchers found. {pull}13709[13709]
- Better wording for xpack beats when the _xpack endpoint is not reachable. {pull}13771[13771]

*Auditbeat*

Expand Down
4 changes: 3 additions & 1 deletion x-pack/libbeat/licenser/es_callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ func Enforce(log *logp.Logger, name string, checks ...CheckFunc) {
license, err := fetcher.Fetch()

if err != nil {
return errors.Wrapf(err, "cannot retrieve the elasticsearch license")
return errors.Wrapf(err, "cannot retrieve the elasticsearch license from the /_xpack endpoint, "+
"%s requires the default distribution of Elasticsearch. Please make the endpoint accessible "+
"to %s so it can verify the license.", name, name)
ph marked this conversation as resolved.
Show resolved Hide resolved
}

if license == OSSLicense {
Expand Down