-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into move_prom_to_ga
- Loading branch information
Showing
42 changed files
with
2,597 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| // +build !windows | ||
|
|
||
| package filestream | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" | ||
| "github.com/elastic/beats/v7/libbeat/common/match" | ||
| "github.com/elastic/beats/v7/libbeat/logp" | ||
| ) | ||
|
|
||
| func TestFileScannerSymlinks(t *testing.T) { | ||
| testCases := map[string]struct { | ||
| paths []string | ||
| excludedFiles []match.Matcher | ||
| symlinks bool | ||
| expectedFiles []string | ||
| }{ | ||
| // covers test_input.py/test_skip_symlinks | ||
| "skip symlinks": { | ||
| paths: []string{ | ||
| filepath.Join("testdata", "symlink_to_included_file"), | ||
| filepath.Join("testdata", "included_file"), | ||
| }, | ||
| symlinks: false, | ||
| expectedFiles: []string{ | ||
| mustAbsPath(filepath.Join("testdata", "included_file")), | ||
| }, | ||
| }, | ||
| "return a file once if symlinks are enabled": { | ||
| paths: []string{ | ||
| filepath.Join("testdata", "symlink_to_included_file"), | ||
| filepath.Join("testdata", "included_file"), | ||
| }, | ||
| symlinks: true, | ||
| expectedFiles: []string{ | ||
| mustAbsPath(filepath.Join("testdata", "included_file")), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| err := os.Symlink( | ||
| mustAbsPath(filepath.Join("testdata", "included_file")), | ||
| mustAbsPath(filepath.Join("testdata", "symlink_to_included_file")), | ||
| ) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| for name, test := range testCases { | ||
| test := test | ||
|
|
||
| t.Run(name, func(t *testing.T) { | ||
| cfg := fileScannerConfig{ | ||
| ExcludedFiles: test.excludedFiles, | ||
| Symlinks: true, | ||
| RecursiveGlob: false, | ||
| } | ||
| fs, err := newFileScanner(test.paths, cfg) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| files := fs.GetFiles() | ||
| paths := make([]string, 0) | ||
| for p, _ := range files { | ||
| paths = append(paths, p) | ||
| } | ||
| assert.Equal(t, test.expectedFiles, paths) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestFileWatcherRenamedFile(t *testing.T) { | ||
| testPath := mustAbsPath("first_name") | ||
| renamedPath := mustAbsPath("renamed") | ||
|
|
||
| f, err := os.Create(testPath) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| f.Close() | ||
| fi, err := os.Stat(testPath) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| cfg := fileScannerConfig{ | ||
| ExcludedFiles: nil, | ||
| Symlinks: false, | ||
| RecursiveGlob: false, | ||
| } | ||
| scanner, err := newFileScanner([]string{testPath, renamedPath}, cfg) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| w := fileWatcher{ | ||
| log: logp.L(), | ||
| scanner: scanner, | ||
| events: make(chan loginp.FSEvent), | ||
| } | ||
|
|
||
| go w.watch(context.Background()) | ||
| assert.Equal(t, loginp.FSEvent{Op: loginp.OpCreate, OldPath: "", NewPath: testPath, Info: fi}, w.Event()) | ||
|
|
||
| err = os.Rename(testPath, renamedPath) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer os.Remove(renamedPath) | ||
| fi, err = os.Stat(renamedPath) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| go w.watch(context.Background()) | ||
| evt := w.Event() | ||
|
|
||
| assert.Equal(t, loginp.OpRename, evt.Op) | ||
| assert.Equal(t, testPath, evt.OldPath) | ||
| assert.Equal(t, renamedPath, evt.NewPath) | ||
| } |
Empty file.
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.