Fix beats update (#1196)

* Fix scripts for updating beats.

Follow up to PR #1177

* Update beats framework to 2a3aabc

NOTICE.txt

@@ -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:
 --------------------------------------------------------------------

magefile.go

@@ -100,7 +100,7 @@ func Update() error {
 }
 
 func Fields() error {
-	return mage.GenerateFieldsYAML(".")
+	return mage.GenerateFieldsYAML("model")
 }
 
 // -----------------------------------------------------------------------------

script/update_beats.sh

@@ -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/" \

tests/fields_test.go

@@ -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()
@@ -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")