-
Notifications
You must be signed in to change notification settings - Fork 2.2k
chore(config): Update field labels for commonly used sources and transforms #17517
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
Changes from 2 commits
0caf194
c1bb582
2555b20
73349f7
95bc065
bee219d
b1fa963
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -107,26 +107,31 @@ pub struct KafkaSourceConfig { | |
| #[configurable(metadata(docs::examples = 5000, docs::examples = 10000))] | ||
| #[configurable(metadata(docs::advanced))] | ||
| #[serde(default = "default_session_timeout_ms")] | ||
| #[configurable(metadata(docs::human_name = "Session Timeout"))] | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Drop this extra empty line.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed |
||
| session_timeout_ms: Duration, | ||
|
|
||
| /// Timeout for network requests. | ||
| #[serde_as(as = "serde_with::DurationMilliSeconds<u64>")] | ||
| #[configurable(metadata(docs::examples = 30000, docs::examples = 60000))] | ||
| #[configurable(metadata(docs::advanced))] | ||
| #[serde(default = "default_socket_timeout_ms")] | ||
| #[configurable(metadata(docs::human_name = "Socket Timeout"))] | ||
| socket_timeout_ms: Duration, | ||
|
|
||
| /// Maximum time the broker may wait to fill the response. | ||
| #[serde_as(as = "serde_with::DurationMilliSeconds<u64>")] | ||
| #[configurable(metadata(docs::examples = 50, docs::examples = 100))] | ||
| #[configurable(metadata(docs::advanced))] | ||
| #[serde(default = "default_fetch_wait_max_ms")] | ||
| #[configurable(metadata(docs::human_name = "Fetch Wait Max"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be better written as
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good call, updated. |
||
| fetch_wait_max_ms: Duration, | ||
|
|
||
| /// The frequency that the consumer offsets are committed (written) to offset storage. | ||
| #[serde_as(as = "serde_with::DurationMilliSeconds<u64>")] | ||
| #[serde(default = "default_commit_interval_ms")] | ||
| #[configurable(metadata(docs::examples = 5000, docs::examples = 10000))] | ||
| #[configurable(metadata(docs::human_name = "Commit Interval"))] | ||
| commit_interval_ms: Duration, | ||
|
|
||
| /// Overrides the name of the log field used to add the message key to each event. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,7 @@ pub struct OpentelemetryConfig { | |
| #[configurable(metadata(docs::examples = "example_grpc_config()"))] | ||
| #[derive(Clone, Debug)] | ||
| #[serde(deny_unknown_fields)] | ||
| #[configurable(metadata(docs::human_name = "gRPC"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be added to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh yes, and actually, it's already there. I'll remove this addition. |
||
| struct GrpcConfig { | ||
| /// The socket address to listen for connections on. | ||
| /// | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,28 +27,32 @@ pub struct HecAcknowledgementsConfig { | |
| /// Enables end-to-end acknowledgements. | ||
| pub enabled: Option<bool>, | ||
|
|
||
| /// The maximum number of ack statuses pending query across all channels. | ||
| /// The maximum number of acknowledgement statuses pending query across all channels. | ||
| /// | ||
| /// Equivalent to the `max_number_of_acked_requests_pending_query` Splunk HEC setting. | ||
| /// | ||
| /// Minimum of `1`. | ||
| #[configurable(metadata(docs::human_name = "Max Number of Pending Acknowledgements"))] | ||
| pub max_pending_acks: NonZeroU64, | ||
|
|
||
| /// The maximum number of Splunk HEC channels clients can use with this source. | ||
| /// | ||
| /// Minimum of `1`. | ||
| #[configurable(metadata(docs::human_name = "Max Number of Acknowledgement Channels"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Double space between
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed |
||
| pub max_number_of_ack_channels: NonZeroU64, | ||
|
|
||
| /// The maximum number of ack statuses pending query for a single channel. | ||
| /// The maximum number of acknowledgement statuses pending query for a single channel. | ||
| /// | ||
| /// Equivalent to the `max_number_of_acked_requests_pending_query_per_ack_channel` Splunk HEC setting. | ||
| /// | ||
| /// Minimum of `1`. | ||
| #[configurable(metadata(docs::human_name = "Max Number of Pending Acknowledgements Per Channel"))] | ||
| pub max_pending_acks_per_channel: NonZeroU64, | ||
|
|
||
| /// Whether or not to remove channels after idling for `max_idle_time` seconds. | ||
| /// | ||
| /// A channel is idling if it is not used for sending data or querying ack statuses. | ||
| /// A channel is idling if it is not used for sending data or querying acknowledgement statuses. | ||
| #[configurable(metadata(docs::human_name = "Acknowledgement Idle Cleanup"))] | ||
| pub ack_idle_cleanup: bool, | ||
|
|
||
| /// The amount of time, in seconds, a channel is allowed to idle before removal. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ pub struct MultilineConfig { | |
| #[configurable(metadata(docs::examples = "\\\\$"))] | ||
| #[configurable(metadata(docs::examples = "^(INFO|ERROR) "))] | ||
| #[configurable(metadata(docs::examples = ";$"))] | ||
| #[configurable(metadata(docs::human_name = "Timeout"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Mistakenly copypasted entirely, or just never updated for the field at hand?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oops, that was a mistake. |
||
| pub start_pattern: String, | ||
|
|
||
| /// Regular expression pattern that is used to determine whether or not more lines should be read. | ||
|
|
@@ -41,6 +42,7 @@ pub struct MultilineConfig { | |
| #[serde_as(as = "serde_with::DurationMilliSeconds<u64>")] | ||
| #[configurable(metadata(docs::examples = 1000))] | ||
| #[configurable(metadata(docs::examples = 600000))] | ||
| #[configurable(metadata(docs::human_name = "Timeout"))] | ||
| pub timeout_ms: Duration, | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ pub struct AggregateConfig { | |
| /// | ||
| /// During this time frame, metrics with the same series data (name, namespace, tags, and so on) are aggregated. | ||
| #[serde(default = "default_interval_ms")] | ||
| #[configurable(metadata(docs::human_name = "Interval Time Frame"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Interval Time Frame" feels a bit repetitive, but it also doesn't fit the pattern of "X Interval" that similar fields have been changed to. How about "Flush Interval"?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Flush Interval" is much better! |
||
| pub interval_ms: u64, | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,6 +117,7 @@ pub struct RemapConfig { | |
| /// | ||
| /// [vrl_docs_abort]: https://vector.dev/docs/reference/vrl/expressions/#abort | ||
| #[serde(default = "crate::serde::default_true")] | ||
| #[configurable(metadata(docs::human_name = "Drop on Error"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like this should be applied to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed |
||
| pub drop_on_abort: bool, | ||
|
|
||
| /// Reroutes dropped events to a named output instead of halting processing on them. | ||
|
|
@@ -129,6 +130,7 @@ pub struct RemapConfig { | |
| /// to a specially-named output, `dropped`. The original event is annotated with additional | ||
| /// fields describing why the event was dropped. | ||
| #[serde(default = "crate::serde::default_false")] | ||
| #[configurable(metadata(docs::human_name = "Drop on Abort"))] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like this should be applied to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed. |
||
| pub reroute_dropped: bool, | ||
|
|
||
| #[configurable(derived, metadata(docs::hidden))] | ||
|
|
||
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 if it's in scope for this PR, but I would support putting a
docs::hiddenmetadata here to hide this in the config builder. We shouldn't be showing deprecated options like this to users.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.
That would also drop it from the Vector docs - which might not be desired until we actually remove it. That said, it's probably been deprecated for more than a release and can be removed now.
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 a list of fields that are noted as deprecated. This is one of them, so I'm thinking we can address them all in one PR?