Cherry-pick #15802 to 7.6: Do not load dashboards where not available #15851
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Jan 27, 2020
| @@ -31,7 +31,7 @@ import ( | |||
| var Version = "9.9.9" | |||
| var Name = "mockbeat" | |||
|
|
|||
| var Settings = instance.Settings{Name: Name, Version: Version} | |||
| var Settings = instance.Settings{Name: Name, Version: Version, HasDashboards: true} | |||
There was a problem hiding this comment.
exported var Settings should have comment or be unexported
houndci-bot
reviewed
Jan 27, 2020
| @@ -31,7 +31,7 @@ import ( | |||
| var Version = "9.9.9" | |||
| var Name = "mockbeat" | |||
|
|
|||
| var Settings = instance.Settings{Name: Name, Version: Version} | |||
| var Settings = instance.Settings{Name: Name, Version: Version, HasDashboards: true} | |||
There was a problem hiding this comment.
exported var Settings should have comment or be unexported
urso
reviewed
Jan 27, 2020
blakerouse
approved these changes
Jan 27, 2020
kvch
force-pushed
the
backport_15802_7.6
branch
from
b47dab8 to
0f6af22
Compare
## What does this PR do? This PR adds a new setting to Beat to indicate if it has a dashboard or not. If the Beat lacks dashboards, running `setup` does not attempt to load those. ## Why is it important? Running the command `setup` fails if the Beat does not have dashboards in the appropriate folder. ## Checklist <!-- Mandatory Add a checklist of things that are required to be reviewed in order to have the PR approved List here all the items you have verified BEFORE sending this PR. Please DO NOT remove any item, striking through those that do not apply. (Just in case, strikethrough uses two tildes. ~~Scratch this.~~) --> - [x] My code follows the style guidelines of this project - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation - [x] I have made the corresponding change to the default configuration files - [x] I have added tests that prove my fix is effective or that my feature works ## How to test this PR locally Both Journalbeat and Functionbeat are affected. So both Beats can/should be tested. ```sh ./functionbeat setup ``` ## Related issues Closes elastic#13276 Closes elastic#11751 (cherry picked from commit 8260623)
kvch
force-pushed
the
backport_15802_7.6
branch
from
0f6af22 to
eac0fb9
Compare
|
Failing tests are unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #15802 to 7.6 branch. Original message:
What does this PR do?
This PR adds a new setting to Beat to indicate if it has a dashboard or not. If the Beat lacks dashboards, running
setupdoes not attempt to load those.Why is it important?
Running the command
setupfails if the Beat does not have dashboards in the appropriate folder.Checklist
How to test this PR locally
Both Journalbeat and Functionbeat are affected. So both Beats can/should be tested.
Related issues
Closes #13276
Closes #11751