diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 00f8b75cd2d..b3985ae5b24 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -48,6 +48,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - RabbitMQ node metricset only collects metrics of the instance it connects to, `node.collect: cluster` can be used to collect all nodes as before. {issue}6556[6556] {pull}6971[6971] - Change http/server metricset to put events by default under http.server and prefix config options with server.. {pull}7100[7100] - Disable dedotting in docker module configuration. This will change the out-of-the-box behaviour, but not the one of already configured instances. {pull}7485[7485] +- Fix typo in etcd/self metricset fields from *.bandwithrate to *.bandwidthrate. {pull}7456[7456] *Packetbeat* @@ -85,7 +86,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Fixed a deadlock in the file_integrity module under Windows. {issue}6864[6864] - Fixed parsing of AppArmor audit messages. {pull}6978[6978] - Allow `auditbeat setup` to run without requiring elevated privileges for the audit client. {issue}7111[7111] -- Fix goroutine leak that occured when the auditd module was stopped. {pull}7163[7163] +- Fix goroutine leak that occurred when the auditd module was stopped. {pull}7163[7163] *Filebeat* @@ -93,7 +94,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Fix memory leak in log prospector when files cannot be read. {issue}6797[6797] - Add raw JSON to message field when JSON parsing fails. {issue}6516[6516] - Commit registry writes to stable storage to avoid corrupt registry files. {issue}6792[6792] -- Fix a data race between stopping and starting of the harverters. {issue}#6879[6879] +- Fix a data race between stopping and starting of the harvesters. {issue}#6879[6879] - Fix a parsing issue in the syslog input for RFC3339 timestamp and time with nanoseconds. {pull}7046[7046] - Comply with PostgreSQL database name format {pull}7198[7198] - Fix an issue with an overflowing wait group when using the TCP input. {issue}7202[7202] @@ -153,7 +154,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Add `has_fields` conditional to filter events based on the existence of all the given fields. {issue}6285[6285] {pull}6653[6653] - Add support for spooling to disk to the beats event publishing pipeline. {pull}6581[6581] - Added logging of system info at Beat startup. {issue}5946[5946] -- Do not log errors if X-Pack Monitoring is enabled but Elastisearch X-Pack is not. {pull}6627[6627] +- Do not log errors if X-Pack Monitoring is enabled but Elasticsearch X-Pack is not. {pull}6627[6627] - Add rename processor. {pull}6292[6292] - Add IP-addresses and MAC-addresses to add_host_metadata. {pull}6878[6878] - Added a seccomp (secure computing) filter on Linux that whitelists the @@ -198,7 +199,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Add Logstash module support for main log and the slow log, support the plain text or structured JSON format {pull}5481[5481] - Add stream filtering when using `docker` prospector. {pull}6057[6057] - Add support for CRI logs format. {issue}5630[5630] -- Add json.ignore_decoding_error config to not log json decoding erors. {issue}6547[6547] +- Add json.ignore_decoding_error config to not log json decoding errors. {issue}6547[6547] - Make registry file permission configurable. {pull}6455[6455] - Add MongoDB module. {pull}6283[6238] - Add Ingest pipeline loading to setup. {pull}6814[6814] @@ -209,7 +210,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Support MySQL 5.7.19 by mysql/slowlog {pull}6969[6969] - Correctly join partial log lines when using `docker` input. {pull}6967[6967] - Add support for TLS with client authentication to the TCP input {pull}7056[7056] -- Converted part of pipeline from treafik/access metricSet to dissect to improve efficeny. {pull}7209[7209] +- Converted part of pipeline from treafik/access metricSet to dissect to improve efficiency. {pull}7209[7209] - Add GC fileset to the Elasticsearch module. {pull}7305[7305] - Add Audit log fileset to the Elasticsearch module. {pull}7365[7365] - Add Slow log fileset to the Elasticsearch module. {pull}7473[7473] @@ -410,7 +411,7 @@ https://github.com/elastic/beats/compare/v6.1.3...v6.2.0[View commits] *Auditbeat* - Fixed an issue where the proctitle value was being truncated. {pull}6080[6080] -- Fixed an issue where values were incorrectly interpretted as hex data. {pull}6080[6080] +- Fixed an issue where values were incorrectly interpreted as hex data. {pull}6080[6080] - Fixed parsing of the `key` value when multiple keys are present. {pull}6080[6080] - Fix possible resource leak if file_integrity module is used with config reloading on Windows or Linux. {pull}6198[6198] @@ -449,7 +450,7 @@ https://github.com/elastic/beats/compare/v6.1.3...v6.2.0[View commits] - Use structured logging for the metrics that are periodically logged via the `logging.metrics` feature. {pull}5915[5915] - Improve Elasticsearch output metrics to count number of dropped and duplicate (if event ID is given) events. {pull}5811[5811] -- Add the abilility for the add_docker_metadata process to enrich based on process ID. {pull}6100[6100] +- Add the ability for the add_docker_metadata process to enrich based on process ID. {pull}6100[6100] - The `add_docker_metadata` and `add_kubernetes_metadata` processors are now GA, instead of Beta. {pull}6105[6105] - Update go-ucfg library to support top level key reference and cyclic key reference for the keystore {pull}6098[6098] @@ -475,7 +476,7 @@ https://github.com/elastic/beats/compare/v6.1.3...v6.2.0[View commits] - Update the MySQL dashboard to use the Time Series Visual Builder. {pull}5996[5996] - Add experimental uwsgi module. {pull}6006[6006] - Docker and Kubernetes modules are now GA, instead of Beta. {pull}6105[6105] -- Support haproxy stats gathering using http (additionaly to tcp socket). {pull}5819[5819] +- Support haproxy stats gathering using http (additionally to tcp socket). {pull}5819[5819] - Support to optionally 'de dot' keys in http/json metricset to prevent collisions. {pull}5957[5957] *Packetbeat* @@ -578,7 +579,7 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits] *Affecting all Beats* -- Support dashboard loading without Elasticseach {pull}5653[5653] +- Support dashboard loading without Elasticsearch {pull}5653[5653] - Changed the hashbang used in the beat helper script from `/bin/bash` to `/usr/bin/env bash`. {pull}5051[5051] - Changed beat helper script to use `exec` when running the beat. {pull}5051[5051] - Fix reloader error message to only print on actual error {pull}5066[5066] @@ -819,7 +820,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta1...v6.0.0-beta2[View commit - Added missing mongodb configuration file to the `modules.d` folder. {pull}4870[4870] - Fix wrong MySQL CRUD queries timelion visualization {pull}4857[4857] -- Add new metrics to CPU metricsset {pull}4969[4969] +- Add new metrics to CPU metricset {pull}4969[4969] *Packetbeat* @@ -1504,7 +1505,7 @@ https://github.com/elastic/beats/compare/v5.2.2...v5.3.0[View commits] - Add Filebeat modules for system, apache2, mysql, and nginx. {issue}3159[3159] - Add the `pipeline` config option at the prospector level, for configuring the Ingest Node pipeline ID. {pull}3433[3433] - Update regular expressions used for matching file names or lines (multiline, include/exclude functionality) to new matchers improving performance of simple string matches. {pull}3469[3469] -- The `symlinks` and `harverster_limit` settings are now GA, instead of experimental. {pull}3525[3525] +- The `symlinks` and `harvester_limit` settings are now GA, instead of experimental. {pull}3525[3525] - close_timeout is also applied when the output is blocking. {pull}3511[3511] - Improve handling of different path variants on Windows. {pull}3781[3781] - Add multiline.flush_pattern option, for specifying the 'end' of a multiline pattern {pull}4019[4019] @@ -1779,7 +1780,7 @@ The list below covers the changes between 5.0.0-rc1 and 5.0.0 GA only. - Fix high CPU usage on macOS when encountering processes with long command lines. {issue}2747[2747] - Fix high value of `system.memory.actual.free` and `system.memory.actual.used`. {issue}2653[2653] -- Change several `OpenProcess` calls on Windows to request the lowest possible access provilege. {issue}1897[1897] +- Change several `OpenProcess` calls on Windows to request the lowest possible access privilege. {issue}1897[1897] - Fix system.memory.actual.free high value on Windows. {issue}2653[2653] *Filebeat* @@ -2037,7 +2038,7 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha3...v5.0.0-alpha4[View comm *Affecting all Beats* -- The topology_expire option of the Elasticserach output was removed. {pull}1907[1907] +- The topology_expire option of the Elasticsearch output was removed. {pull}1907[1907] *Filebeat* @@ -2534,7 +2535,7 @@ https://github.com/elastic/beats/compare/v1.0.1...v1.1.0[View commits] - Add multiline support for combining multiple related lines into one event. {issue}461[461] - Add `exclude_lines` and `include_lines` options for regexp based line filtering. {pull}430[430] - Add `exclude_files` configuration option. {pull}563[563] -- Add experimental option to enable filebeat publisher pipeline to operate asynchonrously {pull}782[782] +- Add experimental option to enable filebeat publisher pipeline to operate asynchronously {pull}782[782] *Winlogbeat* @@ -2575,7 +2576,7 @@ https://github.com/elastic/beats/compare/1.0.0-rc2...1.0.0[Check 1.0.0 diff] *Affecting all Beats* - Fix random panic on shutdown by calling shutdown handler only once. elastic/filebeat#204 -- Fix credentials are not send when pinging an elasticsearch host. elastic/fileabeat#287 +- Fix credentials are not send when pinging an elasticsearch host. elastic/filebeat#287 *Filebeat* diff --git a/Vagrantfile b/Vagrantfile index e161ec5f12b..310e5e09759 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,7 +11,7 @@ # Usage and Features: # - Two users exist: Administrator and Vagrant. Both have the password: vagrant # - Use 'vagrant ssh' to open a Windows command prompt. -# - Use 'vagrant rdp' to open a Windows Remote Deskop session. Mac users must +# - Use 'vagrant rdp' to open a Windows Remote Desktop session. Mac users must # install the Microsoft Remote Desktop Client from the App Store. # - There is a desktop shortcut labeled "Beats Shell" that opens a command prompt # to C:\Gopath\src\github.com\elastic\beats where the code is mounted. @@ -54,9 +54,9 @@ $Shortcut.WorkingDirectory = "C:\\Gopath\\src\\github.com\\elastic\\beats" $Shortcut.Save() echo "Disable automatic updates" -$AUSettigns = (New-Object -com "Microsoft.Update.AutoUpdate").Settings -$AUSettigns.NotificationLevel = 1 -$AUSettigns.Save() +$AUSettings = (New-Object -com "Microsoft.Update.AutoUpdate").Settings +$AUSettings.NotificationLevel = 1 +$AUSettings.Save() SCRIPT # Provisioning for Unix/Linux diff --git a/auditbeat/docs/setting-up-running.asciidoc b/auditbeat/docs/setting-up-running.asciidoc index 7495529e462..8f7de65daea 100644 --- a/auditbeat/docs/setting-up-running.asciidoc +++ b/auditbeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the diff --git a/auditbeat/module/file_integrity/event.go b/auditbeat/module/file_integrity/event.go index a0daddc7fc9..3c2fd6dffe9 100644 --- a/auditbeat/module/file_integrity/event.go +++ b/auditbeat/module/file_integrity/event.go @@ -57,7 +57,7 @@ func (s Source) String() string { func (s Source) MarshalText() ([]byte, error) { return []byte(s.String()), nil } const ( - // SourceScan identifies events triggerd by a file system scan. + // SourceScan identifies events triggered by a file system scan. SourceScan Source = iota // SourceFSNotify identifies events triggered by a notification from the // file system. diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index 702cf20a5b6..c49d11565a6 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -243,7 +243,7 @@ func findElasticBeatsDir() (string, error) { return "", errors.Errorf("failed to find %v in the project's vendor", devToolsImportPath) } -// SetElasticBeatsDir explicilty sets the location of the Elastic Beats +// SetElasticBeatsDir explicitly sets the location of the Elastic Beats // directory. If not set then it will attempt to locate it. func SetElasticBeatsDir(dir string) { elasticBeatsDirLock.Lock() diff --git a/dev-tools/open_pr b/dev-tools/open_pr index 1bde2d3871c..4c72f88f845 100755 --- a/dev-tools/open_pr +++ b/dev-tools/open_pr @@ -53,7 +53,7 @@ def main(): if args.labels: labels.extend(args.labels.split(",")) if args.wip: - lables += "in progress" + labels += "in progress" # get version and set a version label on the original PR version = get_version(os.getcwd()) diff --git a/dev-tools/packaging/preference-pane/helper/setboot.m b/dev-tools/packaging/preference-pane/helper/setboot.m index 9d9320e568f..7147c24ac7d 100644 --- a/dev-tools/packaging/preference-pane/helper/setboot.m +++ b/dev-tools/packaging/preference-pane/helper/setboot.m @@ -76,7 +76,7 @@ BOOL setRunAtBoot(NSString* plistPath, BOOL runAtBoot) { err = [output streamError]; } if (err != nil) { - fail([NSString stringWithFormat:@"Error writting property-list. Code=%u `%@`", (unsigned int)[err code], [err localizedDescription]]); + fail([NSString stringWithFormat:@"Error writing property-list. Code=%u `%@`", (unsigned int)[err code], [err localizedDescription]]); return NO; } [output close]; @@ -84,7 +84,7 @@ BOOL setRunAtBoot(NSString* plistPath, BOOL runAtBoot) { NSData *data = [output propertyForKey:NSStreamDataWrittenToMemoryStreamKey]; BOOL success = [data writeToFile:plistPath atomically:YES]; if (!success) { - fail(@"Error overwritting plist file"); + fail(@"Error overwriting plist file"); return NO; } return YES; diff --git a/docs/devguide/create-module.asciidoc b/docs/devguide/create-module.asciidoc index 998cf428bc8..b446b901bda 100644 --- a/docs/devguide/create-module.asciidoc +++ b/docs/devguide/create-module.asciidoc @@ -82,7 +82,7 @@ To see an example of the `testing.go` file, look at the https://github.com/elast All the environments are setup with docker. `make integration-tests-environment` and `make system-tests-environment` can be used to run tests for all modules. In case you are developing a module it is convenient to run the tests only for one module and directly run it on your machine. -First you need to start the environment for your module to test and expose the port to your local machien. For this you can run the following command inside the metricbeat directory: +First you need to start the environment for your module to test and expose the port to your local machine. For this you can run the following command inside the metricbeat directory: [source,bash] ---- diff --git a/docs/devguide/creating-beat-from-metricbeat.asciidoc b/docs/devguide/creating-beat-from-metricbeat.asciidoc index a2f7e2f5fa0..62f437234e8 100644 --- a/docs/devguide/creating-beat-from-metricbeat.asciidoc +++ b/docs/devguide/creating-beat-from-metricbeat.asciidoc @@ -86,7 +86,7 @@ This will run the beat with debug output enabled to the console to directly see [float] ==== Step 5 - Package -To create packages and binaries for different plaforms, https://www.docker.com/[docker] is required. +To create packages and binaries for different platforms, https://www.docker.com/[docker] is required. The first step is to get the most recent packaging tools into your beat: [source,bash] diff --git a/docs/devguide/testing.asciidoc b/docs/devguide/testing.asciidoc index caa0a8f7d88..0e548de333e 100644 --- a/docs/devguide/testing.asciidoc +++ b/docs/devguide/testing.asciidoc @@ -18,7 +18,7 @@ The golang tests can be executed in each Golang package by running `go test .`. To run all non integration tests for a beat run `make unit`. This will execute all the tests which are not inside a `vendor` directory. If you want to have a coverage report for the tests which were run use `make unit-tests`. A coverage report will be generated under `build/coverage` directory. -All Golang tests are in the same package as the tested code itself and have the postfix `_test` in the file name. Most of the tests are in the same package as the rest of the code. Some of the tests which should be sepearate from the rest of the code or should not use private variables go under `{packagename}_test`. +All Golang tests are in the same package as the tested code itself and have the postfix `_test` in the file name. Most of the tests are in the same package as the rest of the code. Some of the tests which should be separate from the rest of the code or should not use private variables go under `{packagename}_test`. ==== Running Python Tests diff --git a/filebeat/_meta/common.p2.yml b/filebeat/_meta/common.p2.yml index c6924437b5d..34fe91f2b0e 100644 --- a/filebeat/_meta/common.p2.yml +++ b/filebeat/_meta/common.p2.yml @@ -39,7 +39,7 @@ filebeat.inputs: ### Multiline options - # Mutiline can be used for log messages spanning multiple lines. This is common + # Multiline can be used for log messages spanning multiple lines. This is common # for Java Stack Traces or C-Line Continuation # The regexp Pattern that has to be matched. The example pattern matches all lines starting with [ diff --git a/filebeat/_meta/common.reference.p2.yml b/filebeat/_meta/common.reference.p2.yml index 032973bbbad..8788afad00e 100644 --- a/filebeat/_meta/common.reference.p2.yml +++ b/filebeat/_meta/common.reference.p2.yml @@ -109,7 +109,7 @@ filebeat.inputs: ### Multiline options - # Mutiline can be used for log messages spanning multiple lines. This is common + # Multiline can be used for log messages spanning multiple lines. This is common # for Java Stack Traces or C-Line Continuation # The regexp Pattern that has to be matched. The example pattern matches all lines starting with [ @@ -141,7 +141,7 @@ filebeat.inputs: # overwrites the pipeline option from the Elasticsearch output. #pipeline: - # If symlinks is enabled, symlinks are opened and harvested. The harvester is openening the + # If symlinks is enabled, symlinks are opened and harvested. The harvester is opening the # original for harvesting but will report the symlink name as source. #symlinks: false diff --git a/filebeat/autodiscover/autodiscover.go b/filebeat/autodiscover/autodiscover.go index bb16eebdba8..5c4ab80b41b 100644 --- a/filebeat/autodiscover/autodiscover.go +++ b/filebeat/autodiscover/autodiscover.go @@ -51,7 +51,7 @@ func (m *AutodiscoverAdapter) CreateConfig(e bus.Event) ([]*common.Config, error // CheckConfig tests given config to check if it will work or not, returns errors in case it won't work func (m *AutodiscoverAdapter) CheckConfig(c *common.Config) error { - // TODO implment config check for all modules + // TODO implement config check for all modules return nil } diff --git a/filebeat/autodiscover/builder/hints/logs.go b/filebeat/autodiscover/builder/hints/logs.go index bdfe390e18e..9b7d236e86a 100644 --- a/filebeat/autodiscover/builder/hints/logs.go +++ b/filebeat/autodiscover/builder/hints/logs.go @@ -214,7 +214,7 @@ func (l *logHints) getFilesets(hints common.MapStr, module string) map[string]*f } } - // No fileseat defined, return defaults for the module, all streams to all filesets + // No fileset defined, return defaults for the module, all streams to all filesets if !configured { for _, conf := range filesets { conf.Enabled = true diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index 457b4babcbb..86db045c84f 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -41,7 +41,7 @@ type clientEventer struct { } // inputOutletConfig defines common input settings -// for the publisher pipline. +// for the publisher pipeline. type inputOutletConfig struct { // event processing common.EventMetadata `config:",inline"` // Fields and tags to add to events. diff --git a/filebeat/channel/util.go b/filebeat/channel/util.go index d2d6a887d84..8111bc2a011 100644 --- a/filebeat/channel/util.go +++ b/filebeat/channel/util.go @@ -88,7 +88,7 @@ func (o *subOutlet) OnEvent(d *util.Data) bool { // update state on 'true' response). // The state update will appear after the current event in the publisher pipeline. // That is, by returning true here, the final state update will - // be presented to the reigstrar, after the last event being processed. + // be presented to the registrar, after the last event being processed. // Once all messages are in the publisher pipeline, in correct order, // it depends on registrar/publisher pipeline if state is finally updated // in the registrar. diff --git a/filebeat/docs/autodiscover-hints.asciidoc b/filebeat/docs/autodiscover-hints.asciidoc index 49e09501446..e258e61ec4d 100644 --- a/filebeat/docs/autodiscover-hints.asciidoc +++ b/filebeat/docs/autodiscover-hints.asciidoc @@ -119,7 +119,7 @@ annotations: co.elastic.logs/multiline.pattern: '^\[' co.elastic.logs/multiline.negate: true co.elastic.logs/multiline.match: after - co.elastic.logs.sidecar/exlude_lines: '^DBG' + co.elastic.logs.sidecar/exclude_lines: '^DBG' ------------------------------------------------------------------------------------- diff --git a/filebeat/docs/multiline.asciidoc b/filebeat/docs/multiline.asciidoc index 3e0b8231a13..b498b2a084d 100644 --- a/filebeat/docs/multiline.asciidoc +++ b/filebeat/docs/multiline.asciidoc @@ -64,7 +64,7 @@ the pattern. + NOTE: The `after` setting is equivalent to `previous` in https://www.elastic.co/guide/en/logstash/current/plugins-codecs-multiline.html[Logstash], and `before` is equivalent to `next`. -*`multiline.flush_pattern`*:: Specifies a regular expression, in which the current multiline will be flushed from memory, ending the multline-message. +*`multiline.flush_pattern`*:: Specifies a regular expression, in which the current multiline will be flushed from memory, ending the multiline-message. *`multiline.max_lines`*:: The maximum number of lines that can be combined into one event. If the multiline message contains more than `max_lines`, any additional diff --git a/filebeat/docs/setting-up-running.asciidoc b/filebeat/docs/setting-up-running.asciidoc index 4560fc9adda..f76b2d13c31 100644 --- a/filebeat/docs/setting-up-running.asciidoc +++ b/filebeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the @@ -23,7 +23,7 @@ This section includes additional information on how to set up and run * <> -//MAINTAINERS: If you add a new file to this section, make sure you update the bulletedl ist ^^ too. +//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too. include::../../libbeat/docs/shared-directory-layout.asciidoc[] diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 17d7d550e76..e78587bbd17 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -462,7 +462,7 @@ filebeat.inputs: ### Multiline options - # Mutiline can be used for log messages spanning multiple lines. This is common + # Multiline can be used for log messages spanning multiple lines. This is common # for Java Stack Traces or C-Line Continuation # The regexp Pattern that has to be matched. The example pattern matches all lines starting with [ @@ -494,7 +494,7 @@ filebeat.inputs: # overwrites the pipeline option from the Elasticsearch output. #pipeline: - # If symlinks is enabled, symlinks are opened and harvested. The harvester is openening the + # If symlinks is enabled, symlinks are opened and harvested. The harvester is opening the # original for harvesting but will report the symlink name as source. #symlinks: false diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml index 354d0ba1cd9..5ae43216b7d 100644 --- a/filebeat/filebeat.yml +++ b/filebeat/filebeat.yml @@ -48,7 +48,7 @@ filebeat.inputs: ### Multiline options - # Mutiline can be used for log messages spanning multiple lines. This is common + # Multiline can be used for log messages spanning multiple lines. This is common # for Java Stack Traces or C-Line Continuation # The regexp Pattern that has to be matched. The example pattern matches all lines starting with [ diff --git a/filebeat/input/file/state.go b/filebeat/input/file/state.go index beccbcb2145..1f93a259f79 100644 --- a/filebeat/input/file/state.go +++ b/filebeat/input/file/state.go @@ -82,7 +82,7 @@ func (s *State) ID() string { return s.Id } -// IsEqual compares the state to an other state supporing stringer based on the unique string +// IsEqual compares the state to an other state supporting stringer based on the unique string func (s *State) IsEqual(c *State) bool { return s.ID() == c.ID() } diff --git a/filebeat/input/file/states.go b/filebeat/input/file/states.go index cfc608f5870..d01026f8776 100644 --- a/filebeat/input/file/states.go +++ b/filebeat/input/file/states.go @@ -25,7 +25,7 @@ import ( ) // States handles list of FileState. One must use NewStates to instantiate a -// file states regisry. Using the zero-value is not safe. +// file states registry. Using the zero-value is not safe. type States struct { sync.RWMutex diff --git a/filebeat/input/log/config.go b/filebeat/input/log/config.go index 542c3da776b..0b13992518d 100644 --- a/filebeat/input/log/config.go +++ b/filebeat/input/log/config.go @@ -145,7 +145,7 @@ var ValidScanSort = map[string]struct{}{ } func (c *config) Validate() error { - // DEPRECATED 6.0.0: warning is already outputted on propsector level + // DEPRECATED 6.0.0: warning is already outputted on prospector level if c.InputType != "" { c.Type = c.InputType } diff --git a/filebeat/input/redis/harvester.go b/filebeat/input/redis/harvester.go index 00968814767..78bf63ba792 100644 --- a/filebeat/input/redis/harvester.go +++ b/filebeat/input/redis/harvester.go @@ -159,7 +159,7 @@ func (h *Harvester) Run() error { return nil } -// Stop stopps the harvester +// Stop stops the harvester func (h *Harvester) Stop() { close(h.done) } diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go index c35d71a8b50..d8f7dde529a 100644 --- a/filebeat/input/syslog/input.go +++ b/filebeat/input/syslog/input.go @@ -42,7 +42,7 @@ import ( // defined in https://tools.ietf.org/html/rfc3164#section-4.1.1. // // Example: -// 2 => "Critial" +// 2 => "Critical" type mapper []string var ( diff --git a/filebeat/inputsource/tcp/client.go b/filebeat/inputsource/tcp/client.go index cf1d29722d6..f9204925b90 100644 --- a/filebeat/inputsource/tcp/client.go +++ b/filebeat/inputsource/tcp/client.go @@ -93,7 +93,7 @@ func (c *client) handle() error { c.callback(scanner.Bytes(), c.metadata) } - // We are out of the scanner, either we reached EOF or another fatal error occured. + // We are out of the scanner, either we reached EOF or another fatal error occurred. // like we failed to complete the TLS handshake or we are missing the client certificate when // mutual auth is on, which is the default. if err := scanner.Err(); err != nil { diff --git a/filebeat/inputsource/tcp/server_test.go b/filebeat/inputsource/tcp/server_test.go index e0b089c6724..23bfce4bd0a 100644 --- a/filebeat/inputsource/tcp/server_test.go +++ b/filebeat/inputsource/tcp/server_test.go @@ -93,7 +93,7 @@ func TestReceiveEventsAndMetadata(t *testing.T) { messageSent: strings.Join(expectedMessages, ""), }, { - name: "SingleCharCustomDelimiterMessageWithoutBoudaries", + name: "SingleCharCustomDelimiterMessageWithoutBoundaries", cfg: map[string]interface{}{ "line_delimiter": ";", }, diff --git a/filebeat/reader/encode/encoding/utf16.go b/filebeat/reader/encode/encoding/utf16.go index 72018d16834..0c7c4b6791a 100644 --- a/filebeat/reader/encode/encoding/utf16.go +++ b/filebeat/reader/encode/encoding/utf16.go @@ -29,7 +29,7 @@ import ( type endianness int8 const ( - unknownEndianess endianness = iota + unknownEndianness endianness = iota bigEndian littleEndian ) @@ -41,7 +41,7 @@ var ErrUnsupportedSourceTypeBOM = errors.New("source type not support by BOM bas // before configuring the actual decoder and encoder. var ( // BOM is required, as no fallback is specified - utf16BOMRequired = utf16BOM(unknownEndianess) + utf16BOMRequired = utf16BOM(unknownEndianness) // BOM is optional. Falls back to BigEndian if missing utf16BOMBigEndian = utf16BOM(bigEndian) @@ -91,33 +91,33 @@ func utf16Seekable(in io.ReadSeeker, endianness endianness) (Encoding, error) { return nil, transform.ErrShortSrc } - // determine endianess from BOM - inEndiannes := unknownEndianess + // determine endianness from BOM + inEndianness := unknownEndianness switch { case buf[0] == 0xfe && buf[1] == 0xff: - inEndiannes = bigEndian + inEndianness = bigEndian case buf[0] == 0xff && buf[1] == 0xfe: - inEndiannes = littleEndian + inEndianness = littleEndian } // restore offset if BOM is missing or this function was not // called with read pointer at beginning of file - if !keepOffset || inEndiannes == unknownEndianess { + if !keepOffset || inEndianness == unknownEndianness { if _, err = in.Seek(offset, os.SEEK_SET); err != nil { return nil, err } } // choose encoding based on BOM - if encoding, ok := utf16Map[inEndiannes]; ok { + if encoding, ok := utf16Map[inEndianness]; ok { return encoding, nil } - // fall back to configured endianess + // fall back to configured endianness if encoding, ok := utf16Map[endianness]; ok { return encoding, nil } - // no encoding for configured endianess found => fail + // no encoding for configured endianness found => fail return nil, unicode.ErrMissingBOM } diff --git a/filebeat/reader/encode/encoding/utf16_test.go b/filebeat/reader/encode/encoding/utf16_test.go index 52dd07711be..732a9b615fc 100644 --- a/filebeat/reader/encode/encoding/utf16_test.go +++ b/filebeat/reader/encode/encoding/utf16_test.go @@ -36,7 +36,7 @@ func TestUtf16BOMEncodings(t *testing.T) { var tests = []struct { name string - testEndianess unicode.Endianness + testEndianness unicode.Endianness testBOMPolicy unicode.BOMPolicy expectedEncoding Encoding expectedError error @@ -72,10 +72,10 @@ func TestUtf16BOMEncodings(t *testing.T) { for _, test := range tests { t.Logf("testing: codec=%v, bigendian=%v, bomPolicy=%v", - test.name, test.testEndianess, test.testBOMPolicy) + test.name, test.testEndianness, test.testBOMPolicy) buf := bytes.NewBuffer(nil) - writeEncoding := unicode.UTF16(test.testEndianess, test.testBOMPolicy) + writeEncoding := unicode.UTF16(test.testEndianness, test.testBOMPolicy) writer := transform.NewWriter(buf, writeEncoding.NewEncoder()) writer.Write(text) writer.Close() diff --git a/filebeat/reader/multiline/multiline.go b/filebeat/reader/multiline/multiline.go index e15bd7e4676..f1b871f6c74 100644 --- a/filebeat/reader/multiline/multiline.go +++ b/filebeat/reader/multiline/multiline.go @@ -66,7 +66,7 @@ const ( type matcher func(last, current []byte) bool var ( - sigMultilineTimeout = errors.New("multline timeout") + sigMultilineTimeout = errors.New("multiline timeout") ) // New creates a new multi-line reader combining stream of @@ -206,7 +206,7 @@ func (mlr *Reader) readNext() (reader.Message, error) { return msg, nil } - // no match, return current multline and retry with current line on next + // no match, return current multiline and retry with current line on next // call to readNext awaiting the error being reproduced (or resolved) // in next call to Next msg := mlr.finalize() diff --git a/filebeat/reader/multiline/multiline_test.go b/filebeat/reader/multiline/multiline_test.go index 0ef1e45f896..50ad18f17d1 100644 --- a/filebeat/reader/multiline/multiline_test.go +++ b/filebeat/reader/multiline/multiline_test.go @@ -197,7 +197,7 @@ func createMultilineTestReader(t *testing.T, in *bytes.Buffer, cfg Config) reade r, err = New(strip_newline.New(r), "\n", 1<<20, &cfg) if err != nil { - t.Fatalf("failed to initializ reader: %v", err) + t.Fatalf("failed to initialize reader: %v", err) } return r diff --git a/filebeat/registrar/registrar.go b/filebeat/registrar/registrar.go index f6ad4e62e9d..804ef569203 100644 --- a/filebeat/registrar/registrar.go +++ b/filebeat/registrar/registrar.go @@ -42,7 +42,7 @@ type Registrar struct { states *file.States // Map with all file paths inside and the corresponding state gcRequired bool // gcRequired is set if registry state needs to be gc'ed before the next write - gcEnabled bool // gcEnabled indictes the registry contains some state that can be gc'ed in the future + gcEnabled bool // gcEnabled indicates the registry contains some state that can be gc'ed in the future flushTimeout time.Duration bufferedStateUpdates int } diff --git a/filebeat/scripts/generator/generator.go b/filebeat/scripts/generator/generator.go index aaf0fdbedf1..e5aaf771ab4 100644 --- a/filebeat/scripts/generator/generator.go +++ b/filebeat/scripts/generator/generator.go @@ -104,7 +104,7 @@ func readTemplate(template string, replace map[string]string) ([]byte, error) { return c, nil } -// RenameConfigYml renemas config.yml to the name of the fileset, otherwise Filebeat refuses to start +// RenameConfigYml renames config.yml to the name of the fileset, otherwise Filebeat refuses to start func RenameConfigYml(modulesPath, module, fileset string) error { old := path.Join(modulesPath, "module", module, fileset, "config", "config.yml") new := path.Join(modulesPath, "module", module, fileset, "config", fileset+".yml") diff --git a/filebeat/tests/open-file-handlers/log_stdout.py b/filebeat/tests/open-file-handlers/log_stdout.py index dc1108f0baf..75d3667a2c1 100644 --- a/filebeat/tests/open-file-handlers/log_stdout.py +++ b/filebeat/tests/open-file-handlers/log_stdout.py @@ -12,7 +12,7 @@ lines_per_file = 10 # Each line should have the same length + line ending -# Some spare capacity is added to make sure all events are presisted +# Some spare capacity is added to make sure all events are persisted line_length = len(str(total_lines)) + 1 # Setup python log handler diff --git a/filebeat/tests/system/test_load.py b/filebeat/tests/system/test_load.py index bc33dbdae07..3e40d11db86 100644 --- a/filebeat/tests/system/test_load.py +++ b/filebeat/tests/system/test_load.py @@ -34,7 +34,7 @@ def test_no_missing_events(self): total_lines = 1000 lines_per_file = 10 # Each line should have the same length + line ending - # Some spare capacity is added to make sure all events are presisted + # Some spare capacity is added to make sure all events are persisted line_length = len(str(total_lines)) + 1 # Setup python log handler @@ -78,7 +78,7 @@ def test_no_missing_events(self): v = int(content["message"]) entry_list.append(v) - ### This lines can be uncomemnted for debugging ### + ### This lines can be uncommented for debugging ### # Prints out the missing entries # for i in range(total_lines): # if i not in entry_list: diff --git a/filebeat/tests/system/test_multiline.py b/filebeat/tests/system/test_multiline.py index 9abc9f8a2ec..bc219d07079 100644 --- a/filebeat/tests/system/test_multiline.py +++ b/filebeat/tests/system/test_multiline.py @@ -227,7 +227,7 @@ def test_max_bytes(self): # Check that first 60 chars are sent assert True == self.log_contains("cluster.metadata", "output/filebeat") - # Checks that chars aferwards are not sent + # Checks that chars afterwards are not sent assert False == self.log_contains("Zach", "output/filebeat") # Check that output file has the same number of lines as the log file diff --git a/filebeat/tests/system/test_registrar.py b/filebeat/tests/system/test_registrar.py index a9f094ced9c..73d30324523 100644 --- a/filebeat/tests/system/test_registrar.py +++ b/filebeat/tests/system/test_registrar.py @@ -282,7 +282,7 @@ def test_registry_file_update_permissions(self): "a/b/c/registry_x")), max_timeout=1) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(1) filebeat.check_kill_and_wait() @@ -477,7 +477,7 @@ def test_restart_continue(self): lambda: self.output_has(lines=1), max_timeout=10) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(1) assert os.stat(testfile_path).st_ino == self.get_registry_entry_by_path( @@ -547,7 +547,7 @@ def test_rotating_file_with_restart(self): lambda: self.output_has(lines=1), max_timeout=10) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(1) data = self.get_registry() @@ -570,7 +570,7 @@ def test_rotating_file_with_restart(self): "Updating state for renamed file"), max_timeout=10) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(1) data = self.get_registry() @@ -761,7 +761,7 @@ def test_state_after_rotation_ignore_older(self): "Registry file updated. 2 states written.") >= 1, max_timeout=15) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(1) filebeat.kill_and_wait() @@ -1468,7 +1468,7 @@ def test_registrar_files_with_input_level_processors(self): "registry")), max_timeout=10) - # Wait a momemt to make sure registry is completely written + # Wait a moment to make sure registry is completely written time.sleep(2) filebeat.check_kill_and_wait() diff --git a/filebeat/tests/system/test_reload_inputs.py b/filebeat/tests/system/test_reload_inputs.py index e0757cfa291..4de554fe2c6 100644 --- a/filebeat/tests/system/test_reload_inputs.py +++ b/filebeat/tests/system/test_reload_inputs.py @@ -120,7 +120,7 @@ def test_start_stop_replace(self): with open(self.working_dir + "/configs/input.yml", 'w') as f: f.write(inputConfigTemplate.format(self.working_dir + "/logs/test2.log")) - # Update both log files, only 1 change should be picke dup + # Update both log files, only 1 change should be picked up with open(logfile1, 'a') as f: f.write("First log file 1\n") with open(logfile2, 'a') as f: @@ -180,7 +180,7 @@ def test_reload_same_input(self): lambda: self.log_contains("Stopping runner:"), max_timeout=15) - # Update both log files, only 1 change should be picke dup + # Update both log files, only 1 change should be picked up with open(logfile, 'a') as f: f.write(second_line + "\n") @@ -229,7 +229,7 @@ def test_load_configs(self): self.wait_until(lambda: self.output_lines() == 1) - # Update both log files, only 1 change should be picke dup + # Update both log files, only 1 change should be picked up with open(logfile, 'a') as f: f.write(second_line + "\n") diff --git a/filebeat/tests/system/test_tcp_tls.py b/filebeat/tests/system/test_tcp_tls.py index f7ea32e4149..2250defbb06 100644 --- a/filebeat/tests/system/test_tcp_tls.py +++ b/filebeat/tests/system/test_tcp_tls.py @@ -10,7 +10,7 @@ CERTPATH = path.abspath(path.join(CURRENT_PATH, "config/certificates")) -# Self signed certificate used without mutual and failling scenario. +# Self signed certificate used without mutual and failing scenario. CERTIFICATE1 = path.join(CERTPATH, "beats1.crt") KEY1 = path.join(CERTPATH, "beats1.key") diff --git a/heartbeat/docs/heartbeat-devguide.asciidoc b/heartbeat/docs/heartbeat-devguide.asciidoc index c61e99fd02a..1939648b759 100644 --- a/heartbeat/docs/heartbeat-devguide.asciidoc +++ b/heartbeat/docs/heartbeat-devguide.asciidoc @@ -11,7 +11,7 @@ are available. As a developer, you can use Heartbeat in two different ways: * Create your own Beat and use Heartbeat as a library We recommend that you start by creating your own Beat to keep the development of -your own monintors independent of Heartbeat. At a later stage, if you decide to +your own monitors independent of Heartbeat. At a later stage, if you decide to add a monitor to Heartbeat, you can reuse the code without making additional changes. The following topics describe how to contribute to Heartbeat by adding new monitors diff --git a/heartbeat/docs/heartbeat-options.asciidoc b/heartbeat/docs/heartbeat-options.asciidoc index 4e09c2db90e..f792561560f 100644 --- a/heartbeat/docs/heartbeat-options.asciidoc +++ b/heartbeat/docs/heartbeat-options.asciidoc @@ -112,7 +112,7 @@ If `mode` is `any`, the monitor pings only one IP address for a hostname. If ping every IP address for the specified hostname. The default is `any`. [float] -[[monitor-timieout]] +[[monitor-timeout]] ==== `timeout` The total running time for each ping test. This is the total time allowed for @@ -172,7 +172,7 @@ Heartbeat checks this file periodically and starts a new monitor instance for each new JSON object added to the file. For example, imagine that you add 10 new entries to the JSON file, each for a different hostname. When Heartbeat picks up the changes in the file, it merges the original config -(`hearbeat.yml`) plus the JSON objects, and starts a monitor for each new host +(`heartbeat.yml`) plus the JSON objects, and starts a monitor for each new host that you've configured. If you delete an object from the JSON file and it doesn't exist in the main config, Heartbeat stops the monitor instance running for that object. diff --git a/heartbeat/docs/setting-up-running.asciidoc b/heartbeat/docs/setting-up-running.asciidoc index a6762faa0e7..a9991ceffde 100644 --- a/heartbeat/docs/setting-up-running.asciidoc +++ b/heartbeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the @@ -20,7 +20,7 @@ This section includes additional information on how to set up and run * <> -//MAINTAINERS: If you add a new file to this section, make sure you update the bulletedl ist ^^ too. +//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too. include::../../libbeat/docs/shared-directory-layout.asciidoc[] diff --git a/heartbeat/monitors/active/icmp/loop.go b/heartbeat/monitors/active/icmp/loop.go index 862036a6204..4cd97d598cf 100644 --- a/heartbeat/monitors/active/icmp/loop.go +++ b/heartbeat/monitors/active/icmp/loop.go @@ -342,7 +342,7 @@ func createListener(name, network string) *icmp.PacketConn { // XXX: need to check for conn == nil, as 'err != nil' seems always to be // true, even if error value itself is `nil`. Checking for conn suppresses - // missleading log message. + // misleading log message. if conn == nil && err != nil { logp.Info("%v ICMP not supported: %v", name, err) return nil diff --git a/heartbeat/scripts/generator/README.md b/heartbeat/scripts/generator/README.md index 77f7bb4db94..f1b0b9aaec1 100644 --- a/heartbeat/scripts/generator/README.md +++ b/heartbeat/scripts/generator/README.md @@ -26,7 +26,7 @@ Monitor structure: monitoring jobs. - `_meta/fields.yml`: Document the monitors event field. - `_meta/config.yml`: Minimal sample configuration file -- `_meta/config.reference.yml`: Reference configuration file. All availalbe +- `_meta/config.reference.yml`: Reference configuration file. All available settings are documented in the reference file. Code comments tagged with `IMPLEMENT_ME` in the go and meta files give details diff --git a/libbeat/autodiscover/builder.go b/libbeat/autodiscover/builder.go index 1bf93755251..6569758a1f6 100644 --- a/libbeat/autodiscover/builder.go +++ b/libbeat/autodiscover/builder.go @@ -71,7 +71,7 @@ func (r *registry) GetBuilder(name string) BuilderConstructor { return r.builders[name] } -// BuildBuilder reads provider configuration and instatiate one +// BuildBuilder reads provider configuration and instantiate one func (r *registry) BuildBuilder(c *common.Config) (Builder, error) { var config BuilderConfig err := c.Unpack(&config) @@ -87,7 +87,7 @@ func (r *registry) BuildBuilder(c *common.Config) (Builder, error) { return builder(c) } -// GetConfig creates configs for all builders initalized. +// GetConfig creates configs for all builders initialized. func (b Builders) GetConfig(event bus.Event) []*common.Config { var configs []*common.Config diff --git a/libbeat/autodiscover/provider.go b/libbeat/autodiscover/provider.go index 27efcd92cc6..df1ba4d8435 100644 --- a/libbeat/autodiscover/provider.go +++ b/libbeat/autodiscover/provider.go @@ -67,7 +67,7 @@ func (r *registry) GetProvider(name string) ProviderBuilder { return r.providers[name] } -// BuildProvider reads provider configuration and instatiate one +// BuildProvider reads provider configuration and instantiate one func (r *registry) BuildProvider(bus bus.Bus, c *common.Config) (Provider, error) { var config ProviderConfig err := c.Unpack(&config) diff --git a/libbeat/common/fmtstr/formatevents.go b/libbeat/common/fmtstr/formatevents.go index da03776457f..de201e4a0c2 100644 --- a/libbeat/common/fmtstr/formatevents.go +++ b/libbeat/common/fmtstr/formatevents.go @@ -107,7 +107,7 @@ func releaseCtx(c *eventEvalContext) { eventCtxPool.Put(c) } -// MustCompileEvent copmiles an event format string into an runnable +// MustCompileEvent compiles an event format string into an runnable // EventFormatString. Generates a panic if compilation fails. func MustCompileEvent(in string) *EventFormatString { fs, err := CompileEvent(in) diff --git a/libbeat/common/fmtstr/formatstring.go b/libbeat/common/fmtstr/formatstring.go index 8ed1eb8eac9..1ded5c49a49 100644 --- a/libbeat/common/fmtstr/formatstring.go +++ b/libbeat/common/fmtstr/formatstring.go @@ -45,7 +45,7 @@ type StringFormatter interface { } // VariableOp defines one expansion variable, including operator and parameter. -// variable operations are always introduced by a collon ':'. +// variable operations are always introduced by a colon ':'. // For example the format string %{x:p1:?p2} has 2 variable operations // (":", "p1") and (":?", "p2"). It's up to concrete format string implementation // to compile and interpret variable ops. @@ -120,7 +120,7 @@ var ( // // Variable expansion are enclosed in expansion braces `%{}`. // The `` can contain additional parameters separated by ops -// introduced by collons ':'. For example the format string `%{value:v1:?v2}` +// introduced by colons ':'. For example the format string `%{value:v1:?v2}` // will be parsed into variable expansion on `value` with variable ops // `[(":", "v1"), (":?", "v2")]`. It's up to the variable compiler to interpret // content and variable ops. diff --git a/libbeat/common/kubernetes/watcher.go b/libbeat/common/kubernetes/watcher.go index 3129d0c8a97..a872541023c 100644 --- a/libbeat/common/kubernetes/watcher.go +++ b/libbeat/common/kubernetes/watcher.go @@ -209,7 +209,7 @@ func (w *watcher) watch() { logp.Err("kubernetes: Watching API error %v", err) watcher.Close() if !(err == io.EOF || err == io.ErrUnexpectedEOF) { - // This is an error event which can be recovered by moving to the latest resource verison + // This is an error event which can be recovered by moving to the latest resource version logp.Info("kubernetes: Ignoring event, moving to most recent resource version") w.lastResourceVersion = "" } diff --git a/libbeat/common/mapstr_pointer.go b/libbeat/common/mapstr_pointer.go index 714abc1f800..3129bfcd848 100644 --- a/libbeat/common/mapstr_pointer.go +++ b/libbeat/common/mapstr_pointer.go @@ -25,7 +25,7 @@ import ( // MapStrPointer stores a pointer to atomically get/set a MapStr object // This should give faster access for use cases with lots of reads and a few // changes. -// It's imortant to note that modifying the map is not thread safe, only fully +// It's important to note that modifying the map is not thread safe, only fully // replacing it. type MapStrPointer struct { p *unsafe.Pointer diff --git a/libbeat/common/schema/mapstrstr/mapstrstr_test.go b/libbeat/common/schema/mapstrstr/mapstrstr_test.go index d1815ff0847..240c7db77ec 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr_test.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr_test.go @@ -50,7 +50,7 @@ func TestConversions(t *testing.T) { "test_obj": s.Object{ "test_obj_string": Str("testObjString"), }, - "test_notexistant": Str("notexistant", s.Optional), + "test_nonexistent": Str("nonexistent", s.Optional), "test_error": Str("testError", s.Optional), "test_error_int": Int("testErrorInt", s.Optional), "test_error_float": Float("testErrorFloat", s.Optional), diff --git a/libbeat/common/terminal/terminal.go b/libbeat/common/terminal/terminal.go index 2579edc2991..0a670d7a7e6 100644 --- a/libbeat/common/terminal/terminal.go +++ b/libbeat/common/terminal/terminal.go @@ -36,7 +36,7 @@ func ReadInput() (string, error) { return strings.TrimSuffix(input, "\n"), nil } -// PromptYesNo Returns true if the user has enterred Y or YES, capitalization is ignored, we are +// PromptYesNo Returns true if the user has entered Y or YES, capitalization is ignored, we are // matching elasticsearch behavior func PromptYesNo(prompt string, defaultAnswer bool) bool { var defaultYNprompt string diff --git a/libbeat/common/transport/tlscommon/config.go b/libbeat/common/transport/tlscommon/config.go index 80530ed7503..b067746ffe4 100644 --- a/libbeat/common/transport/tlscommon/config.go +++ b/libbeat/common/transport/tlscommon/config.go @@ -91,7 +91,7 @@ func LoadTLSConfig(config *Config) (*TLSConfig, error) { }, nil } -// Validate valies the TLSConfig struct making sure certificate sure we have both a certificate and +// Validate values the TLSConfig struct making sure certificate sure we have both a certificate and // a key. func (c *Config) Validate() error { return c.Certificate.Validate() diff --git a/libbeat/common/transport/tlscommon/server_config.go b/libbeat/common/transport/tlscommon/server_config.go index c2d3e268401..11766be75be 100644 --- a/libbeat/common/transport/tlscommon/server_config.go +++ b/libbeat/common/transport/tlscommon/server_config.go @@ -89,7 +89,7 @@ func LoadTLSServerConfig(config *ServerConfig) (*TLSConfig, error) { }, nil } -// Validate valies the TLSConfig struct making sure certificate sure we have both a certificate and +// Validate values the TLSConfig struct making sure certificate sure we have both a certificate and // a key. func (c *ServerConfig) Validate() error { return c.Certificate.Validate() diff --git a/libbeat/common/transport/tlscommon/tls_config.go b/libbeat/common/transport/tlscommon/tls_config.go index f7bb14188c5..5fdf12babe2 100644 --- a/libbeat/common/transport/tlscommon/tls_config.go +++ b/libbeat/common/transport/tlscommon/tls_config.go @@ -66,7 +66,7 @@ type TLSConfig struct { ClientAuth tls.ClientAuthType } -// BuildModuleConfig takes the TLSConfig and tranform it into a `tls.Config`. +// BuildModuleConfig takes the TLSConfig and transform it into a `tls.Config`. func (c *TLSConfig) BuildModuleConfig(host string) *tls.Config { if c == nil { // use default TLS settings, if config is empty. diff --git a/libbeat/common/transport/tlscommon/tls_test.go b/libbeat/common/transport/tlscommon/tls_test.go index bad6e5dc17f..476ddc4d1b4 100644 --- a/libbeat/common/transport/tlscommon/tls_test.go +++ b/libbeat/common/transport/tlscommon/tls_test.go @@ -224,7 +224,7 @@ func TestCertificateFails(t *testing.T) { }, { "unknown version", - "supported_protocols: [UnknwonTLSv1.1]", + "supported_protocols: [UnknownTLSv1.1]", }, { "unknown curve type", diff --git a/libbeat/common/transport/tlscommon/types.go b/libbeat/common/transport/tlscommon/types.go index d8a58b8279f..c19f60b1f4c 100644 --- a/libbeat/common/transport/tlscommon/types.go +++ b/libbeat/common/transport/tlscommon/types.go @@ -178,7 +178,7 @@ func (m TLSVerificationMode) String() string { return "unknown" } -// Unpack unpacks the string into contants. +// Unpack unpacks the string into constants. func (m *TLSVerificationMode) Unpack(in interface{}) error { if in == nil { *m = VerifyFull @@ -235,7 +235,7 @@ func (cs tlsCipherSuite) String() string { if s, found := tlsCipherSuitesInverse[cs]; found { return s } - return "unkown" + return "unknown" } type tlsCurveType tls.CurveID diff --git a/libbeat/common/tuples.go b/libbeat/common/tuples.go index 9a31c72a605..096643619c0 100644 --- a/libbeat/common/tuples.go +++ b/libbeat/common/tuples.go @@ -58,12 +58,12 @@ func NewIPPortTuple(ipLength int, srcIP net.IP, srcPort uint16, DstPort: dstPort, }, } - tuple.ComputeHashebles() + tuple.ComputeHashables() return tuple } -func (t *IPPortTuple) ComputeHashebles() { +func (t *IPPortTuple) ComputeHashables() { copy(t.raw[0:16], t.SrcIP) copy(t.raw[16:18], []byte{byte(t.SrcPort >> 8), byte(t.SrcPort)}) copy(t.raw[18:34], t.DstIP) @@ -119,12 +119,12 @@ func TCPTupleFromIPPort(t *IPPortTuple, streamID uint32) TCPTuple { }, StreamID: streamID, } - tuple.ComputeHashebles() + tuple.ComputeHashables() return tuple } -func (t *TCPTuple) ComputeHashebles() { +func (t *TCPTuple) ComputeHashables() { copy(t.raw[0:16], t.SrcIP) copy(t.raw[16:18], []byte{byte(t.SrcPort >> 8), byte(t.SrcPort)}) copy(t.raw[18:34], t.DstIP) diff --git a/libbeat/docs/communitybeats.asciidoc b/libbeat/docs/communitybeats.asciidoc index e64e6c0dd8e..3a0551e31ae 100644 --- a/libbeat/docs/communitybeats.asciidoc +++ b/libbeat/docs/communitybeats.asciidoc @@ -13,7 +13,7 @@ Have a question about a community Beat? You can post questions and discuss issue https://discuss.elastic.co/c/beats/community-beats[Community Beats] category of the Beats discussion forum. Have you created a Beat that's not listed? Add the name and description of your Beat to the source document for -https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.asciidoc[Community Beats] and https://help.github.com/articles/using-pull-requests[open a pull request] in the https://github.com/elastic/beats[Beats GitHub repository] to get your change merged. When you're ready, go ahead and https://discuss.elastic.co/c/annoucements[announce] your new Beat in the Elastic +https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.asciidoc[Community Beats] and https://help.github.com/articles/using-pull-requests[open a pull request] in the https://github.com/elastic/beats[Beats GitHub repository] to get your change merged. When you're ready, go ahead and https://discuss.elastic.co/c/announcements[announce] your new Beat in the Elastic discussion forum. ifndef::dev-guide[] @@ -85,7 +85,7 @@ https://github.com/GoogleCloudPlatform/pubsubbeat[pubsubbeat]:: Reads data from https://github.com/voigt/redditbeat[redditbeat]:: Collects new Reddit Submissions of one or multiple Subreddits. https://github.com/chrsblck/redisbeat[redisbeat]:: Used for Redis monitoring. https://github.com/consulthys/retsbeat[retsbeat]:: Collects counts of http://www.reso.org[RETS] resource/class records from https://en.wikipedia.org/wiki/Multiple_listing_service[Multiple Listing Service] (MLS) servers. -https://github.com/yourdream/rsbeat[rsbeat]:: Ships redis slow logs to elasticsearch and anlyze by Kibana. +https://github.com/yourdream/rsbeat[rsbeat]:: Ships redis slow logs to elasticsearch and analyze by Kibana. https://github.com/martinhoefling/saltbeat[saltbeat]:: Reads events from salt master event bus. https://github.com/benben/serialbeat[serialbeat]:: Reads from a serial device. https://github.com/consulthys/springbeat[springbeat]:: Collects health and metrics data from Spring Boot applications running with the actuator module. diff --git a/libbeat/docs/config-file-format.asciidoc b/libbeat/docs/config-file-format.asciidoc index c4af4afe70f..6169f593c25 100644 --- a/libbeat/docs/config-file-format.asciidoc +++ b/libbeat/docs/config-file-format.asciidoc @@ -231,7 +231,7 @@ For example the filebeat registry file defaults to: filebeat.registry: $\{path.data}/registry ------------------------------------------------------------------------------ -With `path.data` being an implicit config setting, that is overwritable from +With `path.data` being an implicit config setting, that is overridable from command line, as well as in the configuration file. Example referencing `es.host` in `output.elasticsearch.hosts`: diff --git a/libbeat/docs/processors-using.asciidoc b/libbeat/docs/processors-using.asciidoc index 7aa2e7bd57f..9100918d24d 100644 --- a/libbeat/docs/processors-using.asciidoc +++ b/libbeat/docs/processors-using.asciidoc @@ -720,7 +720,7 @@ Indexers take in a pod's metadata and builds indices based on the pod metadata. For example, the `ip_port` indexer can take a Kubernetes pod and index the pod metadata based on all `pod_ip:container_port` combinations. -Matchers are used to contruct lookup keys for querying indices. For example, +Matchers are used to construct lookup keys for querying indices. For example, when the `fields` matcher takes `["metricset.host"]` as a lookup field, it would construct a lookup key with the value of the field `metricset.host`. @@ -857,7 +857,7 @@ processors: It has the following settings: -`netinfo.enabled`:: (Optional) Default false. Include IP adresses and MAC addresses as fields host.ip and host.mac +`netinfo.enabled`:: (Optional) Default false. Include IP addresses and MAC addresses as fields host.ip and host.mac The `add_host_metadata` processor annotates each event with relevant metadata from the host machine. The fields added to the event are looking as following: diff --git a/libbeat/docs/release-notes/5.0.0.asciidoc b/libbeat/docs/release-notes/5.0.0.asciidoc index 68169824bc8..60407ffa3c6 100644 --- a/libbeat/docs/release-notes/5.0.0.asciidoc +++ b/libbeat/docs/release-notes/5.0.0.asciidoc @@ -15,7 +15,7 @@ The list below covers changes between 1.x to 5.0.0 releases. - Remove deprecated `host` option from elasticsearch, logstash and redis outputs. {pull}1474[1474] - All configuration settings under `shipper:` are moved to be top level configuration settings. I.e. `shipper.name:` becomes `name:` in the configuration file. {pull}1570[1570] -- The `topology_expire` option of the Elasticserach output was removed. {pull}1907[1907] +- The `topology_expire` option of the Elasticsearch output was removed. {pull}1907[1907] - The Elasticsearch template is now loaded by default. {pull}1993[1993] - The Redis output `index` setting is renamed to `key`. `index` still works but it's deprecated. {pull}2077[2077] - The undocumented file output `index` setting was removed. Use `filename` instead. {pull}2077[2077] diff --git a/libbeat/docs/release-notes/6.0.0.asciidoc b/libbeat/docs/release-notes/6.0.0.asciidoc index 8f1e26ac1dd..dd4691e9093 100644 --- a/libbeat/docs/release-notes/6.0.0.asciidoc +++ b/libbeat/docs/release-notes/6.0.0.asciidoc @@ -108,7 +108,7 @@ upgrade. - Fixed `cmd_set` and `cmd_get` being mixed in the Memcache module. {pull}5189[5189] - Added missing mongodb configuration file to the `modules.d` folder. {pull}4870[4870] - Fix wrong MySQL CRUD queries timelion visualization {pull}4857[4857] -- Add new metrics to CPU metricsset {pull}4969[4969] +- Add new metrics to CPU metricset {pull}4969[4969] - Fix issue affecting Windows services timing out at startup. {pull}4491[4491] - Fix incorrect docker.diskio.total metric calculation. {pull}4507[4507] - Vsphere module: used memory field corrected. {issue}4461[4461] diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index 4b07e6a9e9a..6741c35ef74 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -184,7 +184,7 @@ In any case, this feature is controlled with two properties: * `discoveryEnabled`, to enable the feature * `discoveryAgentUrl`, if set, this is the URL announced by the agent when - being discovered, setting this parameter implicitely enables the feature + being discovered, setting this parameter implicitly enables the feature There are multiple ways of setting these properties, and they can vary from application to application, please refer to the documentation of your diff --git a/libbeat/docs/shared-ssl-config.asciidoc b/libbeat/docs/shared-ssl-config.asciidoc index 407a47fca26..6034a924826 100644 --- a/libbeat/docs/shared-ssl-config.asciidoc +++ b/libbeat/docs/shared-ssl-config.asciidoc @@ -200,7 +200,7 @@ are `none`, `optional`, and `required`. The default value is required. NOTE: This option is only valid with the TCP or the Syslog input. -* `none` - Disables client authentification. +* `none` - Disables client authentication. * `optional` - When a client certificate is given, the server will verify it. * `required` - Will require clients to provide a valid certificate. endif::[] diff --git a/libbeat/docs/upgrading.asciidoc b/libbeat/docs/upgrading.asciidoc index ffe67612e1a..3fa75bdce74 100644 --- a/libbeat/docs/upgrading.asciidoc +++ b/libbeat/docs/upgrading.asciidoc @@ -33,7 +33,7 @@ changes>> doc. // TODO: link to the stack upgrade docs // -// If you are planning an upgrade of the full stack (Elasticsearch, Kibama, or +// If you are planning an upgrade of the full stack (Elasticsearch, Kibana, or // Logstash, in addition to Beats), please read the stack upgrade guide. We recommend that you fully upgrade Elasticsearch and Kibana to version 6.0 diff --git a/libbeat/keystore/file_keystore.go b/libbeat/keystore/file_keystore.go index a7eb7f52613..0a7e03080a1 100644 --- a/libbeat/keystore/file_keystore.go +++ b/libbeat/keystore/file_keystore.go @@ -68,7 +68,7 @@ type serializableSecureString struct { // NewFileKeystore returns an new File based keystore or an error, currently users cannot set their // own password on the keystore, the default password will be an empty string. When the keystore -// is initialied the secrets are automatically loaded into memory. +// is initialized the secrets are automatically loaded into memory. func NewFileKeystore(keystoreFile string) (Keystore, error) { return NewFileKeystoreWithPassword(keystoreFile, NewSecureString([]byte(""))) } @@ -185,7 +185,7 @@ func (k *FileKeystore) IsPersisted() bool { return true } -// doSave lock/unlocking of the ressource need to be done by the caller. +// doSave lock/unlocking of the resource need to be done by the caller. func (k *FileKeystore) doSave(override bool) error { if k.dirty == false { return nil diff --git a/libbeat/kibana/index_pattern_generator_test.go b/libbeat/kibana/index_pattern_generator_test.go index 1a1b2ecf18d..3dd81157ede 100644 --- a/libbeat/kibana/index_pattern_generator_test.go +++ b/libbeat/kibana/index_pattern_generator_test.go @@ -37,7 +37,7 @@ func TestNewGenerator(t *testing.T) { v, _ := common.NewVersion("7.0.0") // checks for fields.yml - generator, err := NewGenerator("beat-index", "mybeat.", filepath.Join(beatDir, "notexistent"), "7.0", *v) + generator, err := NewGenerator("beat-index", "mybeat.", filepath.Join(beatDir, "nonexistent"), "7.0", *v) assert.Error(t, err) generator, err = NewGenerator("beat-index", "mybeat.", beatDir, "7.0", *v) diff --git a/libbeat/kibana/testdata/extensive/fields.yml b/libbeat/kibana/testdata/extensive/fields.yml index 4f513b0f8cf..b7c2f9d34d8 100644 --- a/libbeat/kibana/testdata/extensive/fields.yml +++ b/libbeat/kibana/testdata/extensive/fields.yml @@ -347,7 +347,7 @@ Namespace name - name: node.host type: keyword - desription: > + description: > Node host - name: node.name type: keyword @@ -5216,7 +5216,7 @@ - name: commands_processed type: long description: - Total number of commands preocessed. + Total number of commands processed. - name: net.input.bytes type: long diff --git a/libbeat/metric/system/cpu/cpu.go b/libbeat/metric/system/cpu/cpu.go index 0e9b69e5fc8..a78b93daadb 100644 --- a/libbeat/metric/system/cpu/cpu.go +++ b/libbeat/metric/system/cpu/cpu.go @@ -34,7 +34,7 @@ var ( // CPU Monitor -// Monitor is used to monitor the overal CPU usage of the system. +// Monitor is used to monitor the overall CPU usage of the system. type Monitor struct { lastSample *sigar.Cpu } diff --git a/libbeat/metric/system/process/process.go b/libbeat/metric/system/process/process.go index ccec88824fb..189b0964831 100644 --- a/libbeat/metric/system/process/process.go +++ b/libbeat/metric/system/process/process.go @@ -362,7 +362,7 @@ func (procStats *Stats) matchProcess(name string) bool { return false } -// Init initizalizes a Stats instance. It returns erros if the provided process regexes +// Init initializes a Stats instance. It returns errors if the provided process regexes // cannot be compiled. func (procStats *Stats) Init() error { procStats.ProcsMap = make(ProcsMap) diff --git a/libbeat/monitoring/registry.go b/libbeat/monitoring/registry.go index 5eb9c860097..5a0c0b633bc 100644 --- a/libbeat/monitoring/registry.go +++ b/libbeat/monitoring/registry.go @@ -58,7 +58,7 @@ func (r *Registry) Do(mode Mode, f func(string, interface{})) { r.doVisit(mode, NewKeyValueVisitor(f)) } -// Visit uses the Visitor interface to iterate the complete metrics hieararchie. +// Visit uses the Visitor interface to iterate the complete metrics hierarchies. // In case of the visitor reporting an error, Visit will return immediately, // reporting the very same error. func (r *Registry) Visit(mode Mode, vs Visitor) { diff --git a/libbeat/monitoring/visitor_expvar.go b/libbeat/monitoring/visitor_expvar.go index 130de4bd920..fea0cfb97e2 100644 --- a/libbeat/monitoring/visitor_expvar.go +++ b/libbeat/monitoring/visitor_expvar.go @@ -76,7 +76,7 @@ func makeExparVisitor(level int, vs Visitor) func(expvar.KeyValue) { } // ignore if `monitoring` variable or some other internals -// autmoatically registered by expvar against our wishes +// automatically registered by expvar against our wishes func ignoreExpvar(level int, kv expvar.KeyValue) bool { switch kv.Value.(type) { case makeExpvar, Var: diff --git a/libbeat/outputs/codec/json/json.go b/libbeat/outputs/codec/json/json.go index 15913f51423..3f0433aa676 100644 --- a/libbeat/outputs/codec/json/json.go +++ b/libbeat/outputs/codec/json/json.go @@ -89,7 +89,7 @@ func (e *Encoder) reset() { } } -// Encode serializies a beat event to JSON. It adds additional metadata in the +// Encode serializes a beat event to JSON. It adds additional metadata in the // `@metadata` namespace. func (e *Encoder) Encode(index string, event *beat.Event) ([]byte, error) { e.buf.Reset() diff --git a/libbeat/outputs/elasticsearch/client.go b/libbeat/outputs/elasticsearch/client.go index 9e7a3b0a680..5e822f9df17 100644 --- a/libbeat/outputs/elasticsearch/client.go +++ b/libbeat/outputs/elasticsearch/client.go @@ -463,7 +463,7 @@ func bulkCollectPublishFails( data []publisher.Event, ) ([]publisher.Event, bulkResultStats) { if err := reader.expectDict(); err != nil { - logp.Err("Failed to parse bulk respose: expected JSON object") + logp.Err("Failed to parse bulk response: expected JSON object") return nil, bulkResultStats{} } @@ -490,7 +490,7 @@ func bulkCollectPublishFails( // check items field is an array if err := reader.expectArray(); err != nil { - logp.Err("Failed to parse bulk respose: expected items array") + logp.Err("Failed to parse bulk response: expected items array") return nil, bulkResultStats{} } diff --git a/libbeat/outputs/logstash/logstash_integration_test.go b/libbeat/outputs/logstash/logstash_integration_test.go index c96ed6dc2be..ba00c59de13 100644 --- a/libbeat/outputs/logstash/logstash_integration_test.go +++ b/libbeat/outputs/logstash/logstash_integration_test.go @@ -58,17 +58,17 @@ type testOutputer struct { *esConnection } -type esSoure interface { +type esSource interface { RefreshIndex() } type esValueReader interface { - esSoure + esSource Read() ([]map[string]interface{}, error) } type esCountReader interface { - esSoure + esSource Count() (int, error) } diff --git a/libbeat/outputs/metrics.go b/libbeat/outputs/metrics.go index 099e04bf778..43dbf5da459 100644 --- a/libbeat/outputs/metrics.go +++ b/libbeat/outputs/metrics.go @@ -90,7 +90,7 @@ func (s *Stats) Failed(n int) { } } -// Duplicate updats the active and duplicate event metrics. +// Duplicate updates the active and duplicate event metrics. func (s *Stats) Duplicate(n int) { if s != nil { s.duplicates.Add(uint64(n)) @@ -100,7 +100,7 @@ func (s *Stats) Duplicate(n int) { // Dropped updates total number of event drops as reported by the output. // Outputs will only report dropped events on fatal errors which lead to the -// event not being publishabel. For example encoding errors or total event size +// event not being publishable. For example encoding errors or total event size // being bigger then maximum supported event size. func (s *Stats) Dropped(n int) { // number of dropped events (e.g. encoding failures) diff --git a/libbeat/outputs/transport/util.go b/libbeat/outputs/transport/util.go index bc9c6f75150..b86bf46df07 100644 --- a/libbeat/outputs/transport/util.go +++ b/libbeat/outputs/transport/util.go @@ -65,7 +65,7 @@ func DialWith( // // https://tools.ietf.org/html/rfc1794 // > "Clients, of course, may reorder this information" - with respect to - // > handling order of dns records in a response.orwarded. Really required? + // > handling order of dns records in a response.forwarded. Really required? for _, i := range rand.Perm(len(addresses)) { c, err = dialer.Dial(network, net.JoinHostPort(addresses[i], port)) if err == nil && c != nil { diff --git a/libbeat/processors/dissect/delimiter.go b/libbeat/processors/dissect/delimiter.go index 197c354815b..b4ec8d25541 100644 --- a/libbeat/processors/dissect/delimiter.go +++ b/libbeat/processors/dissect/delimiter.go @@ -38,7 +38,7 @@ type delimiter interface { // Delimiter returns the actual delimiter string. Delimiter() string - // IsGreedy return true if the next key should be greedy (end of string) or when explicitely + // IsGreedy return true if the next key should be greedy (end of string) or when explicitly // configured. IsGreedy() bool diff --git a/libbeat/processors/dissect/dissect_test.go b/libbeat/processors/dissect/dissect_test.go index ada1dd0f52b..13ec3636cd6 100644 --- a/libbeat/processors/dissect/dissect_test.go +++ b/libbeat/processors/dissect/dissect_test.go @@ -295,7 +295,7 @@ func BenchmarkDissect(b *testing.B) { }) } - // Add a few regular expression matches agains the same string the test suite, + // Add a few regular expression matches against the same string the test suite, // this give us a baseline to compare to, note that we only test a raw match against the string. b.Run("Regular expression", func(b *testing.B) { re := regexp.MustCompile("/var/log/([a-z]+)/log/([a-z]+)/apache/([a-b]+)") diff --git a/libbeat/publisher/pipeline/config.go b/libbeat/publisher/pipeline/config.go index 6aa1de54575..0a0c2924a08 100644 --- a/libbeat/publisher/pipeline/config.go +++ b/libbeat/publisher/pipeline/config.go @@ -45,7 +45,7 @@ func validateClientConfig(c *beat.ClientConfig) error { case beat.DropIfFull: withDrop = true default: - return fmt.Errorf("unknown publishe mode %v", m) + return fmt.Errorf("unknown publish mode %v", m) } fnCount := 0 diff --git a/libbeat/publisher/pipeline/pipeline.go b/libbeat/publisher/pipeline/pipeline.go index 9fd41fd01d3..ef727ebeb73 100644 --- a/libbeat/publisher/pipeline/pipeline.go +++ b/libbeat/publisher/pipeline/pipeline.go @@ -39,7 +39,7 @@ import ( // Pipeline implementation providint all beats publisher functionality. // The pipeline consists of clients, processors, a central queue, an output // controller and the actual outputs. -// The queue implementing the queue.Queue interface is the most entral entity +// The queue implementing the queue.Queue interface is the most central entity // to the pipeline, providing support for pushung, batching and pulling events. // The pipeline adds different ACKing strategies and wait close support on top // of the queue. For handling ACKs, the pipeline keeps track of filtered out events, diff --git a/libbeat/publisher/pipeline/pipeline_ack.go b/libbeat/publisher/pipeline/pipeline_ack.go index d0cea240c0b..b9be8c42e49 100644 --- a/libbeat/publisher/pipeline/pipeline_ack.go +++ b/libbeat/publisher/pipeline/pipeline_ack.go @@ -249,7 +249,7 @@ func (p *pipelineEventCB) worker() { return } - // short circuite dropped events, but have client block until all events + // short circuit dropped events, but have client block until all events // have been processed by pipeline ack handler case msg := <-p.droppedEvents: p.reportEventsData(msg.data, msg.total) diff --git a/libbeat/publisher/queue/memqueue/ackloop.go b/libbeat/publisher/queue/memqueue/ackloop.go index 1fbd4d09573..5c79dab38db 100644 --- a/libbeat/publisher/queue/memqueue/ackloop.go +++ b/libbeat/publisher/queue/memqueue/ackloop.go @@ -49,7 +49,7 @@ func (l *ackLoop) run() { // Buffer up acked event counter in acked. If acked > 0, acks will be set to // the broker.acks channel for sending the ACKs while potentially receiving // new batches from the broker event loop. - // This concurrent bidirectionaly communication pattern requiring 'select' + // This concurrent bidirectionally communication pattern requiring 'select' // ensures we can not have any deadlock between the event loop and the ack // loop, as the ack loop will not block on any channel acked int diff --git a/libbeat/publisher/queue/memqueue/broker.go b/libbeat/publisher/queue/memqueue/broker.go index d3103f060f1..66bf1621371 100644 --- a/libbeat/publisher/queue/memqueue/broker.go +++ b/libbeat/publisher/queue/memqueue/broker.go @@ -101,7 +101,7 @@ func create(eventer queue.Eventer, cfg *common.Config) (queue.Queue, error) { func NewBroker( settings Settings, ) *Broker { - // define internal channel size for procuder/client requests + // define internal channel size for producer/client requests // to the broker chanSize := 20 diff --git a/libbeat/publisher/queue/memqueue/eventloop.go b/libbeat/publisher/queue/memqueue/eventloop.go index 9c01bd3d605..79769da504d 100644 --- a/libbeat/publisher/queue/memqueue/eventloop.go +++ b/libbeat/publisher/queue/memqueue/eventloop.go @@ -104,7 +104,7 @@ func (l *directEventLoop) run() { case req := <-l.events: // producer pushing new event l.handleInsert(&req) - case req := <-l.pubCancel: // producer cancellig active events + case req := <-l.pubCancel: // producer cancelling active events l.handleCancel(&req) case req := <-l.get: // consumer asking for next batch diff --git a/libbeat/publisher/queue/memqueue/produce.go b/libbeat/publisher/queue/memqueue/produce.go index ee841ec1a28..1409ea9941f 100644 --- a/libbeat/publisher/queue/memqueue/produce.go +++ b/libbeat/publisher/queue/memqueue/produce.go @@ -24,7 +24,7 @@ import ( "github.com/elastic/beats/libbeat/publisher/queue" ) -type forgetfullProducer struct { +type forgetfulProducer struct { broker *Broker openState openState } @@ -67,22 +67,22 @@ func newProducer(b *Broker, cb ackHandler, dropCB func(beat.Event), dropOnCancel p.state.dropCB = dropCB return p } - return &forgetfullProducer{broker: b, openState: openState} + return &forgetfulProducer{broker: b, openState: openState} } -func (p *forgetfullProducer) Publish(event publisher.Event) bool { +func (p *forgetfulProducer) Publish(event publisher.Event) bool { return p.openState.publish(p.makeRequest(event)) } -func (p *forgetfullProducer) TryPublish(event publisher.Event) bool { +func (p *forgetfulProducer) TryPublish(event publisher.Event) bool { return p.openState.tryPublish(p.makeRequest(event)) } -func (p *forgetfullProducer) makeRequest(event publisher.Event) pushRequest { +func (p *forgetfulProducer) makeRequest(event publisher.Event) pushRequest { return pushRequest{event: event} } -func (p *forgetfullProducer) Cancel() int { +func (p *forgetfulProducer) Cancel() int { p.openState.Close() return 0 } diff --git a/libbeat/publisher/queue/spool/inbroker.go b/libbeat/publisher/queue/spool/inbroker.go index a7472ab38ad..441aac3fcc1 100644 --- a/libbeat/publisher/queue/spool/inbroker.go +++ b/libbeat/publisher/queue/spool/inbroker.go @@ -410,8 +410,8 @@ func (b *inBroker) stateWithTimer() bool { // ignored in the future. // // stateBlocked transitions: -// -> stateEmpty if flush was successfull and write buffer is empty -// -> stateWithTimer if flush was successfull, but we still have some pending events +// -> stateEmpty if flush was successful and write buffer is empty +// -> stateWithTimer if flush was successful, but we still have some pending events // -> stateBlocked if flush failed (still not enough space) func (b *inBroker) stateBlocked() bool { log := b.ctx.logger diff --git a/libbeat/publisher/queue/spool/produce.go b/libbeat/publisher/queue/spool/produce.go index 04cdbfdc2fe..fb2efb8d584 100644 --- a/libbeat/publisher/queue/spool/produce.go +++ b/libbeat/publisher/queue/spool/produce.go @@ -26,9 +26,9 @@ import ( "github.com/elastic/beats/libbeat/publisher/queue" ) -// forgetfullProducer forwards event to the inBroker. The forgetfullProducer +// forgetfulProducer forwards event to the inBroker. The forgetfulProducer // provides no event ACK handling and no callbacks. -type forgetfullProducer struct { +type forgetfulProducer struct { openState openState } @@ -89,7 +89,7 @@ func newProducer( } if ackCB == nil { - return &forgetfullProducer{openState: openState} + return &forgetfulProducer{openState: openState} } p := &ackProducer{ @@ -103,19 +103,19 @@ func newProducer( return p } -func (p *forgetfullProducer) Publish(event publisher.Event) bool { +func (p *forgetfulProducer) Publish(event publisher.Event) bool { return p.openState.publish(p.makeRequest(event)) } -func (p *forgetfullProducer) TryPublish(event publisher.Event) bool { +func (p *forgetfulProducer) TryPublish(event publisher.Event) bool { return p.openState.tryPublish(p.makeRequest(event)) } -func (p *forgetfullProducer) makeRequest(event publisher.Event) pushRequest { +func (p *forgetfulProducer) makeRequest(event publisher.Event) pushRequest { return pushRequest{event: event} } -func (p *forgetfullProducer) Cancel() int { +func (p *forgetfulProducer) Cancel() int { p.openState.Close() return 0 } diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index 729a7e123dd..d2b109cbcbb 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -161,7 +161,7 @@ ci: ## @build Shortcut for continuous integration. This should always run befor ### Testing ### # Unless stated otherwise, all tests are always run with coverage reporting enabled. -# Prepration for tests +# Preparation for tests .PHONY: prepare-tests prepare-tests: mkdir -p ${COVERAGE_DIR} diff --git a/libbeat/scripts/cmd/global_fields/main.go b/libbeat/scripts/cmd/global_fields/main.go index 60cd12f4609..8bd5b691506 100644 --- a/libbeat/scripts/cmd/global_fields/main.go +++ b/libbeat/scripts/cmd/global_fields/main.go @@ -36,7 +36,7 @@ func main() { err := os.MkdirAll(filepath.Join(*beatPath, "_meta"), 0744) if err != nil { - fmt.Printf("Cannot creata _meta dir for %s: %v\n", name, err) + fmt.Printf("Cannot create _meta dir for %s: %v\n", name, err) os.Exit(1) } diff --git a/libbeat/scripts/generate_makefile_doc.py b/libbeat/scripts/generate_makefile_doc.py index 55fa066e8f4..5c53d399bcf 100644 --- a/libbeat/scripts/generate_makefile_doc.py +++ b/libbeat/scripts/generate_makefile_doc.py @@ -31,7 +31,7 @@ r'^((?P(-|_|\w)+)|(\${(?P(-|_|\w)+)}))\s*:.*\#\#+\s*@(?P(\w+))\s+(?P(.*))') -# Parse a Makefile variable assignement: +# Parse a Makefile variable assignment: # # Example 1: # BEAT_LICENSE?=ASL 2.0 ## @packaging Software license of the application @@ -54,7 +54,7 @@ # Parse a Makefile line according to the given regexp # - insert the dict { name, default, is_variable, category, doc} to the categories dictionary # - insert the category to the categories_set -# - return a pair [name, value] if the line is a Makefile variable assignement +# - return a pair [name, value] if the line is a Makefile variable assignment def parse_line(line, regexp, categories, categories_set): matches = regexp.match(line) variable = None diff --git a/libbeat/template/load.go b/libbeat/template/load.go index f063def8f12..157e2c7e915 100644 --- a/libbeat/template/load.go +++ b/libbeat/template/load.go @@ -122,7 +122,7 @@ func (l *Loader) Load() error { err = l.LoadTemplate(templateName, template) if err != nil { - return fmt.Errorf("could not load template. Elasticsearh returned: %v. Template is: %s", err, template) + return fmt.Errorf("could not load template. Elasticsearch returned: %v. Template is: %s", err, template) } } else { diff --git a/metricbeat/autodiscover/autodiscover.go b/metricbeat/autodiscover/autodiscover.go index ea503669f58..95344f9049f 100644 --- a/metricbeat/autodiscover/autodiscover.go +++ b/metricbeat/autodiscover/autodiscover.go @@ -49,7 +49,7 @@ func (m *AutodiscoverAdapter) CreateConfig(e bus.Event) ([]*common.Config, error // CheckConfig tests given config to check if it will work or not, returns errors in case it won't work func (m *AutodiscoverAdapter) CheckConfig(c *common.Config) error { - // TODO implment config check for all modules + // TODO implement config check for all modules return nil } diff --git a/metricbeat/autodiscover/builder/hints/metrics_test.go b/metricbeat/autodiscover/builder/hints/metrics_test.go index fd402ed5360..00019f0cbc2 100644 --- a/metricbeat/autodiscover/builder/hints/metrics_test.go +++ b/metricbeat/autodiscover/builder/hints/metrics_test.go @@ -247,7 +247,7 @@ func TestGenerateHints(t *testing.T) { err := cfgs[0].Unpack(&config) assert.Nil(t, err, test.message) - // metricests order is random, order it for tests + // metricsets order is random, order it for tests if v, err := config.GetValue("metricsets"); err == nil { if msets, ok := v.([]interface{}); ok { metricsets := make([]string, len(msets)) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index e4f68c7c020..48e9bbe0c39 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -359,6 +359,9 @@ Namespace name -- type: keyword +Node host + + -- *`aerospike.namespace.node.name`*:: @@ -4348,7 +4351,7 @@ number of append requests this node has processed -- -*`etcd.self.recv.bandwithrate`*:: +*`etcd.self.recv.bandwidthrate`*:: + -- type: scaled_float @@ -4378,7 +4381,7 @@ number of requests that this node has sent -- -*`etcd.self.send.bandwithrate`*:: +*`etcd.self.send.bandwidthrate`*:: + -- type: scaled_float @@ -6772,7 +6775,7 @@ Total number of client disconnects encountered by the server. -- type: long -Number of client connections made to the server. Note that browsers can send multiple simultaneous connections to request mulitple server assets at once, and they can re-use established connections. +Number of client connections made to the server. Note that browsers can send multiple simultaneous connections to request multiple server assets at once, and they can re-use established connections. -- @@ -7113,7 +7116,7 @@ Request latency, number of requests -- type: object -Request latency histagram buckets +Request latency histogram buckets -- @@ -13681,7 +13684,7 @@ Total number of connections rejected. -- type: long -Total number of commands preocessed. +Total number of commands processed. -- diff --git a/metricbeat/docs/modules/aerospike.asciidoc b/metricbeat/docs/modules/aerospike.asciidoc index 638ab23667a..b1115a86014 100644 --- a/metricbeat/docs/modules/aerospike.asciidoc +++ b/metricbeat/docs/modules/aerospike.asciidoc @@ -12,7 +12,7 @@ The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info [float] === Compatibility -The Aeropsike metricsets were tested with Aerospike 3.9 and are expected to work with all versions >= 3.9. +The Aerospike metricsets were tested with Aerospike 3.9 and are expected to work with all versions >= 3.9. [float] diff --git a/metricbeat/docs/modules/http.asciidoc b/metricbeat/docs/modules/http.asciidoc index eccfe520782..58eb7cb301f 100644 --- a/metricbeat/docs/modules/http.asciidoc +++ b/metricbeat/docs/modules/http.asciidoc @@ -13,7 +13,7 @@ This module is inspired by the Logstash https://www.elastic.co/guide/en/logstash This is often necessary in security restricted network setups, where Logstash is not able to reach all servers. Instead the server to be monitored itself has Metricbeat installed and can send the data or a collector server has Metricbeat installed which is deployed in the secured network environment and can reach all servers to be monitored. -NOTE: As the HTTP mertricsets also fetch headers, this can lead to lots of fields in Elasticsearch in case there are many different headers. If this is the case for you and you don't need the headers, we recommend to use processors to filter out the header field. +NOTE: As the HTTP metricsets also fetch headers, this can lead to lots of fields in Elasticsearch in case there are many different headers. If this is the case for you and you don't need the headers, we recommend to use processors to filter out the header field. [float] diff --git a/metricbeat/docs/setting-up-running.asciidoc b/metricbeat/docs/setting-up-running.asciidoc index b8a180aaed9..fafad81168c 100644 --- a/metricbeat/docs/setting-up-running.asciidoc +++ b/metricbeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the @@ -22,7 +22,7 @@ This section includes additional information on how to set up and run * <> -//MAINTAINERS: If you add a new file to this section, make sure you update the bulletedl ist ^^ too. +//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too. include::../../libbeat/docs/shared-directory-layout.asciidoc[] diff --git a/metricbeat/module/aerospike/_meta/docs.asciidoc b/metricbeat/module/aerospike/_meta/docs.asciidoc index 3cbf6660edf..7ec7e96dc34 100644 --- a/metricbeat/module/aerospike/_meta/docs.asciidoc +++ b/metricbeat/module/aerospike/_meta/docs.asciidoc @@ -3,4 +3,4 @@ The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info [float] === Compatibility -The Aeropsike metricsets were tested with Aerospike 3.9 and are expected to work with all versions >= 3.9. +The Aerospike metricsets were tested with Aerospike 3.9 and are expected to work with all versions >= 3.9. diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go index b7bedabae98..8ceb6d37b42 100644 --- a/metricbeat/module/aerospike/fields.go +++ b/metricbeat/module/aerospike/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzUmM2O4zYMx+95CmIve2nyADkUWLSXHnZRFL0VxYCR6FgdWTQkalIDffhCdjzj2LKT+dgdjw45WBb5/8mkRGYL99TsAclzqM09bQDEiKU9fPrSP/u0AdAUlDe1GHZ7+HkDAPA4DxXraNNST5Yw0B4OJLgBKAxZHfbt61twWNGlqzSkqWkPR8+xPj/J+Lo0NTSXfkONih5nciZnzXYjZ2TM0o+xkKEYZQ05uZiaU3NFURq/tNYgCErYjWZzKoZKNFkSmkwvqblB0UBV5wDEowuo0oKQV7qkdqiYvGeffaMXbdkdZ164QXca32J1IA9cnL9UlkJKFCjQWNJwMlICuk5cjmwQiCx3BUenV8PgKUQrpME4wKQPWn3LGCEqRSH8MIizvyLaBZ5lyWIq4jhOu+8n+dq+Jz0aOMpUdi/ZE+bi5K2SM5n/6Kk5ZuhUXAmFd0vCidpJBn6Y/JsEzyqzL7/hN6TeyZvvejG29j968mUgXngtvn88T1lWGdBzWz4T0k+F3oNR43h+ccn5qwn3EIQ9HqkL22fWnfiAxuLB0q5WuS3slAWFlvRdYRlzLxXsK5Q91OTVtJ6+ASONr4Qhekq7SFAZZ6pYgWIn5hg5BtAtair6AZXnEACtbZ+Gc8HUNwXzZ0nh6f1Bf+8Wpy/GRYelsEZlpGkFJi8gpQm3EAkL2t2hEcql7GLw9zBzi29A+TN57ww8spw/kbWsMF2lwiMYaA//9IT1AlkMpFcIlmTBobmdqecpT9XdwROqksbVTkdzYLaE7nkHwG8FiI/006C7LzFA7wg+l+ZYbk8o5Ld/JYz/KqrYN39vayWfr4ZaL75b9Fan1tfW2uW59dyGeYWp3G3S1WR+TvxrFHy3JPhScXQyIGOlYm26+E/KXglnnKZ/10mX7qBW3isRw4oZAyl2Gn3TkVJ4JeuqrqIz74tP6/SbPe7uqTmxH5/gVwR+e/Q8sfvUCWvalRzy/0bOel1yyppgYvHC3xtTJoezgHz4h9SkPn3xHfIHKfZ6ple7dnlUGIRyTdpilN4QhU9dgj/rG4YanEqjSkCfSlgxD3QWkmlwLuq7HyLUuHGWPB0Hs2kShOu7thPKf9jX1DRjOSaAit6TE9u0/86kGvNk3LFrxcJu838AAAD//xAjXBQ=" + return "eJzUmMGO4zYMhu95CmIve2nyADkUWLSXHnZRFL0VxYCR6FgdWTQkalIDffhCdjzj2HKSycxuPDrkYFnk/8mkRGYNj9RsAclzqM0jrQDEiKUtfPrSP/u0AtAUlDe1GHZb+HkFAPA8DxXraNNST5Yw0BZ2JLgCKAxZHbbt62twWNGpqzSkqWkLe8+xPj7J+Do1NTSXfkONip5nciZnzXYjZ2TM0o+xkKEYZQ05OZmaU3NBURq/tNYgCErYjGZzKoZKNFkSmkyfU3OFooGqzgGIRxdQpQUhr/Sc2qFi8p599o1etGW3n3nhCt1pfIvVjjxwcfxSWQopUaBAY0nDwUgJ6DpxObJBILI8FBydXgyDpxCtkAbjAJM+aPWdxwhRKQrhh0Ec/RXRnuE5L1lMRRzHaff9JF/a96RHA0eZyu4le8JcnLxXcibzHz01xwydiguhcLcknKidZOCHyb9J8Cwy+/IbfkXqHbz5rhdja/+jJ18G4sZr8f7xPGVZZEDPbflMSL8Uek9GjeP55pLzVxMeIQh73FMXtq+sO/EJjcWdpU2tclvYKQsKLemHwjLmXirYVyhbqMmraT19BUYaXwlD9JR2kaAyzlSxAsVOzD5yDKBb1FT0AyrPIQBa2z4Nx4Kpbwrmz5LC0/1Bf+8Wpy/GRYelsEZlpGkFJi8gpQnXEAkL2s2uEcql7Nng72HmFl+B8mfy3hl4Zjl+ImtZYbpKhUcw0B7+6QnrM2QxkF4gWJIFu+Z6pp6nPFQPO0+oShpXOx3NjtkSutcdAL8VID7ST4PuvsQAvSP4XJp9uT6gkF//lTD+q6hi3/y9rpV8vhhqvfhu0XudWl9ba6fn1msb5gWmcrdJF5P5NfGvUfBuSfCl4uhkQMZKxdp08Z+UvRHOOE3/LpMu3UGtvDcihgUzBlLsNPqmI6XwRtZFXUVH3ptP6/SbPe4eqTmwH5/gFwR+e/Y8sfvSCWvalBzy/0be5pU1wcTkicN3xkwOZwl59w+pSYF68yXyByn2eqZZu3R7VBiEcl3a2TC9Igxf2gR/1DeMNTiURpWAPtWwYp7oKCTT4ZwUeD9EqHHjNHk5D2bzJAjXD20rlP+wbylqxnJMABW9Jye2af+eSUXmwbh914uFzer/AAAA///Vf1x3" } diff --git a/metricbeat/module/aerospike/namespace/_meta/fields.yml b/metricbeat/module/aerospike/namespace/_meta/fields.yml index f9f094cdb82..c5540beece0 100644 --- a/metricbeat/module/aerospike/namespace/_meta/fields.yml +++ b/metricbeat/module/aerospike/namespace/_meta/fields.yml @@ -133,7 +133,7 @@ Namespace name - name: node.host type: keyword - desription: > + description: > Node host - name: node.name type: keyword diff --git a/metricbeat/module/doc.go b/metricbeat/module/doc.go index 06fd71bab48..0fbba0a9ba9 100644 --- a/metricbeat/module/doc.go +++ b/metricbeat/module/doc.go @@ -47,7 +47,7 @@ List of standardised words and units across all metricsets. On the left are the * count: * day: days, d * der: derivative -* max: maximumg +* max: maximum * min: minimum * pct: percentage * request: req diff --git a/metricbeat/module/docker/healthcheck/data.go b/metricbeat/module/docker/healthcheck/data.go index bf75063596c..0b745827600 100644 --- a/metricbeat/module/docker/healthcheck/data.go +++ b/metricbeat/module/docker/healthcheck/data.go @@ -47,7 +47,7 @@ func eventMapping(cont *types.Container, m *MetricSet) common.MapStr { container, err := m.dockerClient.ContainerInspect(context.TODO(), cont.ID) if err != nil { - logp.Err("Error inpsecting container %v: %v", cont.ID, err) + logp.Err("Error inspecting container %v: %v", cont.ID, err) return nil } lastEvent := len(container.State.Health.Log) - 1 diff --git a/metricbeat/module/elasticsearch/node/_meta/test/invalid.json b/metricbeat/module/elasticsearch/node/_meta/test/invalid.json index 4847a231747..a5e5ac07a77 100644 --- a/metricbeat/module/elasticsearch/node/_meta/test/invalid.json +++ b/metricbeat/module/elasticsearch/node/_meta/test/invalid.json @@ -172,7 +172,7 @@ { "name" : "ingest-geoip", "version" : "5.2.2", - "description" : "Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database", + "description" : "Ingest processor that uses looksup geo data based on ip addresses using the Maxmind geo database", "classname" : "org.elasticsearch.ingest.geoip.IngestGeoIpPlugin" }, { diff --git a/metricbeat/module/elasticsearch/node/_meta/test/node.522.json b/metricbeat/module/elasticsearch/node/_meta/test/node.522.json index 78eb3e89522..2f43ce30d61 100644 --- a/metricbeat/module/elasticsearch/node/_meta/test/node.522.json +++ b/metricbeat/module/elasticsearch/node/_meta/test/node.522.json @@ -200,7 +200,7 @@ { "name" : "ingest-geoip", "version" : "5.2.2", - "description" : "Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database", + "description" : "Ingest processor that uses looksup geo data based on ip addresses using the Maxmind geo database", "classname" : "org.elasticsearch.ingest.geoip.IngestGeoIpPlugin" }, { diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index 0c267d24106..fcc5d49cf0b 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -230,7 +230,7 @@ func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, content []byte) { } // Hard coded index prefix for monitoring, no detection done for ES version at the moment - // It has an additonal md in the name to make it clear the data is coming from metricbeat + // It has an additional md in the name to make it clear the data is coming from metricbeat event.Index = ".monitoring-es-6-mb" r.Event(event) } diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go index d1062b61b70..13d329406d8 100644 --- a/metricbeat/module/etcd/fields.go +++ b/metricbeat/module/etcd/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzMl8+O2zYQxu9+isFe2h7iB/ChlzTHAkWQW1E0Y/KTRSxFKuTQjt++oCx5LZvyn5WDhofFQuZ885shORx+oFfsVwRRekEkRixW9PJJlH5ZEGlEFUwrxrsV/b4gom4m/el1slgQBVhwxIrWEF4QRYgYt4kr+vslRvvyz4KoMrA6rjrrD+S4wdFfHrJvsaJN8KntvxS85vE1G30l5Z2wcZGisJgoRkWSmoV2CKAA1lQF39CnNxenBKcUFqwRjp9LLFd48vg4wHRpOeidgC1PJp+nahjncKeAlbfW7xDiUvnkJI4mTeHeQM7jSw1yqVkjkK+oYmOhiZ2mmJRCjFWy9Jkroc9/faSAbwlRRsFMgV+DX/biFwZDIMYJNqP1uCGYwe9Wu/ynrG1Z4NT+WammXo/EE1jV1AKBjCOpQcqmKBcR35/YXnvJWwTeYDIXUbGF/reynuUBWZVCgLu0mCnb8HfTpObpssZdlb13ex0Fo7DTHPQf2BrO6/s48WSlebN9xX7ng77cnoNthK2eV6Oy2hMrlNF3BXUTMlvWoOTMtwQyGk5MZRCo8qH7pUEuV9cP8SHLxlV++UDC72Ejo3Ol7M7s4VAMxf6MawInCgcR05wf0WmigkhqH1J4WkxFrvz3eShSm9i7/SWOtYveA9R2yW0Lp/vr6XAnFInKB/8G0dv1eHBzvAYPrM5rUM2R2uDzpYby6nWca3Z6Z6QOLOWUXSl4d1Ou94JIbW4/oLzTJ5gmZg6YrXEb+nUoc+Sd3f82Td2+bn4o8DGf72cuwkc4/WO3RimIrgMd74x4fnWOCH+CTZE5uvT2x75L7pK+5DlbtqmblJxGZRw0eUfRuI0davHQvZw1hqMo//dN9PwYy8E+XN/vKImgrEi7Gu4kqB3HgzsUeoYzponMv4sHRmqE4Yrw4dgvXTYs4gPmdCz5edKJnL7xjFM25UV1lQ9N148Rr32SLlO+Rei+FY9izU5b6LnNzgaTr5jpcjIyLrxYbrxWRomd4z/O969hIXg3QW8+jyG1mmcw9ObzGFTAHIbefCaDb1oOYKfjjtv3s4xlnsU0c6dcCD3OVdTF99YEPNAPFFV2LKpGuB7WfwEAAP//vh0sYw==" + return "eJzMl8+O2zYQxu9+isFe2h7iB/ChlzTHAkWQW1E0Y/KTRSxFKuTQjt++oCx5LZvyn5WDhofFQuZ885shORx+oFfsVwRRekEkRixW9PJJlH5ZEGlEFUwrxrsV/b4gom4m/el1slgQBVhwxIrWEF4QRYgYt4kr+vslRvvyz4KoMrA6rjrrD+S4wdFfHrJvsaJN8KntvxS85vE1G30l5Z2wcZGisJgoRkWSmoV2CKAA1lQF39CnNxenBKcUFqwRjp9LLFd48vg4wHRpOeidgC1PJp+nahjncKeAlbfW7xDiUvnkJI4mTeHeQM7jSw1yqVkjkK+oYmOhiZ2mmJRCjFWy9Jkroc9/faSAbwlRRsFMgV+DX/biFwZDIMYJNqP1uCGYwe9Wu/ynrG1Z4NT+WammXo/EE1jV1AKBjCOpQcqmKBcR35/YXnvJWwTeYDIXUbGF/reynuUBWZVCgLu0mCnb8HfTpObpssZdlb13ex0Fo7DTHPQf2BrO6/s48WSlebN9xX7ng77cnoNthK2eV6Oy2hMrlNF3BXUTMlvWoOTMtwQyGk5MZRCo8qH7pUEuV9cP8SHLxlV++UDC72Ejo3Ol7M7s4VAMxf6MawInCgcR05wf0WmigkhqH1J4WkxFrvz3eShSm9i7/SWOtYveA9R2yW0Lp/vr6XAnFInKB/8G0dv1eHBzvAYPrM5rUM2R2uDzpYby6nWca3Z6Z7TUgaWcsysV727M9V4Qqc39B5R3+oTTxAwCszVuQ78OdY68s/vfprHb180PBT4m9P3MRfgIp3/s3igF0bWg460Rz+/OEeHPsCsySJff/uB32V3SlzxnyzZ1k5LTqIyDJu8oGrexQzUe+pez1nAU5v++i54fYznYhyv8HUURlBVpV8OdBLXjeHCHQtdwxjSR+XfxwEiNMFwSPhw7psuWRXzAnJ4lP1A6kdNXnnHKpryorvKh6Toy4rVP0mXKtwjdt+JZrNlpCz233dlg8h0zXU9GxoU3y433yiixc/zH+f41LATvJujN5zGkVvMMht58HoMKmMPQm89k8E3LAex03HH7fpaxzLOYZu6UC6HHuYq6+N6agAcagqLKjkXVCNfD+i8AAP//Sz8tKw==" } diff --git a/metricbeat/module/etcd/self/_meta/data.json b/metricbeat/module/etcd/self/_meta/data.json index c2e0598d299..350fb8b4e53 100644 --- a/metricbeat/module/etcd/self/_meta/data.json +++ b/metricbeat/module/etcd/self/_meta/data.json @@ -17,14 +17,14 @@ "appendrequest": { "count": 0 }, - "bandwithrate": 0, + "bandwidthrate": 0, "pkgrate": 0 }, "send": { "appendrequest": { "count": 0 }, - "bandwithrate": 0, + "bandwidthrate": 0, "pkgrate": 0 }, "starttime": "2017-12-07T07:20:32.340598119Z", diff --git a/metricbeat/module/etcd/self/_meta/fields.yml b/metricbeat/module/etcd/self/_meta/fields.yml index 7415c10028e..a35bbcd3bfc 100644 --- a/metricbeat/module/etcd/self/_meta/fields.yml +++ b/metricbeat/module/etcd/self/_meta/fields.yml @@ -29,7 +29,7 @@ type: integer description: > number of append requests this node has processed - - name: recv.bandwithrate + - name: recv.bandwidthrate type: scaled_float description: > number of bytes per second this node is receiving (follower only) @@ -42,7 +42,7 @@ type: integer description: > number of requests that this node has sent - - name: send.bandwithrate + - name: send.bandwidthrate type: scaled_float description: > number of bytes per second this node is sending (leader only). This value is undefined on single member clusters. diff --git a/metricbeat/module/etcd/self/data.go b/metricbeat/module/etcd/self/data.go index b655684e1e3..e6c655c1c2b 100644 --- a/metricbeat/module/etcd/self/data.go +++ b/metricbeat/module/etcd/self/data.go @@ -35,7 +35,7 @@ type AppendRequest struct { type Recv struct { Appendrequest AppendRequest - Bandwithrate float64 `json:"recvBandwithRate"` + Bandwidthrate float64 `json:"recvBandwidthRate"` Pkgrate float64 `json:"recvPkgRate"` } @@ -45,7 +45,7 @@ type sendAppendRequest struct { type Send struct { AppendRequest sendAppendRequest - BandwithRate float64 `json:"sendBandwidthRate"` + BandwidthRate float64 `json:"sendBandwidthRate"` PkgRate float64 `json:"sendPkgRate"` } @@ -74,15 +74,15 @@ func eventMapping(content []byte) common.MapStr { "appendrequest": common.MapStr{ "count": data.Recv.Appendrequest.Count, }, - "bandwithrate": data.Recv.Bandwithrate, - "pkgrate": data.Recv.Pkgrate, + "bandwidthrate": data.Recv.Bandwidthrate, + "pkgrate": data.Recv.Pkgrate, }, "send": common.MapStr{ "appendrequest": common.MapStr{ "count": data.Send.AppendRequest.Cnt, }, - "bandwithrate": data.Send.BandwithRate, - "pkgrate": data.Send.PkgRate, + "bandwidthrate": data.Send.BandwidthRate, + "pkgrate": data.Send.PkgRate, }, "starttime": data.StartTime, "state": data.State, diff --git a/metricbeat/module/http/_meta/docs.asciidoc b/metricbeat/module/http/_meta/docs.asciidoc index 07dfaacb5fe..d8b845e843d 100644 --- a/metricbeat/module/http/_meta/docs.asciidoc +++ b/metricbeat/module/http/_meta/docs.asciidoc @@ -6,4 +6,4 @@ This module is inspired by the Logstash https://www.elastic.co/guide/en/logstash This is often necessary in security restricted network setups, where Logstash is not able to reach all servers. Instead the server to be monitored itself has Metricbeat installed and can send the data or a collector server has Metricbeat installed which is deployed in the secured network environment and can reach all servers to be monitored. -NOTE: As the HTTP mertricsets also fetch headers, this can lead to lots of fields in Elasticsearch in case there are many different headers. If this is the case for you and you don't need the headers, we recommend to use processors to filter out the header field. +NOTE: As the HTTP metricsets also fetch headers, this can lead to lots of fields in Elasticsearch in case there are many different headers. If this is the case for you and you don't need the headers, we recommend to use processors to filter out the header field. diff --git a/metricbeat/module/jolokia/jmx/config.go b/metricbeat/module/jolokia/jmx/config.go index cf073b6031e..0ad6a734434 100644 --- a/metricbeat/module/jolokia/jmx/config.go +++ b/metricbeat/module/jolokia/jmx/config.go @@ -143,7 +143,7 @@ func buildRequestBodyAndMapping(mappings []JMXMapping) ([]byte, AttributeMapping // At least Jolokia 1.5 responses with canonicalized MBean names when using // wildcards, even when canonicalNaming is set to false, this makes mappings to fail. - // So use canonicalzed names everywhere. + // So use canonicalized names everywhere. // If Jolokia returns non-canonicalized MBean names, then we'll need to canonicalize // them or change our approach to mappings. config := map[string]interface{}{ diff --git a/metricbeat/module/kafka/_meta/Dockerfile b/metricbeat/module/kafka/_meta/Dockerfile index 4a49c5d69c9..4cf9f1b377d 100644 --- a/metricbeat/module/kafka/_meta/Dockerfile +++ b/metricbeat/module/kafka/_meta/Dockerfile @@ -20,7 +20,7 @@ ADD healthcheck.sh /healthcheck.sh EXPOSE 9092 EXPOSE 2181 -# Healtcheck creates an empty topic foo. As soon as a topic is created, it assumes broke is available +# Healthcheck creates an empty topic foo. As soon as a topic is created, it assumes broke is available HEALTHCHECK --interval=1s --retries=90 CMD /healthcheck.sh ENTRYPOINT ["/run.sh"] diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go index 397b1a4cc3b..f8c9dec28a0 100644 --- a/metricbeat/module/kibana/fields.go +++ b/metricbeat/module/kibana/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzsWE2P2zYQve+vGOw1a98KFD4UKNICTYMEQb1pD0VhUNTYYk2RKmdor/vri6FkW9ZKXserDTZAdVjEEvPmzXA+HjmBNe5msDaZcuoGgA1bnMHt+/Ti9gYgR9LBVGy8m8EPNwAA9UcofR4t3gBQ4QMvtHdLs5rBUlmStwEtKsIZZMgCTchs3Ipm8Octkb396wZgadDmNEuoE3CqxBYXeXhX4QxWwceqedPD5xSnjUWsmA5v++AGIeuncTXhgHI5hOgmbEqEEjkYTdPW8q7H+6fLrs1Q20iMYRGjyU8W7Mmucbf1ofvtDGV5Pn9+9xP4JXCB8LNVxEYTqqCLvT1gD9vC6GLvofbOoeYTf44s5e947BqTxhErpzGh99sdNypdu4Leb3eDgYx3UxfLDMPoDBp4qOH7KUjKRZr6DQZl7VR+jr8FDXoyNrAFVfAaiXpNdwvpcsMNal8VwUDFtEmVWD76do7UBcTk+YClDzuIpFaHAt+XUSd5uozPsW4zL1BV01I9TLMdYzeqp45Y71YDC5Y+lIpncA7kAn/lufesLKjSR8fiqxCU+NaBwByyHfz+fZ+7Hadk8avx6seDP40rxok3lzgTkEyOjheEvCDzL74ap+4LbG0UVUojeK1jZTAXB0slf2p/lz6ktG0KbQrvnLYxR0qbdQfa5wiEqxId36XJRqz0+nxo8IExOGVfTUROCtYv4e2bN+Czv2WQQeajy2XO/ao2ap7QDt9K5dRqOLcPve/R9HnSwQuIf2p633FEP9lbDvOwEu0xLfvC9lxax5JJ+oYLxW1y+45dKIIM0YkScsatUuIZaw2h9i4fEBABqfKOcCHYow2TX+7vP8EcwwbDwQK01dkXjhW1Wb1QbLWOZbSKMQclM3eFlEr0hDXdpXcykPfvScKr4LtJHd3aua1xud8OZ4mMlxd3o1QPpozlyG4c8+WfiMQvlCkJ+8ocqXXZQvrncIjrPnNdkN/jbrJRNiJUyoQ6vqh00Vjed27H0r2kQCm5VTdx+V2ryn0hExiul6eKlv89nDksYuAFEqcWGUdi++3t8WOYXG5of0r5ChS1NcKtZRTQaWmRGOrJMcT5cLTzTscQREo0EMa7/ozuof0E5Y9doi0TUKocZfK1GMJHz01Tz4LfEgYCrZxsQA5ltGwqi0BG/qkc+pRoR0T2x7KJ1nBaXJeTIkI5HDN4p/GQhrsEH3AisguJVWYNFZi3YQdOPl6vceTS/wMzmNe4V9Z9wdx3qnj2maPNTI5jUFllHOMDJ+ZXHjOGChkuEWgXiq9jCqYQbzFrtu4kc1pbfza2wzU9ZnDR6bCrZH4J5/k3E935l4b3INk30n+s99UiR6t2Y7UfGUIJGwQbEjZoZXUjD7aGC5A8lvMCZOh0UaqwNm417b2li8+6ppvXo7Heu2feyP1/1zUqg2/prqt/Mlw9eT40N0iP0hIumDcXqQcYQfi8ra20DA6PaHhaop+P2IWcfmu0huyVSbfX1963nReNMGLD7grIo+VzoqfL92uMlkdSt03uvwAAAP//IiOtlQ==" + return "eJzsWE1v20YQvftXDHyNpVuBQocCRVqgaZAgqJz2UBTCcjkSt9oPdmcoWf31xSwpiaJJWZHpwAHKgxGRmzdvZufj7U5gjbsZrE2mvLoBYMMWZ3D7Pr24vQHIkXQ0JZvgZ/DDDQBA/RFcyCuLNwBUhMgLHfzSrGawVJbkbUSLinAGGbJAEzIbv6IZ/HlLZG//ugFYGrQ5zRLqBLxy2OIiD+9KnMEqhqps3vTwOcVpYxErpsPbPrhByPppXE04oHwOsfITNg7BIUejadpa3vV4/3TZtRlqWxFjXFSVyU8W7MmucbcNsfvtDGV5Pn9+9xOEJXCB8LNVxEYTqqiLvT3gANvC6GLvoQ7eo+YTf44s5e947BqTxhMrrzGh99sdNypdu4Leb3eDkUzwU1+5DOPoDBp4qOH7KUjKVTQNG4zK2qn8HH8LGvRkbGALyhg0EvWa7hbS5YYb1L4qgoGKaZNy6B59O0fqAmLyfEAX4g4qUqtDge/LqJM8XcbnWLeZF6jKqVMP02zH2I3qqSM2+NXAgmWITvEMzoFc4K8894GVBeVC5Vl8FYIS3zoQmEO2g9+/73O345QsfjVe/Xjwp3HFePHmEmciksnR84KQF2T+xVfj1H2BrY2iUmmEoHVVGszFQafkT+3vMsSUtk2hTeGd17bKkdJm3YEOOQLhyqHnuzTZiJVenw8NPjBGr+yrichJwYYlvH3zBkL2twwyyELlc5lzv6qNmie0wzenvFoN5/ah9z2aPk86eAHxT03vO47oJ3vLYR6Woj2mri9sz6V1LJmkb7hQ3Ca379iFIsgQvSghb/wqJZ6x1hDq4PMBARGRyuAJF4I92jD55f7+E8wxbjAeLEBbnX3hWFGb1QvFVuvKVVYx5qBk5q6QUomesKa79E4G8v49SXgVfDepo1s7tzU+D9vhLJHx8uJuOPVgXOVGduOYL/9USPxCmZKwr8yRWpctpH8Oh7juM9cF+T3uJhtlK4RSmVjHF5UuGsv7zu1ZupcUKCW36iYuv2tVuS9kAsP18lTR8r+HM4dFDLxA4tQi40hsv709fgyTyw3tTylfgaK2Rri1jAJ6LS0SYz05hjgfjnbB6ypGkRINhAm+P6N7aD9B+WOXaMsEOJWjTL4WQ/gYuGnqWQxbwkiglZcNyMFVlk1pEcjIP5XHkBLtiMjhWDaHxXU5KSKUwzFD8BoPabhL8BEnIruQWGXWUIF5G3bg5BP0Gkcu/T8wg3mNe2XdF8x9p4pnnznazOQ4BqVVxjM+cGJ+5TFjqJDhEoF2ofg6pmAK8RazZutOMqe19WdjO1zTYwYXvY67UuaXcJ5/M9Gdf2l4D5J9I/3HhlAucrRqN1b7kSGUsEGwIWGDVlY38mBruADJYzkvQIZeF07FtfGrae8tXfWsa7p5PRrrvXvmjdz/d12jMviW7rr6J8PVk+dDc4P0KC3hgnlzkXqAEYTP29pKy+DwiIanJfr5iF3I6bdGa8hemXR7fe1923nRCCM27K6APFo+J3q6fL/GaHkkddvk/gsAAP//Ii6tlQ==" } diff --git a/metricbeat/module/kibana/stats/_meta/fields.yml b/metricbeat/module/kibana/stats/_meta/fields.yml index 40733d997d3..6360ae46948 100644 --- a/metricbeat/module/kibana/stats/_meta/fields.yml +++ b/metricbeat/module/kibana/stats/_meta/fields.yml @@ -95,7 +95,7 @@ - name: concurrent_connections type: long description: > - Number of client connections made to the server. Note that browsers can send multiple simultaneous connections to request mulitple server assets at once, and they can re-use established connections. + Number of client connections made to the server. Note that browsers can send multiple simultaneous connections to request multiple server assets at once, and they can re-use established connections. - name: sockets type: group description: > diff --git a/metricbeat/module/kubernetes/apiserver/_meta/fields.yml b/metricbeat/module/kubernetes/apiserver/_meta/fields.yml index 7d83df383be..a8ceb71e279 100644 --- a/metricbeat/module/kubernetes/apiserver/_meta/fields.yml +++ b/metricbeat/module/kubernetes/apiserver/_meta/fields.yml @@ -40,4 +40,4 @@ type: object object_type: long description: > - Request latency histagram buckets \ No newline at end of file + Request latency histogram buckets \ No newline at end of file diff --git a/metricbeat/module/kubernetes/apiserver/_meta/test/metrics b/metricbeat/module/kubernetes/apiserver/_meta/test/metrics index 98e4e5897d3..2153901ffd2 100644 --- a/metricbeat/module/kubernetes/apiserver/_meta/test/metrics +++ b/metricbeat/module/kubernetes/apiserver/_meta/test/metrics @@ -135,7 +135,7 @@ apiserver_client_certificate_expiration_seconds_bucket{le="3.1104e+07"} 0 apiserver_client_certificate_expiration_seconds_bucket{le="+Inf"} 733059 apiserver_client_certificate_expiration_seconds_sum 1.1534874692275488e+14 apiserver_client_certificate_expiration_seconds_count 733059 -# HELP apiserver_current_inflight_requests Maximal mumber of currently used inflight request limit of this apiserver per request kind in last second. +# HELP apiserver_current_inflight_requests Maximal number of currently used inflight request limit of this apiserver per request kind in last second. # TYPE apiserver_current_inflight_requests gauge apiserver_current_inflight_requests{requestKind="mutating"} 1 apiserver_current_inflight_requests{requestKind="readOnly"} 1 diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index 0e53c0b2eff..8b2d449db69 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "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" + return "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" } diff --git a/metricbeat/module/kubernetes/util/metrics_cache_test.go b/metricbeat/module/kubernetes/util/metrics_cache_test.go index a4f0d1ef9c5..d5ce7bd2bb8 100644 --- a/metricbeat/module/kubernetes/util/metrics_cache_test.go +++ b/metricbeat/module/kubernetes/util/metrics_cache_test.go @@ -25,7 +25,7 @@ import ( ) func TestTimeout(t *testing.T) { - // Mocknotonic time: + // Mock monotonic time: fakeTimeCh := make(chan int64) go func() { fakeTime := time.Now().Unix() diff --git a/metricbeat/module/kvm/dommemstat/dommemstat.go b/metricbeat/module/kvm/dommemstat/dommemstat.go index 9340cacab91..64fb016ac19 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat.go @@ -162,7 +162,7 @@ func getDomainMemoryStatName(tag int32) string { case 5: return "available" case 6: - return "actualballon" + return "actualballoon" case 7: return "rss" case 8: diff --git a/metricbeat/module/kvm/dommemstat/dommemstat_test.go b/metricbeat/module/kvm/dommemstat/dommemstat_test.go index 93cfc619de0..dc3009dca7a 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat_test.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat_test.go @@ -55,7 +55,7 @@ func TestFetchEventContents(t *testing.T) { statName, err := e.MetricSetFields.GetValue("stat.name") if err == nil { - assert.EqualValues(t, statName.(string), "actualballon") + assert.EqualValues(t, statName.(string), "actualballoon") } else { t.Errorf("error while getting value from event: %v", err) } diff --git a/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc b/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc index d2ad93f4e65..cf726fd165b 100644 --- a/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc +++ b/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc @@ -1,6 +1,6 @@ This is the `collstats` metricset of the module mongodb. -It is using the `top` adminitrative command to return usage statistics for each collection. It provides the amount of time, in microseconds, used and a count of operations for the following types: +It is using the `top` administrative command to return usage statistics for each collection. It provides the amount of time, in microseconds, used and a count of operations for the following types: - total - readLock diff --git a/metricbeat/module/mongodb/mongodb_test.go b/metricbeat/module/mongodb/mongodb_test.go index a5f04195299..6b5a46a036a 100644 --- a/metricbeat/module/mongodb/mongodb_test.go +++ b/metricbeat/module/mongodb/mongodb_test.go @@ -66,7 +66,7 @@ func TestParseMongoURL(t *testing.T) { ExpectedPassword: "secret", }, { - Name: "username and password do not overwride", + Name: "username and password do not override", URL: "mongodb://user:secret@localhost:40001", Username: "anotheruser", Password: "anotherpass", diff --git a/metricbeat/module/munin/munin.go b/metricbeat/module/munin/munin.go index 85dd6bcd1cd..d81a5ab0281 100644 --- a/metricbeat/module/munin/munin.go +++ b/metricbeat/module/munin/munin.go @@ -54,14 +54,14 @@ func Connect(address string, timeout time.Duration) (*Node, error) { writer: conn, reader: bufio.NewReader(conn), } - // Cosume and ignore first line returned by munin, it is a comment + // Consume and ignore first line returned by munin, it is a comment // about the node scanner := bufio.NewScanner(n.reader) scanner.Scan() return n, scanner.Err() } -// Close node connection relasing its resources +// Close node connection releasing its resources func (n *Node) Close() error { return n.conn.Close() } @@ -95,7 +95,7 @@ func (n *Node) Fetch(items ...string) (common.MapStr, error) { for scanner.Scan() { name := strings.TrimSpace(scanner.Text()) - // Munin delimites metrics with a dot + // Munin delimits metrics with a dot if name == "." { break } diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go index 1229dd7f05a..d831b638bc2 100644 --- a/metricbeat/module/redis/fields.go +++ b/metricbeat/module/redis/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzEms2O2zYQx+/7FEROKdAI6HUPBZqiRYOmySJpzgpFjWzWFElwht51nr4gZflrJUu2KVmXxdoy/78ZzYyGH+/YCjaPzEEp8YExkqTgkb35Ev5/88BYCSictCSNfmS/PjDGWPyO1UBOCmTCKAWCoGSVM3XzZfbAmAMFHOGRLfgDY5UEVeJj/P07pnkNe81w0caGW53xdvtJh3C4vsdffWfCaOJSI6MlMKkr42oe7mVclwyJk0QKeMdQ4TpEOcQJg+w+7CI6QxXJwgDjwRyQdxpKVmzird8/fPrzc/h5XXNdZgdDH3uyvU7NODRFKAma8Oi7PosGrNo/8GbQaAJmJ/d0wRwBGa1jkLy6o8VSRi86vhwgC9cnXxfgmKlawq2YNBrZW3gRypdSL44+jlGBiq8Bf9rb0osf4AApN56sp1xJpAkM+diosEaFBRXGaxPQvXPRslcGjoAv5CLCSx3YC19NgP6+0WBRgxW+qsAlYVdGrGaJGmQWdIyTkKqNcIwarhR7+/7j0+enn9n7L/s/H5++ff2rL3j2ieiRwKVOxDjoYXG5NB9B80Kd8WthjAKur3PtB11KwQlCCeQUi9sJOLYAQ+6zPq3rfn/61hSwC/3lEcoMN6c/2xOh4ArKvFKGd5WGEV77ukGCOhIKo9HX+1dDw47g1uBGJE0Lm4ulVKWDrseYivobgkvG7PFVqqRkPePhgotVCCpdMuuMAEQYU5521Hd19QXwLXgNtXGbtLnVjHldfxAduebKQ/JS39TIR1ZsCLryNzq23NKPfeYO+0tBD+gQx7gIaEGZw9EBaoGv7kwbEMbiKs/vTKs8HwFb85frQjYB7T9bUFlLGolqjZLiNOX3rCvYPBvX1REc4nTC/LGWsaFjjQQjEx4ke16C3nk0gIb3vgMulr3v/UNmrpQRnEz/G2Ec8nkP7lQGCqYFhxIJtDh93Kk6kktLpjI8tKs3tnDDz8GVRa9Gl9W9CsOmHZnHkXLka8jEkod5UY7ytfOPcXrybbzNhwDFIqpLnVtnFg46Kz4b4e7r5Pf2k6znN7uRJ07+vNn9OXi7fDA8QxCzG7+dss4EsCt4pn9mPmGi9U8F2WTB7eDZSbpfcrX6GN5F/l7W3ynIW/l5o5wdpdmRC+5QZuZV33veKinigk26JqJvyKH+wRnV37le2A32iuzWffNmsfWW2d2YNhcJXG6qCuGmBdphqTDnVmaRcUFyfdOkdbwWyh8zKVXSIeVhfjKrM5cSSZ1ZQ7larBVqlqNS5d7XONrpvhEbkXvrMJt4lbEsefotJOW45L/MIlRKR8nml/2x4qUqc9m/dJ1KqDbl9PXR9FfEVBLciWVeyFdL3umVaq9IWgUvUi9ybuX0USdEPlcqbVdWz0VeklrovJ4juknY3Bo3cWH3tmfymlBj+WPa8ZXzuVBGXLyEenGnVMlFXsmJurLdK7Bj9+vGJaxbTgTEfWAHAuT6tm3ezub8X0NcMb3f6j04AtCKjliKPGb97+aDDFewNqKjWOP5EczbraA5SBtJZh1sNUeAaqAsHhfI+tbBk1ACPRu32h5MkLpZdB+J1xzEmIVve+bjAkCpkbgmrsF4zIzF3ILLu+fxCevUsWxzpmRV2CQ74xcb3RzHmU8eN1pklVdqWh9HGcsdSa4yM/GL50gMXP92SxK1FWwwgxcrXaLCNKC0lsmK9VklywVky3NddlqpWiJOvZxifYG+iPsvGtQ8YpYTgdMTiylOgJRXxq1yP3nJrOXCcYJcxK3PHI1YQepAOQ2Qh9NRLznI2g5y7jBrYXxztKu9edoTra+mROc64oGu9e8tMZMlaJKV7D2htJtDrxc50WnV731cA/q/rcHxBTAiNaAbfJtIdH/eMQwaGo3DhzfA0RTsa1H+DwAA//9kHeyz" + return "eJzEms2O2zYQx+/7FEROKdAI6HUPBZqiRYOmySJpzgxFjWzWFClwht51nr4gZflrJUu2KVmXxdoy/78ZzYyGH+/YCjaPzEGh8IExUqThkb35Ev5/88BYASidqklZ88h+fWCMsfgdq4Ccksik1RokQcFKZ6vmy+yBMQcaBMIjW4gHxkoFusDH+Pt3zIgK9prhok0dbnXW19tPOoTD9T3+6juT1pBQBhktgSlTWleJcC8TpmBIghRSwDuGCtchyiFOGGT3YRfRGapIFgYYD+aAvDNQsHwTb/3+4dOfn8PPq0qYIjsY+tiT7XVqxqEpUiswhEff9Vk0YNX+gTeDRhMwO7mnC+YIyBoTg+TVHS2WtmbR8eUAWbg++SoHx2zZEm7FlDXI3sKL1L5QZnH0cYwK1GIN+NPell78AAdI3HqqPXGtkCYw5GOjwhoVFlSYqGxA985Fy14ZOAI+V4sIr0xgz305Afr7RoNFDZb7sgSXhF1buZolapDVYGKchFRthGPUCK3Z2/cfnz4//czef9n/+fj07etffcGzT0SPBC51IsZBD4vLpfkIRuT6jF9zazUIc51rP5hCSUEQSqCgWNxOwLEFGHJf7dO67venb00Bu9BfHqHIcHP6sz0RSqGh4KW2oqs0jPDa1w0SVJFQWoO+2r8aGnYEtwY3ImlaWC6XShcOuh5jKupvCC4Zs8dXqZKS9YyHcyFXIahMwWpnJSDCmPK0o76rqy+Ab8ErqKzbpM2tZszr+oPoyLXQHpKX+qZGPrJ8Q9CVv9GxxZZ+7DN32F8KekCHOMZFQAvKHI4O0BrE6s60AWEsrvbizrTaixGwlXi5LmQT0P6zBVWVopGotdVKnqb8nnUFm2frujqCQ5xOmD/WKjZ0rJFgZMODZM9LMDuPBtDw3ncg5LL3vX/ILLS2UpDtfyOMQz7vwZ3KQMGswaFCAiNPH3eqjuTSkqmtCO3qjS3c8HNwRd6r0WV1r8KwaUfmCSSOYg2ZXIowL+KoXjv/GKcn38bbfAiQL6K6Mrx2duGgs+KzEe6+Tn5vP6lqfrMbeRLkz5vdn4O3ywfDMwQ5u/HbKetMALuCZ/tn5hMmWv9UkE0W3A6enaL7JVerj+Fd5O9l/Z2CvJWfN8rZUZodueAOZWZe9b3na61kXLBJ10T0DTnUPzir+zvXC7vBXpHdui9vFltvmd2NaXORwHFblgg3LdAOS4U5t7aLTEhS65smreO1UP2YSalUDomH+cmszlwqJH1mDeVqsVaoWY5KlXtf42in+0ZsRO6tw2ziVcay5Om3UMRxKX6ZRahQjpLNL/tjxStdcNW/dJ1KqLLF9PXR9lfEVBLCySXP1asl7/RKldekag0vyiy4qNX0USclnyuVtiur5yIvSS103swR3SRrXls3cWH3dc/kNaHG8se042vnudRWXryEenGnVKoFL9VEXdnuFdix+3XjEtYtJwLiPrADCWp92zZvZ3P+ryWhmdlv9R4cAWhFRyxFHrP+d/NBhitYG9FRrPH8CPJ2K2gO0kZyt/s0htMAZfG0QNa3DJ4EEujZutX2XIIyzZr7SLzmHMYsfNsjHxcAKoMkDAkD1mNma+Q1ON49jU9Ypo5lmyMlq7xOsjF+sdHNaZz55HFjZFZ6raf1cZSphSMldGYnfu8ciYHr321JoraCDWbwUiuXqC4NKK1Vslp9VqkWErLluSY7rVSlEKdeTal9jj6P2y8G9DxitSACZyYW04IAiZfWrbifvGRWauEEAZdx55OjlStIHSinAfJwOuol51jbQc6dZc2tb052tTdPe6D11YzoXEM80LT+vSVmqgBDqlS9B5R2U+j1ghOdVv3exzWg/9sanFgAI9IDusG3iUT3xx3DoKHROHx4AxxNwb4W5f8AAAD//+K17E4=" } diff --git a/metricbeat/module/redis/info/_meta/fields.yml b/metricbeat/module/redis/info/_meta/fields.yml index 2c5c0cd8e3e..46775c91a63 100644 --- a/metricbeat/module/redis/info/_meta/fields.yml +++ b/metricbeat/module/redis/info/_meta/fields.yml @@ -298,7 +298,7 @@ - name: commands_processed type: long description: - Total number of commands preocessed. + Total number of commands processed. - name: net.input.bytes type: long diff --git a/metricbeat/module/redis/redis.go b/metricbeat/module/redis/redis.go index 8dcdec3a153..061eeee5bf9 100644 --- a/metricbeat/module/redis/redis.go +++ b/metricbeat/module/redis/redis.go @@ -49,8 +49,8 @@ func ParseRedisInfo(info string) map[string]string { } // ParseRedisLine parses a single line returned by INFO -func ParseRedisLine(s string, delimeter string) []string { - return strings.Split(s, delimeter) +func ParseRedisLine(s string, delimiter string) []string { + return strings.Split(s, delimiter) } // FetchRedisInfo returns a map of requested stats. diff --git a/metricbeat/module/system/socket/socket_test.go b/metricbeat/module/system/socket/socket_test.go index 71e325a2322..dff66727456 100644 --- a/metricbeat/module/system/socket/socket_test.go +++ b/metricbeat/module/system/socket/socket_test.go @@ -78,7 +78,7 @@ func TestFetch(t *testing.T) { pid, ok := getRequiredValue("process.pid", evt, t).(int) if !ok { - t.Fatal("proess.pid is not a int") + t.Fatal("process.pid is not a int") } assert.Equal(t, os.Getpid(), pid) diff --git a/metricbeat/module/windows/perfmon/pdh_integration_windows_test.go b/metricbeat/module/windows/perfmon/pdh_integration_windows_test.go index c525ffa18f0..1babaa0833d 100644 --- a/metricbeat/module/windows/perfmon/pdh_integration_windows_test.go +++ b/metricbeat/module/windows/perfmon/pdh_integration_windows_test.go @@ -79,7 +79,7 @@ func TestQuery(t *testing.T) { } defer q.Close() - err = q.AddCounter(processorTimeCounter, FloatFlormat, "") + err = q.AddCounter(processorTimeCounter, FloatFormat, "") if err != nil { t.Fatal(err) } @@ -232,7 +232,7 @@ func TestFloatOutputFormat(t *testing.T) { } defer query.Close() - err = query.AddCounter(processorTimeCounter, FloatFlormat, "") + err = query.AddCounter(processorTimeCounter, FloatFormat, "") if err != nil && err != PDH_NO_MORE_DATA { t.Fatal(err) } @@ -266,7 +266,7 @@ func TestRawValues(t *testing.T) { } defer query.Close() - err = query.AddCounter(processorTimeCounter, FloatFlormat, "") + err = query.AddCounter(processorTimeCounter, FloatFormat, "") if err != nil && err != PDH_NO_MORE_DATA { t.Fatal(err) } diff --git a/metricbeat/module/windows/perfmon/pdh_windows.go b/metricbeat/module/windows/perfmon/pdh_windows.go index 22168917a0a..291e909a5ec 100644 --- a/metricbeat/module/windows/perfmon/pdh_windows.go +++ b/metricbeat/module/windows/perfmon/pdh_windows.go @@ -217,7 +217,7 @@ type Query struct { type Format int const ( - FloatFlormat Format = iota + FloatFormat Format = iota LongFormat ) @@ -260,7 +260,7 @@ func (q *Query) AddCounter(counterPath string, format Format, instanceName strin wildcard: wildcard, } switch format { - case FloatFlormat: + case FloatFormat: q.counters[counterPath].format = PdhFmtDouble case LongFormat: q.counters[counterPath].format = PdhFmtLarge @@ -351,7 +351,7 @@ func NewPerfmonReader(config Config) (*PerfmonReader, error) { var format Format switch counter.Format { case "float": - format = FloatFlormat + format = FloatFormat case "long": format = LongFormat } diff --git a/metricbeat/module/windows/service/defs_service_windows.go b/metricbeat/module/windows/service/defs_service_windows.go index 874d06c33c1..69f77f7c2ab 100644 --- a/metricbeat/module/windows/service/defs_service_windows.go +++ b/metricbeat/module/windows/service/defs_service_windows.go @@ -133,7 +133,7 @@ const ( // Includes STANDARD_RIGHTS_REQUIRED in addition to all access rights in this table. ServiceAllAccess ServiceAccessRight = C.SERVICE_ALL_ACCESS // Required to call the ChangeServiceConfig or ChangeServiceConfig2 function to change the service configuration. Because this grants the caller the right to change the executable file that the system runs, it should be granted only to administrators. - ServcieChangeConfig ServiceAccessRight = C.SERVICE_CHANGE_CONFIG + ServiceChangeConfig ServiceAccessRight = C.SERVICE_CHANGE_CONFIG // Required to call the EnumDependentServices function to enumerate all the services dependent on the service. ServiceEnumerateDependents ServiceAccessRight = C.SERVICE_ENUMERATE_DEPENDENTS // Required to call the ControlService function to ask the service to report its status immediately. diff --git a/metricbeat/module/windows/service/defs_service_windows_386.go b/metricbeat/module/windows/service/defs_service_windows_386.go index 622a1c143c4..ebf58d8d4bd 100644 --- a/metricbeat/module/windows/service/defs_service_windows_386.go +++ b/metricbeat/module/windows/service/defs_service_windows_386.go @@ -117,7 +117,7 @@ type ServiceAccessRight uint32 const ( ServiceAllAccess ServiceAccessRight = 0xf01ff - ServcieChangeConfig ServiceAccessRight = 0x2 + ServiceChangeConfig ServiceAccessRight = 0x2 ServiceEnumerateDependents ServiceAccessRight = 0x8 diff --git a/metricbeat/module/windows/service/defs_service_windows_amd64.go b/metricbeat/module/windows/service/defs_service_windows_amd64.go index 0076002e407..9b2b6686d57 100644 --- a/metricbeat/module/windows/service/defs_service_windows_amd64.go +++ b/metricbeat/module/windows/service/defs_service_windows_amd64.go @@ -117,7 +117,7 @@ type ServiceAccessRight uint32 const ( ServiceAllAccess ServiceAccessRight = 0xf01ff - ServcieChangeConfig ServiceAccessRight = 0x2 + ServiceChangeConfig ServiceAccessRight = 0x2 ServiceEnumerateDependents ServiceAccessRight = 0x8 diff --git a/metricbeat/scripts/docs_collector.py b/metricbeat/scripts/docs_collector.py index 07ca0b46437..2e20e9a8af3 100644 --- a/metricbeat/scripts/docs_collector.py +++ b/metricbeat/scripts/docs_collector.py @@ -136,7 +136,7 @@ def collect(beat_name): # Read local fields.yml # create title out of module and metricset set name - # Add relase fag + # Add release fag metricset_file += "=== {} {} metricset\n\n".format(title, metricset) release = get_release(metricset_fields) diff --git a/metricbeat/tests/system/test_redis.py b/metricbeat/tests/system/test_redis.py index b7fa706f243..73cc548a3a5 100644 --- a/metricbeat/tests/system/test_redis.py +++ b/metricbeat/tests/system/test_redis.py @@ -52,7 +52,7 @@ def test_info(self): @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") @attr('integration') - def test_keysace(self): + def test_keyspace(self): """ Test redis keyspace metricset """ diff --git a/metricbeat/tests/system/test_reload.py b/metricbeat/tests/system/test_reload.py index c448eb1230a..bd171b2d938 100644 --- a/metricbeat/tests/system/test_reload.py +++ b/metricbeat/tests/system/test_reload.py @@ -45,7 +45,7 @@ def test_reload(self): @unittest.skipUnless(re.match("(?i)win|linux|darwin|freebsd|openbsd", sys.platform), "os") def test_start_stop(self): """ - Test if module is properly started and stoppped + Test if module is properly started and stopped """ self.render_config_template( reload=True, diff --git a/packetbeat/beater/packetbeat.go b/packetbeat/beater/packetbeat.go index 295c627625d..becc53cf65b 100644 --- a/packetbeat/beater/packetbeat.go +++ b/packetbeat/beater/packetbeat.go @@ -305,7 +305,7 @@ func (pb *packetbeat) icmpConfig() (*common.Config, error) { } if icmp != nil { - return nil, errors.New("More then one icmp confgigurations found") + return nil, errors.New("More then one icmp configurations found") } icmp = cfg diff --git a/packetbeat/decoder/decoder.go b/packetbeat/decoder/decoder.go index fb0b0a2e45d..5a76d4ae4e3 100644 --- a/packetbeat/decoder/decoder.go +++ b/packetbeat/decoder/decoder.go @@ -282,7 +282,7 @@ func (d *Decoder) process( func (d *Decoder) onICMPv4(packet *protos.Packet) { if d.icmp4Proc != nil { packet.Payload = d.icmp4.Payload - packet.Tuple.ComputeHashebles() + packet.Tuple.ComputeHashables() d.icmp4Proc.ProcessICMPv4(d.flowID, &d.icmp4, packet) } } @@ -290,7 +290,7 @@ func (d *Decoder) onICMPv4(packet *protos.Packet) { func (d *Decoder) onICMPv6(packet *protos.Packet) { if d.icmp6Proc != nil { packet.Payload = d.icmp6.Payload - packet.Tuple.ComputeHashebles() + packet.Tuple.ComputeHashables() d.icmp6Proc.ProcessICMPv6(d.flowID, &d.icmp6, packet) } } @@ -307,7 +307,7 @@ func (d *Decoder) onUDP(packet *protos.Packet) { packet.Tuple.SrcPort = src packet.Tuple.DstPort = dst packet.Payload = d.udp.Payload - packet.Tuple.ComputeHashebles() + packet.Tuple.ComputeHashables() d.udpProc.Process(id, packet) } @@ -330,6 +330,6 @@ func (d *Decoder) onTCP(packet *protos.Packet) { debugf("Ignore empty non-FIN packet") return } - packet.Tuple.ComputeHashebles() + packet.Tuple.ComputeHashables() d.tcpProc.Process(id, &d.tcp, packet) } diff --git a/packetbeat/docs/setting-up-running.asciidoc b/packetbeat/docs/setting-up-running.asciidoc index a6762faa0e7..a9991ceffde 100644 --- a/packetbeat/docs/setting-up-running.asciidoc +++ b/packetbeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the @@ -20,7 +20,7 @@ This section includes additional information on how to set up and run * <> -//MAINTAINERS: If you add a new file to this section, make sure you update the bulletedl ist ^^ too. +//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too. include::../../libbeat/docs/shared-directory-layout.asciidoc[] diff --git a/packetbeat/protos/amqp/amqp_fields.go b/packetbeat/protos/amqp/amqp_fields.go index 29c24640189..1926e734558 100644 --- a/packetbeat/protos/amqp/amqp_fields.go +++ b/packetbeat/protos/amqp/amqp_fields.go @@ -199,7 +199,7 @@ func fieldUnmarshal(table common.MapStr, data []byte, offset uint32, length uint table[name] = bodyToByteArray(data[offset+1+size : offset+5+size]) offset += 5 + size default: - //unkown field + //unknown field return true } //advance to next field recursively diff --git a/packetbeat/protos/amqp/amqp_parser.go b/packetbeat/protos/amqp/amqp_parser.go index 7d7e2711ea9..8c2d78e110e 100644 --- a/packetbeat/protos/amqp/amqp_parser.go +++ b/packetbeat/protos/amqp/amqp_parser.go @@ -104,7 +104,7 @@ func readFrameHeader(data []byte) (ret *amqpFrame, err bool) { } frame.Type = frameType(data[0]) if frame.size == 0 { - //frame content is nil with hearbeat frames + //frame content is nil with heartbeat frames frame.content = nil } else { frame.content = data[7 : frame.size+7] diff --git a/packetbeat/protos/amqp/amqp_test.go b/packetbeat/protos/amqp/amqp_test.go index 176ef0c243d..233df6ce4e2 100644 --- a/packetbeat/protos/amqp/amqp_test.go +++ b/packetbeat/protos/amqp/amqp_test.go @@ -55,7 +55,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 3306, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/cassandra/cassandra.go b/packetbeat/protos/cassandra/cassandra.go index f85ac38e62d..495095ae9e4 100644 --- a/packetbeat/protos/cassandra/cassandra.go +++ b/packetbeat/protos/cassandra/cassandra.go @@ -43,7 +43,7 @@ type connection struct { trans transactions } -// Uni-directioal tcp stream state for parsing messages. +// Uni-directional tcp stream state for parsing messages. type stream struct { parser parser } diff --git a/packetbeat/protos/dns/dns.go b/packetbeat/protos/dns/dns.go index 1ba444109f5..cbe74ced866 100644 --- a/packetbeat/protos/dns/dns.go +++ b/packetbeat/protos/dns/dns.go @@ -130,7 +130,7 @@ func dnsTupleFromIPPort(t *common.IPPortTuple, trans transport, id uint16) dnsTu transport: trans, id: id, } - tuple.computeHashebles() + tuple.computeHashables() return tuple } @@ -151,7 +151,7 @@ func (t dnsTuple) reverse() dnsTuple { } } -func (t *dnsTuple) computeHashebles() { +func (t *dnsTuple) computeHashables() { copy(t.raw[0:16], t.SrcIP) copy(t.raw[16:18], []byte{byte(t.SrcPort >> 8), byte(t.SrcPort)}) copy(t.raw[18:34], t.DstIP) diff --git a/packetbeat/protos/dns/dns_tcp_test.go b/packetbeat/protos/dns/dns_tcp_test.go index 2b940606b4b..d8aa3a2c057 100644 --- a/packetbeat/protos/dns/dns_tcp_test.go +++ b/packetbeat/protos/dns/dns_tcp_test.go @@ -198,7 +198,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: clientPort, DstPort: serverPort, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } @@ -515,7 +515,7 @@ func TestGap_errorResponse(t *testing.T) { assert.Nil(t, mapValue(t, m, "answers")) } -// Verify that a gap/fin happening after a valid query create only one tansaction +// Verify that a gap/fin happening after a valid query create only one transaction func TestGapFin_validMessage(t *testing.T) { var private protos.ProtocolData store := &eventStore{} diff --git a/packetbeat/protos/dns/names.go b/packetbeat/protos/dns/names.go index d05db5a05de..27b50a13fb5 100644 --- a/packetbeat/protos/dns/names.go +++ b/packetbeat/protos/dns/names.go @@ -116,7 +116,7 @@ func dnsSaltToString(s string) string { return strings.ToUpper(s) } -// hexStringToString converts an hexadeciaml string to string. Bytes +// hexStringToString converts an hexadecimal string to string. Bytes // below 32 or above 126 are represented as an escaped base10 integer (\DDD). // Back slashes and quotes are escaped. Tabs, carriage returns, and line feeds // will be converted to \t, \r and \n respectively. diff --git a/packetbeat/protos/http/http_test.go b/packetbeat/protos/http/http_test.go index 542774cbfca..cd8330d6361 100644 --- a/packetbeat/protos/http/http_test.go +++ b/packetbeat/protos/http/http_test.go @@ -863,7 +863,7 @@ func TestHttpParser_censorPasswordGET(t *testing.T) { path, params, err := http.extractParameters(st.message) if err != nil { - t.Errorf("Faile to parse parameters") + t.Errorf("Failed to parse parameters") } logp.Debug("httpdetailed", "parameters %s", params) @@ -1253,7 +1253,7 @@ func testCreateTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 80, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/memcache/errors.go b/packetbeat/protos/memcache/errors.go index 45761a04db3..3b6b5b9ae45 100644 --- a/packetbeat/protos/memcache/errors.go +++ b/packetbeat/protos/memcache/errors.go @@ -55,7 +55,7 @@ var ( errMixOfBinaryAndText = errors.New("mix of binary and text in one connection") errResponseUnknownTransaction = errors.New("response from unknown transaction") errExpectedValueForMerge = errors.New("expected value to merge with") - errExpectedStatsForMerge = errors.New("expected stat respose to merge with") + errExpectedStatsForMerge = errors.New("expected stat response to merge with") ) // internal notes to be published with transaction diff --git a/packetbeat/protos/memcache/memcache.go b/packetbeat/protos/memcache/memcache.go index fbcb2bf6a01..750625bcdd6 100644 --- a/packetbeat/protos/memcache/memcache.go +++ b/packetbeat/protos/memcache/memcache.go @@ -172,7 +172,7 @@ func (mc *memcache) setFromConfig(config *memcacheConfig) error { mc.config.maxBytesPerValue = config.MaxBytesPerValue } - mc.config.parseUnkown = config.ParseUnknown + mc.config.parseUnknown = config.ParseUnknown mc.udpConfig.transTimeout = config.UDPTransactionTimeout mc.tcpConfig.tcpTransTimeout = config.TransactionTimeout diff --git a/packetbeat/protos/memcache/memcache_test.go b/packetbeat/protos/memcache/memcache_test.go index 349b38b87a7..c9339fce117 100644 --- a/packetbeat/protos/memcache/memcache_test.go +++ b/packetbeat/protos/memcache/memcache_test.go @@ -84,7 +84,7 @@ func makeTransactionEvent(t *testing.T, trans *transaction) common.MapStr { return event.Fields } -func Test_TryMergeUnmergeableRespnses(t *testing.T) { +func Test_TryMergeUnmergeableResponses(t *testing.T) { mct := newMemcacheTest(defaultConfig) msg1 := textParseNoFail(t, "STORED\r\n") msg2 := textParseNoFail(t, "0\r\n") diff --git a/packetbeat/protos/memcache/parse.go b/packetbeat/protos/memcache/parse.go index 5f980634d11..64e1486a70d 100644 --- a/packetbeat/protos/memcache/parse.go +++ b/packetbeat/protos/memcache/parse.go @@ -33,7 +33,7 @@ const ( type parserConfig struct { maxValues int maxBytesPerValue int - parseUnkown bool + parseUnknown bool } type parser struct { diff --git a/packetbeat/protos/memcache/parse_test.go b/packetbeat/protos/memcache/parse_test.go index 007f09af1f9..c61e7875cff 100644 --- a/packetbeat/protos/memcache/parse_test.go +++ b/packetbeat/protos/memcache/parse_test.go @@ -66,7 +66,7 @@ type offsetBinWriter struct { var defaultTestParserConfig = parserConfig{ maxValues: -1, maxBytesPerValue: 2e6, - parseUnkown: true, + parseUnknown: true, } func newTestParser(tst *testing.T, state parserState) *testParser { diff --git a/packetbeat/protos/memcache/plugin_tcp.go b/packetbeat/protos/memcache/plugin_tcp.go index 4fb09ffd5ec..4b9e2226ef0 100644 --- a/packetbeat/protos/memcache/plugin_tcp.go +++ b/packetbeat/protos/memcache/plugin_tcp.go @@ -394,7 +394,7 @@ func (mc *memcache) GapInStream( } } - // need to drop TCP stream. But try to publish all cached trancsactions first + // need to drop TCP stream. But try to publish all cached transactions first mc.pushAllTCPTrans(conn.connection) return private, true } diff --git a/packetbeat/protos/memcache/text.go b/packetbeat/protos/memcache/text.go index 2574040cda2..769ccbf08e9 100644 --- a/packetbeat/protos/memcache/text.go +++ b/packetbeat/protos/memcache/text.go @@ -17,7 +17,7 @@ package memcache -// Memcache text protocol command defitions with parsers and serializers to +// Memcache text protocol command definitions with parsers and serializers to // create events from parsed messages. // // All defined messages implement the textCommandType. @@ -383,7 +383,7 @@ func makeSubMessageParser(commands []textCommandType) parserStateFn { cmd := findTextCommandType(commands, sub) if cmd == nil { debug("unknown sub-command: %s", sub) - if parser.config.parseUnkown { + if parser.config.parseUnknown { cmd = &unknownCommand } else { return parser.failing(errParserUnknownCommand) @@ -470,7 +470,7 @@ func doParseTextCommand(parser *parser, buf *streambuf.Buffer) parseResult { } if cmd == nil { debug("unknown command: %s", msg.command) - if parser.config.parseUnkown { + if parser.config.parseUnknown { cmd = &unknownCommand } else { return parser.failing(errParserUnknownCommand) diff --git a/packetbeat/protos/mongodb/mongodb_parser_test.go b/packetbeat/protos/mongodb/mongodb_parser_test.go index 2203692bcec..9ab718718fb 100644 --- a/packetbeat/protos/mongodb/mongodb_parser_test.go +++ b/packetbeat/protos/mongodb/mongodb_parser_test.go @@ -41,7 +41,7 @@ func TestMongodbParser_messageNotEvenStarted(t *testing.T) { } } -func TestMongodbParser_mesageNotFinished(t *testing.T) { +func TestMongodbParser_messageNotFinished(t *testing.T) { var data []byte addInt32(data, 100) // length = 100 diff --git a/packetbeat/protos/mongodb/mongodb_test.go b/packetbeat/protos/mongodb/mongodb_test.go index 74f728e25b8..09cc2a1ef4f 100644 --- a/packetbeat/protos/mongodb/mongodb_test.go +++ b/packetbeat/protos/mongodb/mongodb_test.go @@ -59,7 +59,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 27017, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/mysql/mysql_test.go b/packetbeat/protos/mysql/mysql_test.go index 063f60b4f6d..1a44d053490 100644 --- a/packetbeat/protos/mysql/mysql_test.go +++ b/packetbeat/protos/mysql/mysql_test.go @@ -485,7 +485,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 3306, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/nfs/nfs4.go b/packetbeat/protos/nfs/nfs4.go index 81f88ff1e60..24f76670ff6 100644 --- a/packetbeat/protos/nfs/nfs4.go +++ b/packetbeat/protos/nfs/nfs4.go @@ -216,9 +216,9 @@ func (nfs *nfs) findV4MainOpcode(xdr *xdr) string { // First class ops // // The first class ops usually the main operation in the compound. - // NFS spec allowes to build compound opertion where multiple + // NFS spec allows to build compound operation where multiple // first class ops are used, like OPEN->LOCK->WRITE->LOCKU->CLOSE, - // but such construnction are not used in the practice. + // but such construction are not used in the practice. case opAccess, opBackchannelCtl, diff --git a/packetbeat/protos/nfs/rpc.go b/packetbeat/protos/nfs/rpc.go index ac1836c5c5d..c329b7c2d2f 100644 --- a/packetbeat/protos/nfs/rpc.go +++ b/packetbeat/protos/nfs/rpc.go @@ -216,7 +216,7 @@ func (r *rpc) handleRPCFragment( for len(st.rawData) > 0 { if len(st.rawData) < 4 { - debugf("Wainting for more data") + debugf("Waiting for more data") break } @@ -225,7 +225,7 @@ func (r *rpc) handleRPCFragment( islast := (marker & rpcLastFrag) != 0 if len(st.rawData)-4 < size { - debugf("Wainting for more data") + debugf("Waiting for more data") break } diff --git a/packetbeat/protos/pgsql/pgsql_test.go b/packetbeat/protos/pgsql/pgsql_test.go index 5f174d7e560..0436aa6b3c2 100644 --- a/packetbeat/protos/pgsql/pgsql_test.go +++ b/packetbeat/protos/pgsql/pgsql_test.go @@ -321,7 +321,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 5432, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/redis/redis_parse.go b/packetbeat/protos/redis/redis_parse.go index 6017964379a..e023bcee38e 100644 --- a/packetbeat/protos/redis/redis_parse.go +++ b/packetbeat/protos/redis/redis_parse.go @@ -270,7 +270,7 @@ func (p *parser) parse(buf *streambuf.Buffer) (bool, bool) { content, iserror, ok, complete := p.dispatch(0, buf) if !ok || !complete { // on error or incomplete message drop all parsing progress, due to - // parse not being statefull among multiple calls + // parse not being stateful among multiple calls // => parser needs to restart parsing all content buf.Restore(snapshot) return ok, complete diff --git a/packetbeat/protos/thrift/thrift_test.go b/packetbeat/protos/thrift/thrift_test.go index 313033d8951..93f727ac6e4 100644 --- a/packetbeat/protos/thrift/thrift_test.go +++ b/packetbeat/protos/thrift/thrift_test.go @@ -595,7 +595,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 9200, DstPort: 9201, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/tls/tls_test.go b/packetbeat/protos/tls/tls_test.go index 7329efaa4a5..4eca6e68467 100644 --- a/packetbeat/protos/tls/tls_test.go +++ b/packetbeat/protos/tls/tls_test.go @@ -68,7 +68,7 @@ func testTCPTuple() *common.TCPTuple { SrcPort: 6512, DstPort: 27017, }, } - t.ComputeHashebles() + t.ComputeHashables() return t } diff --git a/packetbeat/protos/udp/udp_test.go b/packetbeat/protos/udp/udp_test.go index 04cdb671423..32b4503945a 100644 --- a/packetbeat/protos/udp/udp_test.go +++ b/packetbeat/protos/udp/udp_test.go @@ -203,7 +203,7 @@ func Test_buildPortsMap_portOverlapError(t *testing.T) { } } -// Verify that decideProtocol returns the protocol assocated with the +// Verify that decideProtocol returns the protocol associated with the // packet's source port. func Test_decideProtocol_bySrcPort(t *testing.T) { test := testSetup(t) @@ -213,7 +213,7 @@ func Test_decideProtocol_bySrcPort(t *testing.T) { assert.Equal(t, PROTO, test.udp.decideProtocol(&tuple)) } -// Verify that decideProtocol returns the protocol assocated with the +// Verify that decideProtocol returns the protocol associated with the // packet's destination port. func Test_decideProtocol_byDstPort(t *testing.T) { test := testSetup(t) diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl index ed40c7a0497..98f5758283d 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl @@ -24,7 +24,7 @@ type connection struct { trans transactions } -// Uni-directioal tcp stream state for parsing messages. +// Uni-directional tcp stream state for parsing messages. type stream struct { parser parser } diff --git a/packetbeat/tests/system/test_0006_wsgi.py b/packetbeat/tests/system/test_0006_wsgi.py index e4f5ffce586..818253c1515 100644 --- a/packetbeat/tests/system/test_0006_wsgi.py +++ b/packetbeat/tests/system/test_0006_wsgi.py @@ -30,7 +30,7 @@ def test_long_answer(self): assert "request" not in objs[0] assert "response" not in objs[0] - def test_drum_interraction(self): + def test_drum_interaction(self): self.render_config_template( http_ports=[8888] ) diff --git a/packetbeat/tests/system/test_0061_nfs.py b/packetbeat/tests/system/test_0061_nfs.py index 2bf63cf14fc..8cc2a4bbd03 100644 --- a/packetbeat/tests/system/test_0061_nfs.py +++ b/packetbeat/tests/system/test_0061_nfs.py @@ -60,7 +60,7 @@ def test_v4(self): def test_first_class_op(self): """ - Should cerrectly detect first-class opration in a middle of + Should correctly detect first-class operation in a middle of compound call """ self.render_config_template( diff --git a/script/clean_vendor.sh b/script/clean_vendor.sh index 4d7f50a0874..e03e8083e84 100755 --- a/script/clean_vendor.sh +++ b/script/clean_vendor.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Removes unncessary files from the vendor directories +# Removes unnecessary files from the vendor directories # # A list for files to be removed is used instead of excluding files. # The reason is that this makes the setup simpler and prevents diff --git a/testing/environments/docker/kafka/Dockerfile b/testing/environments/docker/kafka/Dockerfile index 3bf9c1e8b59..4d9f0d053e2 100644 --- a/testing/environments/docker/kafka/Dockerfile +++ b/testing/environments/docker/kafka/Dockerfile @@ -20,7 +20,7 @@ ADD healthcheck.sh /healthcheck.sh EXPOSE 9092 EXPOSE 2181 -# Healtcheck creates an empty topic foo. As soon as a topic is created, it assumes broke is available +# Healthcheck creates an empty topic foo. As soon as a topic is created, it assumes broke is available HEALTHCHECK --interval=1s --retries=600 CMD /healthcheck.sh ENTRYPOINT ["/run.sh"] diff --git a/winlogbeat/docs/setting-up-running.asciidoc b/winlogbeat/docs/setting-up-running.asciidoc index 946b4133292..a74fe718ad4 100644 --- a/winlogbeat/docs/setting-up-running.asciidoc +++ b/winlogbeat/docs/setting-up-running.asciidoc @@ -4,7 +4,7 @@ // that is unique to each beat. ///// -[[seting-up-and-running]] +[[setting-up-and-running]] == Setting up and running {beatname_uc} Before reading this section, see the @@ -18,7 +18,7 @@ This section includes additional information on how to set up and run * <> -//MAINTAINERS: If you add a new file to this section, make sure you update the bulletedl ist ^^ too. +//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too. include::../../libbeat/docs/shared-directory-layout.asciidoc[] diff --git a/winlogbeat/eventlog/eventlog.go b/winlogbeat/eventlog/eventlog.go index 3dda695e68e..1b6dcc475e1 100644 --- a/winlogbeat/eventlog/eventlog.go +++ b/winlogbeat/eventlog/eventlog.go @@ -173,7 +173,7 @@ func addPairs(m common.MapStr, key string, pairs []sys.KeyValue) common.MapStr { if !exists { h[k] = sys.RemoveWindowsLineEndings(kv.Value) } else { - debugf("Droping key/value (k=%s, v=%s) pair because key already "+ + debugf("Dropping key/value (k=%s, v=%s) pair because key already "+ "exists. event=%+v", k, kv.Value, m) } } diff --git a/winlogbeat/sys/doc.go b/winlogbeat/sys/doc.go index 950a1e9dcdf..6ba38f05e4d 100644 --- a/winlogbeat/sys/doc.go +++ b/winlogbeat/sys/doc.go @@ -16,7 +16,7 @@ // under the License. /* -Package sys provides common data structures and utilties functions that are +Package sys provides common data structures and utilities functions that are used by the subpackages for interfacing with the system level APIs to collect event log records from Windows. */