From 4f4154099a2eb84cf97db43dd57972c053891c59 Mon Sep 17 00:00:00 2001 From: Ben Gadbois Date: Mon, 23 Jan 2017 03:34:50 -0800 Subject: [PATCH] Fix small spelling mistakes (#3434) --- Makefile | 2 +- Vagrantfile | 2 +- dev-tools/README.md | 2 +- filebeat/harvester/log_test.go | 2 +- filebeat/tests/open-file-handlers/docker-compose.yml | 2 +- filebeat/tests/system/test_registrar.py | 4 ++-- heartbeat/monitors/active/icmp/loop.go | 2 +- libbeat/logp/file_rotator_test.go | 4 ++-- libbeat/scripts/generate_template.py | 2 +- metricbeat/module/couchbase/bucket/bucket_test.go | 2 +- metricbeat/module/couchbase/cluster/cluster_test.go | 2 +- metricbeat/module/couchbase/node/node_test.go | 2 +- packetbeat/SUPPORT_PROTOCOL.md | 2 +- packetbeat/_meta/beat.full.yml | 2 +- packetbeat/_meta/fields.yml | 4 ++-- packetbeat/docs/fields.asciidoc | 4 ++-- packetbeat/flows/util.go | 2 +- packetbeat/flows/worker.go | 2 +- packetbeat/packetbeat.full.yml | 2 +- packetbeat/protos/cassandra/internal/gocql/frame.go | 4 ++-- packetbeat/protos/memcache/_meta/fields.yml | 4 ++-- packetbeat/sniffer/sniffer.go | 2 +- packetbeat/tests/system/files/ThriftTest.thrift | 10 +++++----- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index a7e83b173db1..ffc933f0db2f 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ clean-vendor: .PHONY: check check: $(foreach var,$(PROJECTS),$(MAKE) -C $(var) check || exit 1;) - # Validate that all updates were commited + # Validate that all updates were committed $(MAKE) update git update-index --refresh git diff-index --exit-code HEAD -- diff --git a/Vagrantfile b/Vagrantfile index d13d52a08b65..fec24ca7d1e2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,7 +9,7 @@ # This box is used as a Windows development and testing environment for Beats. # # Usage and Features: -# - Two users exist: Administartor and Vagrant. Both have the password: vagrant +# - 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 # install the Microsoft Remote Desktop Client from the App Store. diff --git a/dev-tools/README.md b/dev-tools/README.md index 5516f3222b4e..b418ba6efb4f 100644 --- a/dev-tools/README.md +++ b/dev-tools/README.md @@ -44,7 +44,7 @@ pip install -r requirements.txt This creates the environment that contains all the python packages required to run the `export_dashboards.py` script. Thus, for the next runs you just need -to enable the enviroment: +to enable the environment: ``` . env/bin/activate diff --git a/filebeat/harvester/log_test.go b/filebeat/harvester/log_test.go index b441561bebf6..910d611ac76d 100644 --- a/filebeat/harvester/log_test.go +++ b/filebeat/harvester/log_test.go @@ -132,7 +132,7 @@ func TestInitRegexp(t *testing.T) { // readLine reads a full line into buffer and returns it. // In case of partial lines, readLine does return an error and an empty string -// This could potentialy be improved / replaced by https://github.com/elastic/beats/libbeat/tree/master/common/streambuf +// This could potentially be improved / replaced by https://github.com/elastic/beats/libbeat/tree/master/common/streambuf func readLine(reader reader.Reader) (time.Time, string, int, common.MapStr, error) { message, err := reader.Next() diff --git a/filebeat/tests/open-file-handlers/docker-compose.yml b/filebeat/tests/open-file-handlers/docker-compose.yml index f70a3423a878..661e13a3116d 100644 --- a/filebeat/tests/open-file-handlers/docker-compose.yml +++ b/filebeat/tests/open-file-handlers/docker-compose.yml @@ -19,7 +19,7 @@ logs: - filebeat -#addtional: +#additional: # image: debian # links: # - filebeat diff --git a/filebeat/tests/system/test_registrar.py b/filebeat/tests/system/test_registrar.py index 61b0e6510fb0..7a57485435c2 100644 --- a/filebeat/tests/system/test_registrar.py +++ b/filebeat/tests/system/test_registrar.py @@ -1009,7 +1009,7 @@ def test_restart_state_reset(self): assert len(data) == 1 assert data[0]["ttl"] > 0 - # No config file which does not match the exisitng state + # No config file which does not match the existing state self.render_config_template( path=os.path.abspath(self.working_dir) + "/log/test2.log", clean_inactive="10s", @@ -1127,7 +1127,7 @@ def test_restart_state_reset_ttl_with_space(self): assert len(data) == 1 assert data[0]["ttl"] == 20 * 1000 * 1000 * 1000 - # new config file whith other clean_inactive + # new config file with other clean_inactive self.render_config_template( path=os.path.abspath(self.working_dir) + "/log/test file.log", clean_inactive="40s", diff --git a/heartbeat/monitors/active/icmp/loop.go b/heartbeat/monitors/active/icmp/loop.go index 4319fe2174ff..e1ef007c961e 100644 --- a/heartbeat/monitors/active/icmp/loop.go +++ b/heartbeat/monitors/active/icmp/loop.go @@ -324,7 +324,7 @@ func createListener(name, network string) *icmp.PacketConn { conn, err := icmp.ListenPacket(network, "") // 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 supresses + // true, even if error value itself is `nil`. Checking for conn suppresses // missleading log message. if conn == nil && err != nil { logp.Info("%v ICMP not supported: %v", name, err) diff --git a/libbeat/logp/file_rotator_test.go b/libbeat/logp/file_rotator_test.go index 01c9ed0f1a0c..6df204bbbfe4 100644 --- a/libbeat/logp/file_rotator_test.go +++ b/libbeat/logp/file_rotator_test.go @@ -24,7 +24,7 @@ func Test_Rotator(t *testing.T) { return } - Debug("rotator", "Direcotry: %s", dir) + Debug("rotator", "Directory: %s", dir) rotateeverybytes := uint64(1000) keepfiles := 3 @@ -118,7 +118,7 @@ func Test_Rotator_By_Bytes(t *testing.T) { return } - Debug("rotator", "Direcotry: %s", dir) + Debug("rotator", "Directory: %s", dir) rotateeverybytes := uint64(100) keepfiles := 3 diff --git a/libbeat/scripts/generate_template.py b/libbeat/scripts/generate_template.py index 5efcaf17cac3..20bb99845e23 100644 --- a/libbeat/scripts/generate_template.py +++ b/libbeat/scripts/generate_template.py @@ -309,7 +309,7 @@ def fill_field_properties(args, field, defaults, path): dynamic_templates.extend(dynamic) else: - raise ValueError("Unkown type found: " + field.get("type")) + raise ValueError("Unknown type found: " + field.get("type")) return properties, dynamic_templates diff --git a/metricbeat/module/couchbase/bucket/bucket_test.go b/metricbeat/module/couchbase/bucket/bucket_test.go index 0d849d63ecf1..bbdcce3f7dae 100644 --- a/metricbeat/module/couchbase/bucket/bucket_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_test.go @@ -21,7 +21,7 @@ func TestFetchEventContents(t *testing.T) { response, err := ioutil.ReadFile(absPath + "/sample_response.json") server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(200) - w.Header().Set("Content-Type", "appication/json;") + w.Header().Set("Content-Type", "application/json;") w.Write([]byte(response)) })) defer server.Close() diff --git a/metricbeat/module/couchbase/cluster/cluster_test.go b/metricbeat/module/couchbase/cluster/cluster_test.go index 97c202d44ab8..de1bed4f28e5 100644 --- a/metricbeat/module/couchbase/cluster/cluster_test.go +++ b/metricbeat/module/couchbase/cluster/cluster_test.go @@ -21,7 +21,7 @@ func TestFetchEventContents(t *testing.T) { response, err := ioutil.ReadFile(absPath + "/sample_response.json") server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(200) - w.Header().Set("Content-Type", "appication/json;") + w.Header().Set("Content-Type", "application/json;") w.Write([]byte(response)) })) defer server.Close() diff --git a/metricbeat/module/couchbase/node/node_test.go b/metricbeat/module/couchbase/node/node_test.go index f49b71f0686c..22f7ba874d4e 100644 --- a/metricbeat/module/couchbase/node/node_test.go +++ b/metricbeat/module/couchbase/node/node_test.go @@ -21,7 +21,7 @@ func TestFetchEventContents(t *testing.T) { response, err := ioutil.ReadFile(absPath + "/sample_response.json") server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(200) - w.Header().Set("Content-Type", "appication/json;") + w.Header().Set("Content-Type", "application/json;") w.Write([]byte(response)) })) defer server.Close() diff --git a/packetbeat/SUPPORT_PROTOCOL.md b/packetbeat/SUPPORT_PROTOCOL.md index 8f58405d3b4a..8fc54284c63d 100644 --- a/packetbeat/SUPPORT_PROTOCOL.md +++ b/packetbeat/SUPPORT_PROTOCOL.md @@ -1,6 +1,6 @@ # Support a new protocol -This is a simple guide, written while implementing support for mongodb protocol in order to make life easier for following developpers. +This is a simple guide, written while implementing support for mongodb protocol in order to make life easier for following developers. # Have a look at the code diff --git a/packetbeat/_meta/beat.full.yml b/packetbeat/_meta/beat.full.yml index 32f421e8b329..bba989ae9c7f 100644 --- a/packetbeat/_meta/beat.full.yml +++ b/packetbeat/_meta/beat.full.yml @@ -82,7 +82,7 @@ packetbeat.protocols.amqp: # Default: false #parse_arguments: false - # Hide all methods relative to connection negociation between server and + # Hide all methods relative to connection negotiation between server and # client. # Default: true #hide_connection_information: true diff --git a/packetbeat/_meta/fields.yml b/packetbeat/_meta/fields.yml index f2d98b41dc07..808f30b56419 100644 --- a/packetbeat/_meta/fields.yml +++ b/packetbeat/_meta/fields.yml @@ -1387,13 +1387,13 @@ type: long format: bytes description: > - The byte count of the values being transfered. + The byte count of the values being transferred. - name: response.bytes type: long format: bytes description: > - The byte count of the values being transfered. + The byte count of the values being transferred. - name: request.delta type: long diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc index a468e4fa6a05..1eec67e1935e 100644 --- a/packetbeat/docs/fields.asciidoc +++ b/packetbeat/docs/fields.asciidoc @@ -2064,7 +2064,7 @@ type: long format: bytes -The byte count of the values being transfered. +The byte count of the values being transferred. [float] @@ -2074,7 +2074,7 @@ type: long format: bytes -The byte count of the values being transfered. +The byte count of the values being transferred. [float] diff --git a/packetbeat/flows/util.go b/packetbeat/flows/util.go index 95663ff640d3..9840b520849b 100644 --- a/packetbeat/flows/util.go +++ b/packetbeat/flows/util.go @@ -66,7 +66,7 @@ func (w *worker) tick(t *time.Ticker) bool { } } -func (w *worker) periodicaly(tick time.Duration, fn func() error) { +func (w *worker) periodically(tick time.Duration, fn func() error) { defer debugf("stop periodic loop") ticker := time.NewTicker(tick) diff --git a/packetbeat/flows/worker.go b/packetbeat/flows/worker.go index 0063bb1a811d..189ddd0c5494 100644 --- a/packetbeat/flows/worker.go +++ b/packetbeat/flows/worker.go @@ -96,7 +96,7 @@ func makeWorker( nPeriod := ticksPeriod reportPeriodically := ticksPeriod > 0 debugf("start flows worker loop") - w.periodicaly(tickDuration, func() error { + w.periodically(tickDuration, func() error { nTimeout-- nPeriod-- debugf("worker tick, nTimeout=%v, nPeriod=%v", nTimeout, nPeriod) diff --git a/packetbeat/packetbeat.full.yml b/packetbeat/packetbeat.full.yml index 27663ba82d58..fe992c0bd183 100644 --- a/packetbeat/packetbeat.full.yml +++ b/packetbeat/packetbeat.full.yml @@ -82,7 +82,7 @@ packetbeat.protocols.amqp: # Default: false #parse_arguments: false - # Hide all methods relative to connection negociation between server and + # Hide all methods relative to connection negotiation between server and # client. # Default: true #hide_connection_information: true diff --git a/packetbeat/protos/cassandra/internal/gocql/frame.go b/packetbeat/protos/cassandra/internal/gocql/frame.go index c14bc9038157..3115d78fa25d 100644 --- a/packetbeat/protos/cassandra/internal/gocql/frame.go +++ b/packetbeat/protos/cassandra/internal/gocql/frame.go @@ -201,8 +201,8 @@ func (f *Framer) ReadFrame() (data map[string]interface{}, err error) { if f.Header.Flags&flagCompress == flagCompress { //decompress data and switch to use bytearray decoder if f.compres == nil { - logp.Err("hit compress flag, but comprossor was not set") - panic(errors.New("hit compress flag, but comprossor was not set")) + logp.Err("hit compress flag, but compressor was not set") + panic(errors.New("hit compress flag, but compressor was not set")) } decoder := &ByteArrayDecoder{} diff --git a/packetbeat/protos/memcache/_meta/fields.yml b/packetbeat/protos/memcache/_meta/fields.yml index 1d42fe9e2313..3d5fae104eba 100644 --- a/packetbeat/protos/memcache/_meta/fields.yml +++ b/packetbeat/protos/memcache/_meta/fields.yml @@ -137,13 +137,13 @@ type: long format: bytes description: > - The byte count of the values being transfered. + The byte count of the values being transferred. - name: response.bytes type: long format: bytes description: > - The byte count of the values being transfered. + The byte count of the values being transferred. - name: request.delta type: long diff --git a/packetbeat/sniffer/sniffer.go b/packetbeat/sniffer/sniffer.go index 71f3fb8f7dc6..7bbf6b583626 100644 --- a/packetbeat/sniffer/sniffer.go +++ b/packetbeat/sniffer/sniffer.go @@ -76,7 +76,7 @@ func deviceNameFromIndex(index int, devices []string) (string, error) { // ListDevicesNames returns the list of adapters available for sniffing on // this computer. If the withDescription parameter is set to true, a human // readable version of the adapter name is added. If the withIP parameter -// is set to true, IP address of the adatper is added. +// is set to true, IP address of the adapter is added. func ListDeviceNames(withDescription bool, withIP bool) ([]string, error) { devices, err := pcap.FindAllDevs() if err != nil { diff --git a/packetbeat/tests/system/files/ThriftTest.thrift b/packetbeat/tests/system/files/ThriftTest.thrift index ef23a5eac626..ab03ba912268 100644 --- a/packetbeat/tests/system/files/ThriftTest.thrift +++ b/packetbeat/tests/system/files/ThriftTest.thrift @@ -169,7 +169,7 @@ service ThriftTest double testDouble(1: double thing), /** - * Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma seperated values + * Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma separated values * @param Xtruct thing - the Xtruct to print * @return Xtruct - returns the Xtruct 'thing' */ @@ -184,7 +184,7 @@ service ThriftTest /** * Prints 'testMap("{%s")' where thing has been formatted into a string of 'key => value' pairs - * seperated by commas and new lines + * separated by commas and new lines * @param map thing - the map to print * @return map - returns the map 'thing' */ @@ -192,7 +192,7 @@ service ThriftTest /** * Prints 'testStringMap("{%s}")' where thing has been formatted into a string of 'key => value' pairs - * seperated by commas and new lines + * separated by commas and new lines * @param map thing - the map to print * @return map - returns the map 'thing' */ @@ -200,7 +200,7 @@ service ThriftTest /** * Prints 'testSet("{%s}")' where thing has been formatted into a string of values - * seperated by commas and new lines + * separated by commas and new lines * @param set thing - the set to print * @return set - returns the set 'thing' */ @@ -208,7 +208,7 @@ service ThriftTest /** * Prints 'testList("{%s}")' where thing has been formatted into a string of values - * seperated by commas and new lines + * separated by commas and new lines * @param list thing - the list to print * @return list - returns the list 'thing' */