Skip to content

Commit 7282e1c

Browse files
committed
docs(external): fix wording in common sinks components docs
Updates wording in common sinks component docs (as suggested by @neko-dd) Related: #22213 (comment)
1 parent 1af287f commit 7282e1c

File tree

91 files changed

+918
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+918
-918
lines changed

lib/codecs/src/encoding/format/cef.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl std::fmt::Display for Version {
195195
#[derive(Debug, Clone)]
196196
pub struct CefSerializerOptions {
197197
/// CEF Version. Can be either 0 or 1.
198-
/// Equals to "0" by default.
198+
/// Set to "0" by default.
199199
pub version: Version,
200200

201201
/// Identifies the vendor of the product.
@@ -208,7 +208,7 @@ pub struct CefSerializerOptions {
208208
/// The value length must be less than or equal to 63.
209209
pub device_product: String,
210210

211-
/// Identifies the version of the problem. In combination with device product and vendor, it composes the unique id of the device that sends messages.
211+
/// Identifies the version of the problem. The combination of the device product, vendor and this value make up the unique id of the device that sends messages.
212212
/// The value length must be less than or equal to 31.
213213
pub device_version: String,
214214

@@ -220,8 +220,8 @@ pub struct CefSerializerOptions {
220220
/// Reflects importance of the event.
221221
///
222222
/// It must point to a number from 0 to 10.
223-
/// 0 = Lowest, 10 = Highest.
224-
/// Equals to "cef.severity" by default.
223+
/// 0 = lowest_importance, 10 = highest_importance.
224+
/// Set to "cef.severity" by default.
225225
pub severity: ConfigTargetPath,
226226

227227
/// This is a path that points to the human-readable description of a log event.

lib/codecs/src/encoding/format/csv.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ pub enum QuoteStyle {
2727
Necessary,
2828

2929
/// Puts quotes around all fields that are non-numeric.
30-
/// Namely, when writing a field that does not parse as a valid float or integer,
31-
/// then quotes are used even if they aren't strictly necessary.
30+
/// This means that when writing a field that does not parse as a valid float or integer,
31+
/// quotes are used even if they aren't strictly necessary.
3232
NonNumeric,
3333

3434
/// Never writes quotes, even if it produces invalid CSV data.
@@ -84,9 +84,9 @@ pub struct CsvSerializerOptions {
8484
)]
8585
pub delimiter: u8,
8686

87-
/// Enable double quote escapes.
87+
/// Enables double quote escapes.
8888
///
89-
/// This is enabled by default, but it may be disabled. When disabled, quotes in
89+
/// This is enabled by default, but you can disable it. When disabled, quotes in
9090
/// field data are escaped instead of doubled.
9191
#[serde(
9292
default = "default_double_quote",
@@ -99,7 +99,7 @@ pub struct CsvSerializerOptions {
9999
/// In some variants of CSV, quotes are escaped using a special escape character
100100
/// like \ (instead of escaping quotes by doubling them).
101101
///
102-
/// To use this, `double_quotes` needs to be disabled as well otherwise it is ignored.
102+
/// To use this, `double_quotes` needs to be disabled as well; otherwise, this setting is ignored.
103103
#[configurable(metadata(docs::type_override = "ascii_char"))]
104104
#[serde(
105105
default = "default_escape",
@@ -121,18 +121,18 @@ pub struct CsvSerializerOptions {
121121
#[serde(default, skip_serializing_if = "vector_core::serde::is_default")]
122122
pub quote_style: QuoteStyle,
123123

124-
/// Set the capacity (in bytes) of the internal buffer used in the CSV writer.
125-
/// This defaults to a reasonable setting.
124+
/// Sets the capacity (in bytes) of the internal buffer used in the CSV writer.
125+
/// This defaults to 8KB.
126126
#[serde(default = "default_capacity")]
127127
pub capacity: usize,
128128

129-
/// Configures the fields that will be encoded, as well as the order in which they
129+
/// Configures the fields that are encoded, as well as the order in which they
130130
/// appear in the output.
131131
///
132-
/// If a field is not present in the event, the output will be an empty string.
132+
/// If a field is not present in the event, the output for that field is an empty string.
133133
///
134-
/// Values of type `Array`, `Object`, and `Regex` are not supported and the
135-
/// output will be an empty string.
134+
/// Values of type `Array`, `Object`, and `Regex` are not supported, and the
135+
/// output for any of these types is an empty string.
136136
pub fields: Vec<ConfigTargetPath>,
137137
}
138138

lib/codecs/src/encoding/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@ pub enum SerializerConfig {
206206
/// Vector's encoder currently adheres more strictly to the GELF spec, with
207207
/// the exception that some characters such as `@` are allowed in field names.
208208
///
209-
/// Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
210-
/// by Graylog, and is much more relaxed than the GELF spec.
209+
/// Other GELF codecs, such as Loki's, use a [Go SDK][implementation] that is maintained
210+
/// by Graylog and is much more relaxed than the GELF spec.
211211
///
212212
/// Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
213-
/// the codec may continue to relax the enforcement of specification.
213+
/// the codec might continue to relax the enforcement of the specification.
214214
///
215215
/// [gelf]: https://docs.graylog.org/docs/gelf
216216
/// [implementation]: https://github.com/Graylog2/go-gelf/blob/v2/gelf/reader.go

lib/vector-core/src/config/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ impl From<SourceAcknowledgementsConfig> for AcknowledgementsConfig {
357357
pub struct AcknowledgementsConfig {
358358
/// Whether or not end-to-end acknowledgements are enabled.
359359
///
360-
/// When enabled for a sink, any source connected to that sink where the source supports
361-
/// end-to-end acknowledgements as well, waits for events to be acknowledged by **all
362-
/// connected** sinks before acknowledging them at the source.
360+
/// When enabled for a sink, any source that supports end-to-end
361+
/// acknowledgements that is connected to that sink waits for events
362+
/// to be acknowledged by **all connected sinks** before acknowledging them at the source.
363363
///
364364
/// Enabling or disabling acknowledgements at the sink level takes precedence over any global
365365
/// [`acknowledgements`][global_acks] configuration.

lib/vector-core/src/tls/settings.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub struct TlsConfig {
9292
/// If enabled, certificates must not be expired and must be issued by a trusted
9393
/// issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
9494
/// certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
95-
/// so on until the verification process reaches a root certificate.
95+
/// so on, until the verification process reaches a root certificate.
9696
///
9797
/// Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
9898
pub verify_certificate: Option<bool>,
@@ -109,7 +109,7 @@ pub struct TlsConfig {
109109

110110
/// Sets the list of supported ALPN protocols.
111111
///
112-
/// Declare the supported ALPN protocols, which are used during negotiation with peer. They are prioritized in the order
112+
/// Declare the supported ALPN protocols, which are used during negotiation with a peer. They are prioritized in the order
113113
/// that they are defined.
114114
#[configurable(metadata(docs::examples = "h2"))]
115115
pub alpn_protocols: Option<Vec<String>>,
@@ -127,7 +127,7 @@ pub struct TlsConfig {
127127
/// The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
128128
/// an inline string in PEM format.
129129
///
130-
/// If this is set, and is not a PKCS#12 archive, `key_file` must also be set.
130+
/// If this is set _and_ is not a PKCS#12 archive, `key_file` must also be set.
131131
#[serde(alias = "crt_path")]
132132
#[configurable(metadata(docs::examples = "/path/to/host_certificate.crt"))]
133133
#[configurable(metadata(docs::human_name = "Certificate File Path"))]

src/transforms/metric_to_log.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub struct MetricToLogConfig {
5454

5555
/// Controls how metric tag values are encoded.
5656
///
57-
/// When set to `single`, only the last non-bare value of tags are displayed with the
57+
/// When set to `single`, only the last non-bare value of tags is displayed with the
5858
/// metric. When set to `full`, all metric tags are exposed as separate assignments as
5959
/// described by [the `native_json` codec][vector_native_json].
6060
///

website/cue/reference/components/sinks/base/amqp.cue

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ base: components: sinks: amqp: configuration: {
1414
description: """
1515
Whether or not end-to-end acknowledgements are enabled.
1616
17-
When enabled for a sink, any source connected to that sink where the source supports
18-
end-to-end acknowledgements as well, waits for events to be acknowledged by **all
19-
connected** sinks before acknowledging them at the source.
17+
When enabled for a sink, any source that supports end-to-end
18+
acknowledgements that is connected to that sink waits for events
19+
to be acknowledged by **all connected sinks** before acknowledging them at the source.
2020
2121
Enabling or disabling acknowledgements at the sink level takes precedence over any global
2222
[`acknowledgements`][global_acks] configuration.
@@ -90,7 +90,7 @@ base: components: sinks: amqp: configuration: {
9090
}
9191
device_version: {
9292
description: """
93-
Identifies the version of the problem. In combination with device product and vendor, it composes the unique id of the device that sends messages.
93+
Identifies the version of the problem. The combination of the device product, vendor and this value make up the unique id of the device that sends messages.
9494
The value length must be less than or equal to 31.
9595
"""
9696
required: true
@@ -123,16 +123,16 @@ base: components: sinks: amqp: configuration: {
123123
Reflects importance of the event.
124124
125125
It must point to a number from 0 to 10.
126-
0 = Lowest, 10 = Highest.
127-
Equals to "cef.severity" by default.
126+
0 = lowest_importance, 10 = highest_importance.
127+
Set to "cef.severity" by default.
128128
"""
129129
required: true
130130
type: string: {}
131131
}
132132
version: {
133133
description: """
134134
CEF Version. Can be either 0 or 1.
135-
Equals to "0" by default.
135+
Set to "0" by default.
136136
"""
137137
required: true
138138
type: string: enum: {
@@ -166,11 +166,11 @@ base: components: sinks: amqp: configuration: {
166166
Vector's encoder currently adheres more strictly to the GELF spec, with
167167
the exception that some characters such as `@` are allowed in field names.
168168
169-
Other GELF codecs such as Loki's, use a [Go SDK][implementation] that is maintained
170-
by Graylog, and is much more relaxed than the GELF spec.
169+
Other GELF codecs, such as Loki's, use a [Go SDK][implementation] that is maintained
170+
by Graylog and is much more relaxed than the GELF spec.
171171
172172
Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
173-
the codec may continue to relax the enforcement of specification.
173+
the codec might continue to relax the enforcement of the specification.
174174
175175
[gelf]: https://docs.graylog.org/docs/gelf
176176
[implementation]: https://github.com/Graylog2/go-gelf/blob/v2/gelf/reader.go
@@ -234,8 +234,8 @@ base: components: sinks: amqp: configuration: {
234234
type: object: options: {
235235
capacity: {
236236
description: """
237-
Set the capacity (in bytes) of the internal buffer used in the CSV writer.
238-
This defaults to a reasonable setting.
237+
Sets the capacity (in bytes) of the internal buffer used in the CSV writer.
238+
This defaults to 8KB.
239239
"""
240240
required: false
241241
type: uint: default: 8192
@@ -247,9 +247,9 @@ base: components: sinks: amqp: configuration: {
247247
}
248248
double_quote: {
249249
description: """
250-
Enable double quote escapes.
250+
Enables double quote escapes.
251251
252-
This is enabled by default, but it may be disabled. When disabled, quotes in
252+
This is enabled by default, but you can disable it. When disabled, quotes in
253253
field data are escaped instead of doubled.
254254
"""
255255
required: false
@@ -262,20 +262,20 @@ base: components: sinks: amqp: configuration: {
262262
In some variants of CSV, quotes are escaped using a special escape character
263263
like \\ (instead of escaping quotes by doubling them).
264264
265-
To use this, `double_quotes` needs to be disabled as well otherwise it is ignored.
265+
To use this, `double_quotes` needs to be disabled as well; otherwise, this setting is ignored.
266266
"""
267267
required: false
268268
type: ascii_char: default: "\""
269269
}
270270
fields: {
271271
description: """
272-
Configures the fields that will be encoded, as well as the order in which they
272+
Configures the fields that are encoded, as well as the order in which they
273273
appear in the output.
274274
275-
If a field is not present in the event, the output will be an empty string.
275+
If a field is not present in the event, the output for that field is an empty string.
276276
277-
Values of type `Array`, `Object`, and `Regex` are not supported and the
278-
output will be an empty string.
277+
Values of type `Array`, `Object`, and `Regex` are not supported, and the
278+
output for any of these types is an empty string.
279279
"""
280280
required: true
281281
type: array: items: type: string: {}
@@ -301,8 +301,8 @@ base: components: sinks: amqp: configuration: {
301301
never: "Never writes quotes, even if it produces invalid CSV data."
302302
non_numeric: """
303303
Puts quotes around all fields that are non-numeric.
304-
Namely, when writing a field that does not parse as a valid float or integer,
305-
then quotes are used even if they aren't strictly necessary.
304+
This means that when writing a field that does not parse as a valid float or integer,
305+
quotes are used even if they aren't strictly necessary.
306306
"""
307307
}
308308
}
@@ -430,7 +430,7 @@ base: components: sinks: amqp: configuration: {
430430
description: """
431431
Sets the list of supported ALPN protocols.
432432
433-
Declare the supported ALPN protocols, which are used during negotiation with peer. They are prioritized in the order
433+
Declare the supported ALPN protocols, which are used during negotiation with a peer. They are prioritized in the order
434434
that they are defined.
435435
"""
436436
required: false
@@ -452,7 +452,7 @@ base: components: sinks: amqp: configuration: {
452452
The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
453453
an inline string in PEM format.
454454
455-
If this is set, and is not a PKCS#12 archive, `key_file` must also be set.
455+
If this is set _and_ is not a PKCS#12 archive, `key_file` must also be set.
456456
"""
457457
required: false
458458
type: string: examples: ["/path/to/host_certificate.crt"]
@@ -493,7 +493,7 @@ base: components: sinks: amqp: configuration: {
493493
If enabled, certificates must not be expired and must be issued by a trusted
494494
issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
495495
certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
496-
so on until the verification process reaches a root certificate.
496+
so on, until the verification process reaches a root certificate.
497497
498498
Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
499499
"""

website/cue/reference/components/sinks/base/appsignal.cue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ base: components: sinks: appsignal: configuration: {
1414
description: """
1515
Whether or not end-to-end acknowledgements are enabled.
1616
17-
When enabled for a sink, any source connected to that sink where the source supports
18-
end-to-end acknowledgements as well, waits for events to be acknowledged by **all
19-
connected** sinks before acknowledging them at the source.
17+
When enabled for a sink, any source that supports end-to-end
18+
acknowledgements that is connected to that sink waits for events
19+
to be acknowledged by **all connected sinks** before acknowledging them at the source.
2020
2121
Enabling or disabling acknowledgements at the sink level takes precedence over any global
2222
[`acknowledgements`][global_acks] configuration.
@@ -331,7 +331,7 @@ base: components: sinks: appsignal: configuration: {
331331
description: """
332332
Sets the list of supported ALPN protocols.
333333
334-
Declare the supported ALPN protocols, which are used during negotiation with peer. They are prioritized in the order
334+
Declare the supported ALPN protocols, which are used during negotiation with a peer. They are prioritized in the order
335335
that they are defined.
336336
"""
337337
required: false
@@ -353,7 +353,7 @@ base: components: sinks: appsignal: configuration: {
353353
The certificate must be in DER, PEM (X.509), or PKCS#12 format. Additionally, the certificate can be provided as
354354
an inline string in PEM format.
355355
356-
If this is set, and is not a PKCS#12 archive, `key_file` must also be set.
356+
If this is set _and_ is not a PKCS#12 archive, `key_file` must also be set.
357357
"""
358358
required: false
359359
type: string: examples: ["/path/to/host_certificate.crt"]
@@ -404,7 +404,7 @@ base: components: sinks: appsignal: configuration: {
404404
If enabled, certificates must not be expired and must be issued by a trusted
405405
issuer. This verification operates in a hierarchical manner, checking that the leaf certificate (the
406406
certificate presented by the client/server) is not only valid, but that the issuer of that certificate is also valid, and
407-
so on until the verification process reaches a root certificate.
407+
so on, until the verification process reaches a root certificate.
408408
409409
Do NOT set this to `false` unless you understand the risks of not verifying the validity of certificates.
410410
"""

0 commit comments

Comments
 (0)