Improve template testing (elastic#3425)

Template tests broke in the past several times because we have a test template which is not updated automatically. The tests are now changed so that the libbeat template is generated and tested. This guarantees that the templates we actually use are tested. This requires for integration tests also for libbeat to be called `make update`.

* Switch to `update` also for libbeat.
* Files generated by `update` are added go `.gitignore` as these files should not be versioned.
* Add heartbeat to template tests
* Remove static test templates as not needed anymore.

Makefile

@@ -40,8 +40,7 @@ coverage-report:
 
 .PHONY: update
 update:
-	$(MAKE) -C libbeat collect
-	$(foreach var,$(BEATS),$(MAKE) -C $(var) update || exit 1;)
+	$(foreach var,$(PROJECTS),$(MAKE) -C $(var) update || exit 1;)
 
 .PHONY: clean
 clean:
@@ -117,7 +116,7 @@ upload-release:
 	aws s3 cp --recursive --acl public-read build/upload s3://download.elasticsearch.org/beats/
 
 .PHONY: notice
-notice: 
+notice:
 	python dev-tools/generate_notice.py .
 
 

libbeat/.gitignore

@@ -26,3 +26,8 @@ _testmain.go
 .idea
 .jenkins
 
+/libbeat.template-es2x.json
+/libbeat.yml
+/libbeat.full.yml
+/libbeat.template.json
+/docs/fields.asciidoc

libbeat/outputs/elasticsearch/client_integration_test.go

@@ -41,13 +41,13 @@ func TestLoadTemplate(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Load template
-	absPath, err := filepath.Abs("../../tests/files/")
+	absPath, err := filepath.Abs("../../")
 	assert.NotNil(t, absPath)
 	assert.Nil(t, err)
 
-	templatePath := absPath + "/template.json"
+	templatePath := absPath + "/libbeat.template.json"
 	if strings.HasPrefix(client.Connection.version, "2.") {
-		templatePath = absPath + "/template-es2x.json"
+		templatePath = absPath + "/libbeat.template-es2x.json"
 	}
 	content, err := readTemplate(templatePath)
 	assert.Nil(t, err)
@@ -96,6 +96,8 @@ func TestLoadBeatsTemplate(t *testing.T) {
 
 	beats := []string{
 		"filebeat",
+		"heartbeat",
+		"libbeat",
 		"packetbeat",
 		"metricbeat",
 		"winlogbeat",
@@ -155,10 +157,10 @@ func TestOutputLoadTemplate(t *testing.T) {
 	// Make sure template is not yet there
 	assert.False(t, client.CheckTemplate("libbeat"))
 
-	templatePath := "../../../packetbeat/packetbeat.template.json"
+	templatePath := "../../libbeat.template.json"
 
 	if strings.HasPrefix(client.Connection.version, "2.") {
-		templatePath = "../../../packetbeat/packetbeat.template-es2x.json"
+		templatePath = "../../libbeat.template-es2x.json"
 	}
 
 	tPath, err := filepath.Abs(templatePath)

libbeat/scripts/Makefile

@@ -191,7 +191,7 @@ test: unit
 
 .PHONY: testsuite
 testsuite: ## @testing Runs all tests and generates the coverage reports
-testsuite: clean collect
+testsuite: clean update
 	$(MAKE) unit-tests
 
 	# Setups environment if TEST_ENVIRONMENT is set to true