Skip to content
Merged
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Beat | Description
[Metricbeat](https://github.com/elastic/beats/tree/main/metricbeat) | Fetches sets of metrics from the operating system and services
[Packetbeat](https://github.com/elastic/beats/tree/main/packetbeat) | Monitors the network and applications by sniffing packets
[Winlogbeat](https://github.com/elastic/beats/tree/main/winlogbeat) | Fetches and ships Windows Event logs
[Osquerybeat](https://github.com/elastic/beats/tree/main/x-pack/osquerybeat) | Runs Osquery and manages interraction with it.
[Osquerybeat](https://github.com/elastic/beats/tree/main/x-pack/osquerybeat) | Runs Osquery and manages interaction with it.

In addition to the above Beats, which are officially supported by
[Elastic](https://elastic.co), the community has created a set of other Beats
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ output.elasticsearch:
# Path to the Kerberos configuration.
#kerberos.config_path: /etc/krb5.conf

# The service name. Service principal name is contructed from
# The service name. Service principal name is constructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/auditbeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/auditbeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/filebeat-input-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Valid encodings:
* `ebcdic-1040`: IBM CodePage 1140
* `ebcdic-1047`: IBM CodePage 1047
* `koi8r`: KOI8-R, Russian (Cyrillic)
* `koi8u`: KOI8-U, Ukranian (Cyrillic)
* `koi8u`: KOI8-U, Ukrainian (Cyrillic)
* `macintosh`: Macintosh encoding
* `macintosh-cyrillic`: Macintosh Cyrillic encoding
* `windows1250`: Windows1250, Central and Eastern European
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/filebeat-input-filestream.md
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ Valid encodings:
* `ebcdic-1040`: IBM CodePage 1140
* `ebcdic-1047`: IBM CodePage 1047
* `koi8r`: KOI8-R, Russian (Cyrillic)
* `koi8u`: KOI8-U, Ukranian (Cyrillic)
* `koi8u`: KOI8-U, Ukrainian (Cyrillic)
* `macintosh`: Macintosh encoding
* `macintosh-cyrillic`: Macintosh Cyrillic encoding
* `windows1250`: Windows1250, Central and Eastern European
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/filebeat-input-log.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ Valid encodings:
* `ebcdic-1040`: IBM CodePage 1140
* `ebcdic-1047`: IBM CodePage 1047
* `koi8r`: KOI8-R, Russian (Cyrillic)
* `koi8u`: KOI8-U, Ukranian (Cyrillic)
* `koi8u`: KOI8-U, Ukrainian (Cyrillic)
* `macintosh`: Macintosh encoding
* `macintosh-cyrillic`: Macintosh Cyrillic encoding
* `windows1250`: Windows1250, Central and Eastern European
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/filebeat/filebeat-input-stdin.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Valid encodings:
* `ebcdic-1040`: IBM CodePage 1140
* `ebcdic-1047`: IBM CodePage 1047
* `koi8r`: KOI8-R, Russian (Cyrillic)
* `koi8u`: KOI8-U, Ukranian (Cyrillic)
* `koi8u`: KOI8-U, Ukrainian (Cyrillic)
* `macintosh`: Macintosh encoding
* `macintosh-cyrillic`: Macintosh Cyrillic encoding
* `windows1250`: Windows1250, Central and Eastern European
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/heartbeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/heartbeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/metricbeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/metricbeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
24 changes: 12 additions & 12 deletions docs/reference/metricbeat/exported-fields-system.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,31 +179,31 @@ Process metrics.


**`system.core.model_number`**
: CPU model number. Only availabe on Linux
: CPU model number. Only available on Linux

type: keyword


**`system.core.model_name`**
: CPU model name. Only availabe on Linux
: CPU model name. Only available on Linux

type: keyword


**`system.core.mhz`**
: CPU core current clock. Only availabe on Linux
: CPU core current clock. Only available on Linux

type: float


**`system.core.core_id`**
: CPU physical core ID. One core might might execute multiple threads, hence more than one `system.core.id` can share the same `system.core.core_id`. Only availabe on Linux
: CPU physical core ID. One core might execute multiple threads, hence more than one `system.core.id` can share the same `system.core.core_id`. Only available on Linux

type: keyword


**`system.core.physical_id`**
: CPU core physical ID. Only availabe on Linux
: CPU core physical ID. Only available on Linux

type: keyword

Expand Down Expand Up @@ -469,7 +469,7 @@ Process metrics.


**`system.diskio.io.time`**
: The total number of of milliseconds spent doing I/Os.
: The total number of milliseconds spent doing I/Os.

type: long

Expand Down Expand Up @@ -1569,23 +1569,23 @@ Memory limits and metrics.


**`system.process.cgroup.memory.mem.low.bytes`**
: memory low threshhold
: memory low threshold

type: long

format: bytes


**`system.process.cgroup.memory.mem.high.bytes`**
: memory high threshhold
: memory high threshold

type: long

format: bytes


**`system.process.cgroup.memory.mem.max.bytes`**
: memory max threshhold
: memory max threshold

type: long

Expand Down Expand Up @@ -1657,23 +1657,23 @@ number of times the controller tripped a given usage level


**`system.process.cgroup.memory.memsw.low.bytes`**
: memory low threshhold
: memory low threshold

type: long

format: bytes


**`system.process.cgroup.memory.memsw.high.bytes`**
: memory high threshhold
: memory high threshold

type: long

format: bytes


**`system.process.cgroup.memory.memsw.max.bytes`**
: memory max threshhold
: memory max threshold

type: long

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/packetbeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/packetbeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/winlogbeat/add-nomad-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Indexers and matchers are used to correlate fields in events with actual metadat

Indexers use allocation metadata to create unique identifiers for each one of the pods.

Avaliable indexers are:
Available indexers are:

`allocation_name`
: Identifies allocations by its name and namespace (as `<namespace>/<name>`)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/winlogbeat/configuration-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Controls the verification of server certificates. Valid values are:

### `ca_trusted_fingerprint` [ca_trusted_fingerprint]

A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normaly.
A HEX encoded SHA-256 of a CA certificate. If this certificate is present in the chain during the handshake, it will be added to the `certificate_authorities` list and the handshake will continue normally.

To get the fingerprint from a CA certificate on a Unix-like system, you can use the following command, where `ca.crt` is the certificate.

Expand Down
4 changes: 2 additions & 2 deletions filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ filebeat.inputs:
# To fetch all ".log" files from a specific level of subdirectories
# /var/log/*/*.log can be used.
# For each file found under this path, a harvester is started.
# Make sure not file is defined twice as this can lead to unexpected behaviour.
# Make sure no file is defined twice as this can lead to unexpected behaviour.
paths:
- /var/log/*.log
#- c:\programdata\elasticsearch\logs\*
Expand Down Expand Up @@ -346,7 +346,7 @@ filebeat.inputs:

#### Filtering messages

# You can filter messsages in the parsers pipeline. Use this method if you would like to
# You can filter messages in the parsers pipeline. Use this method if you would like to
# include or exclude lines before they are aggregated into multiline or the JSON contents
# are parsed.

Expand Down
6 changes: 3 additions & 3 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ filebeat.inputs:
# To fetch all ".log" files from a specific level of subdirectories
# /var/log/*/*.log can be used.
# For each file found under this path, a harvester is started.
# Make sure not file is defined twice as this can lead to unexpected behaviour.
# Make sure no file is defined twice as this can lead to unexpected behaviour.
paths:
- /var/log/*.log
#- c:\programdata\elasticsearch\logs\*
Expand Down Expand Up @@ -759,7 +759,7 @@ filebeat.inputs:

#### Filtering messages

# You can filter messsages in the parsers pipeline. Use this method if you would like to
# You can filter messages in the parsers pipeline. Use this method if you would like to
# include or exclude lines before they are aggregated into multiline or the JSON contents
# are parsed.

Expand Down Expand Up @@ -2264,7 +2264,7 @@ output.elasticsearch:
# Path to the Kerberos configuration.
#kerberos.config_path: /etc/krb5.conf

# The service name. Service principal name is contructed from
# The service name. Service principal name is constructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ func readStates(log *logp.Logger, store *statestore.Store, prefix string) (*stat

var st state
if err := dec.Decode(&st); err != nil {
log.Errorf("Failed to read regisry state for '%v', cursor state will be ignored. Error was: %+v",
log.Errorf("Failed to read registry state for '%v', cursor state will be ignored. Error was: %+v",
key, err)
return true, nil
}
Expand Down
8 changes: 6 additions & 2 deletions filebeat/processor/add_kubernetes_metadata/matchers.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ func (f *LogPathMatcher) MetadataIndex(event mapstr.M) string {
return ""
}

source := value.(string)
source, ok := value.(string)
if !ok {
f.logger.Debugf("Error extracting log.file.path from the event: value is not a string.")
return ""
Comment thread
strawgate marked this conversation as resolved.
}
f.logger.Debugf("Incoming log.file.path value: %s", source)

if !strings.Contains(source, f.LogsPath) {
Expand Down Expand Up @@ -128,7 +132,7 @@ func (f *LogPathMatcher) MetadataIndex(event mapstr.M) string {
}
}

f.logger.Error("Error extracting pod uid - source value does not contains matcher's logs_path")
f.logger.Error("Error extracting pod UID - source value does not contain matcher's logs_path")
return ""
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ output.elasticsearch:
# Path to the Kerberos configuration.
#kerberos.config_path: /etc/krb5.conf

# The service name. Service principal name is contructed from
# The service name. Service principal name is constructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

Expand Down
2 changes: 1 addition & 1 deletion libbeat/_meta/config/output-kafka.reference.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
# Path to the Kerberos configuration.
#kerberos.config_path: /etc/krb5.conf

# The service name. Service principal name is contructed from
# The service name. Service principal name is constructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

Expand Down
4 changes: 2 additions & 2 deletions libbeat/autodiscover/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ spec:
Everything works the same as Autodiscover without LeaderElection until step 8.

8. If there is no conditions in the template set by the user, the configs will be generated from [hints](https://github.com/elastic/beats/blob/4b1f69923b3f2abbbf1860295fe5dbff7db3d63c/libbeat/autodiscover/providers/kubernetes/kubernetes.go#L186).
9. Wether hints are enabled or not is part of the [Kubernetes Provider struct](https://github.com/elastic/beats/blob/4b1f69923b3f2abbbf1860295fe5dbff7db3d63c/libbeat/autodiscover/providers/kubernetes/kubernetes.go#L121) builders field.
9. Whether hints are enabled or not is part of the [Kubernetes Provider struct](https://github.com/elastic/beats/blob/4b1f69923b3f2abbbf1860295fe5dbff7db3d63c/libbeat/autodiscover/providers/kubernetes/kubernetes.go#L121) builders field.
10. [GenerateHints](https://github.com/elastic/beats/blob/eff92354db783001880f4bade9f59942fca747ba/libbeat/autodiscover/builder/helper.go#L213) function looks into the event's annotations. A [hints map](https://github.com/elastic/beats/blob/eff92354db783001880f4bade9f59942fca747ba/libbeat/autodiscover/builder/helper.go#L226) is created with all hints and returned.
11. From those hints, configs are [created](https://github.com/elastic/beats/blob/4b1f69923b3f2abbbf1860295fe5dbff7db3d63c/libbeat/autodiscover/builder.go#L97) in the same form as in `Autodiscover without LeaderElection` step 8.
They contain the same information as if they where set explicitly in the metricbeat configureation but actually derive from the pod annotations.
They contain the same information as if they were set explicitly in the Metricbeat configuration but actually derive from the pod annotations.
12. Those configs are then [added](https://github.com/elastic/beats/blob/4b1f69923b3f2abbbf1860295fe5dbff7db3d63c/libbeat/autodiscover/providers/kubernetes/kubernetes.go#L197) in the event and gets published.
13. The process after that is same as in `Autodiscover without LeaderElection` step 9 and onward.

Expand Down
10 changes: 5 additions & 5 deletions libbeat/cmd/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ import (
func genCompletionCmd(_ instance.Settings, rootCmd *BeatsRootCmd) *cobra.Command {
completionCmd := cobra.Command{
Use: "completion SHELL",
Short: "Output shell completion code for the specified shell (bash and zsh only by the moment)",
Short: "Output shell completion code for the specified shell (bash and zsh only for now)",
// We don't want to expose this one in help:
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
fmt.Println("Expected one argument with the desired shell")
fmt.Println("Expected one argument with the desired shell") //nolint:forbidigo // preserving existing stdout behavior
os.Exit(1)
}

switch args[0] {
case "bash":
rootCmd.GenBashCompletion(os.Stdout)
_ = rootCmd.GenBashCompletion(os.Stdout)
case "zsh":
rootCmd.GenZshCompletion(os.Stdout)
_ = rootCmd.GenZshCompletion(os.Stdout)
default:
fmt.Printf("Unknown shell %s, only bash and zsh are available\n", args[0])
fmt.Printf("Unknown shell %s, only bash and zsh are available\n", args[0]) //nolint:forbidigo // preserving existing stdout behavior
os.Exit(1)
}
},
Expand Down
Loading
Loading