-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
[APM] Agent remote configuration: general settings descriptions #62276
Conversation
I removed `log_level` from here because it seems it doesn't fit at least the Java, Go and Node agents - see #61821, and it is already deactivated for most others (this doesn't have to be included in this PR though).
// LOG_LEVEL | ||
{ | ||
key: 'log_level', | ||
type: 'text', | ||
defaultValue: 'info', | ||
label: i18n.translate('xpack.apm.agentConfig.logLevel.label', { | ||
defaultMessage: 'Log level' | ||
}), | ||
description: i18n.translate('xpack.apm.agentConfig.logLevel.description', { | ||
defaultMessage: 'Sets the logging level for the agent' | ||
}), | ||
excludeAgents: ['js-base', 'rum-js', 'python'] | ||
}, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@eyalkoren unless we decide to remove it from dotnet
and ruby
, we should keep it. @formgeist WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know what is the cutoff to use in agent-dedicated config description vs. in this general_settings
one. Otherwise it means increasing this excludeAgents
to contain 5 agents.
It's really up to you, just a suggestion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have changed it to includeAgents
instead of excludeAgents
to make it easy to read.
includeAgents: ['dotnet', 'ruby']
But I'm not against removing it if any agent is going to use it. 😃
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cauemarcondes so you have both options now? Include and exclude? Isn't there an option to only show for one agent, I believe Java had a bunch that is Java-specific?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@formgeist no, I removed the excludeAgents
and replaced it for includeAgents
, so this option will be available for dotnet
and ruby
only. Java is the only one who has its own config file, it must be because of what you said (Java had a bunch that is Java-specific
).
My question here is if we can remove the log_level property from all agents., if yes we can keep what @eyalkoren did here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should keep the log_level
option for ruby
and dotnet
since they have this active in their dynamic config options.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@eyalkoren Will the copy changes to the descriptions also be updated in the Java documentation, since that's where these are lifted from? |
Yes, see elastic/apm-agent-java#1119 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍🏻
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Descriptions LGTM. I'm still not convinced that \n
actually does anything though 🤷♂
@eyalkoren you can leave the log as it was. {
key: 'log_level',
type: 'text',
defaultValue: 'info',
label: i18n.translate('xpack.apm.agentConfig.logLevel.label', {
defaultMessage: 'Log level'
}),
description: i18n.translate('xpack.apm.agentConfig.logLevel.description', {
defaultMessage: 'Sets the logging level for the agent'
}),
excludeAgents: ['js-base', 'rum-js', 'python']
}, I've already changed it on my #62290 |
|
@elasticmachine merge upstream |
merge conflict between base and head |
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
…tic#62276) * Updates general remote config descriptions I removed `log_level` from here because it seems it doesn't fit at least the Java, Go and Node agents - see elastic#61821, and it is already deactivated for most others (this doesn't have to be included in this PR though). * Update general_settings.ts * Restore log_level definition * Remove extra spaces Co-authored-by: Nathan L Smith <[email protected]>
…tic#62276) * Updates general remote config descriptions I removed `log_level` from here because it seems it doesn't fit at least the Java, Go and Node agents - see elastic#61821, and it is already deactivated for most others (this doesn't have to be included in this PR though). * Update general_settings.ts * Restore log_level definition * Remove extra spaces Co-authored-by: Nathan L Smith <[email protected]>
…) (#62954) * Updates general remote config descriptions I removed `log_level` from here because it seems it doesn't fit at least the Java, Go and Node agents - see #61821, and it is already deactivated for most others (this doesn't have to be included in this PR though). * Update general_settings.ts * Restore log_level definition * Remove extra spaces Co-authored-by: Nathan L Smith <[email protected]> Co-authored-by: eyalkoren <[email protected]>
…) (#62955) * Updates general remote config descriptions I removed `log_level` from here because it seems it doesn't fit at least the Java, Go and Node agents - see #61821, and it is already deactivated for most others (this doesn't have to be included in this PR though). * Update general_settings.ts * Restore log_level definition * Remove extra spaces Co-authored-by: Nathan L Smith <[email protected]> Co-authored-by: eyalkoren <[email protected]>
Suggesting some changes for the general config options descriptions.
I removed
log_level
from here because it seems it doesn't fit at least the Java, Go and Node agents - see #61821, and it is already deactivated for most others, however this doesn't have to be included in this PR.