[Fleet] Expose agent logging level in agent policy settings #180607
Merged
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
criamico
changed the title
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
criamico
added
Team:Fleet
|
@elasticmachine merge upstream |
criamico
commented
Apr 12, 2024
| @@ -63,15 +63,13 @@ interface Props { | |||
| agentPolicy: Partial<NewAgentPolicy | AgentPolicy>; | |||
| updateAgentPolicy: (u: Partial<NewAgentPolicy | AgentPolicy>) => void; | |||
| validation: ValidationResults; | |||
| isEditing?: boolean; | |||
There was a problem hiding this comment.
This field was not used anymore so I removed it
criamico
commented
Apr 12, 2024
| @@ -35,8 +35,6 @@ interface Props { | |||
| withSysMonitoring: boolean; | |||
| updateSysMonitoring: (newValue: boolean) => void; | |||
| validation: ValidationResults; | |||
| isEditing?: boolean; | |||
| onDelete?: () => void; | |||
There was a problem hiding this comment.
Same as above, the linter catched unused props
|
Pinging @elastic/fleet (Team:Fleet) |
|
@elasticmachine merge upstream |
💚 Build Succeeded
Metrics [docs]Async chunks
Page load bundle
History
To update your PR or re-run it, just comment with: cc @criamico |
criamico
added a commit
that referenced
this pull request
Apr 17, 2024
## Summary Part of #158861 #180607 added a new log level selector in Agent Policy settings. However there were some small bugs with it. This PR addresses all of them: - Extra dot in copy text - A broken link was displayed - Made this link optional - When clicking "Cancel", all the other fields on the page reset back to their original values but the log level doesn't. The reason is the no default was set for the select ### Before  ### After  ### Testing - Enable `hidden: false` [here](https://github.com/elastic/kibana/blob/bc9cd862f04430f4e50e7da2a11f16bc80756e9c/x-pack/plugins/fleet/common/settings/agent_policy_settings.ts#L133) - Change the log level and then click "cancel" on the bottom of the page, it should reset back to the default value ("info" if the policy is new, the previous saved value if the policy already had this value set) - No extra dot and link should be visible
2 tasks
jen-huang
added a commit
that referenced
this pull request
May 16, 2024
‼️ Should be reverted if elastic/elastic-agent#4747 does not make 8.15.0. ## Summary Resolves #180778 This PR allows agent log level to be reset back to the level set on its policy (or if not set, simply the default agent level, see elastic/elastic-agent#3090). To achieve this, this PR: - Allows `null` to be passed for the log level settings action, i.e.: ``` POST kbn:/api/fleet/agents/<AGENT_ID>/actions {"action":{"type":"SETTINGS","data":{"log_level": null}}} ``` - Enables the agent policy log level setting implemented in #180607 - Always show `Apply changes` on the agent details > Logs tab - For agents >= 8.15.0, always show `Reset to policy` on the agent details > Logs tab - Ensures both buttons are disabled if user does not have access to write to agents <img width="1254" alt="image" src="https://github.com/elastic/kibana/assets/1965714/bcdf763e-2053-4071-9aa8-8bcb57b8fee1"> <img width="1267" alt="image" src="https://github.com/elastic/kibana/assets/1965714/182ac54d-d5ad-435f-9376-70bb24f288f9"> ### Caveats 1. The reported agent log level is not accurate if agent is using the level from its policy and does not have a log level set on its own level (elastic/elastic-agent#4747), so the initial selection on the agent log level could be wrong 2. We have no way to tell where the log level came from (elastic/elastic-agent#4748), so that's why `Apply changes` and `Reset to policy` are always shown ### Testing Use the latest `8.15.0-SNAPSHOT` for agents or fleet server to test this change ### Checklist Delete any items that are not applicable to this PR. - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
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.
Closes #158861
Summary
Expose agent logging level in agent policy settings.
The new setting is added via the new settings framework and will show up under "advanced settings". It's currently hidden until the agent supports it.
Testing
Enable the settings config: #180597 (comment)
agent.logging.levelScreenshots
Checklist