Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix beats update #1196

Merged
merged 2 commits into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/elastic/beats
Version: master
Revision: 9b268ba852ae93e1080c745a1031c72243f64df0
Revision: 2a3aabcde1bf9218b43c20f5e58b7563d90c5b65
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/beats/LICENSE.txt:
--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func Update() error {
}

func Fields() error {
return mage.GenerateFieldsYAML(".")
return mage.GenerateFieldsYAML("model")
}

// -----------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions script/update_beats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ rsync -crpv --delete \
--include="testing/***" \
--include="libbeat/" \
--include=libbeat/Makefile \
--include="libbeat/magefile.go" \
--include="libbeat/_meta/" \
--include="libbeat/_meta/fields.common.yml" \
--include="libbeat/docs/" \
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/fields_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestLoadFields(t *testing.T) {
_, err := loadFields("non-existing")
assert.NotNil(t, err)

fields, err := loadFields("./_meta/fields.test.yml")
fields, err := loadFields("./_meta/fields.yml")
assert.Nil(t, err)
expected := NewSet("transaction", "transaction.id", "transaction.context", "exception", "exception.http", "exception.http.url", "exception.http.meta", "exception.stacktrace")
flattened := NewSet()
Expand All @@ -94,7 +94,7 @@ func TestLoadFields(t *testing.T) {

func TestFlattenFieldNames(t *testing.T) {

fields, _ := loadFields("./_meta/fields.test.yml")
fields, _ := loadFields("./_meta/fields.yml")

expected := NewSet("transaction", "transaction.id", "transaction.context", "exception", "exception.http", "exception.http.url", "exception.http.meta", "exception.stacktrace")

Expand Down
216 changes: 0 additions & 216 deletions vendor/github.com/elastic/beats/libbeat/fields.yml

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading