Skip to content

Commit

Permalink
Skip libbeat logstash output tests until Logstash ES output plugin is…
Browse files Browse the repository at this point in the history
… updated (#14094)

* Remove `document_type` setting from test LS pipeline

* Skip tests until LS output plugin is updated

* Skipping more tests

* Skip more tests

* Skipping one more test
  • Loading branch information
ycombinator authored Oct 16, 2019
1 parent e0c2500 commit 82cc404
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
12 changes: 12 additions & 0 deletions libbeat/outputs/logstash/logstash_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,12 @@ func checkAll(checks ...func() bool) func() bool {
}

func TestSendMessageViaLogstashTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMessageViaLogstash(t, "basic-tcp", false)
}

func TestSendMessageViaLogstashTLS(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMessageViaLogstash(t, "basic-tls", true)
}

Expand Down Expand Up @@ -314,10 +316,12 @@ func testSendMessageViaLogstash(t *testing.T, name string, tls bool) {
}

func TestSendMultipleViaLogstashTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleViaLogstash(t, "multiple-tcp", false)
}

func TestSendMultipleViaLogstashTLS(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleViaLogstash(t, "multiple-tls", true)
}

Expand Down Expand Up @@ -350,6 +354,7 @@ func testSendMultipleViaLogstash(t *testing.T, name string, tls bool) {
}

func TestSendMultipleBigBatchesViaLogstashTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleBigBatchesViaLogstash(t, "multiple-big-tcp", false)
}

Expand All @@ -358,14 +363,17 @@ func TestSendMultipleBigBatchesViaLogstashTLS(t *testing.T) {
}

func testSendMultipleBigBatchesViaLogstash(t *testing.T, name string, tls bool) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleBatchesViaLogstash(t, name, 15, 4*integrationTestWindowSize, tls)
}

func TestSendMultipleSmallBatchesViaLogstashTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleSmallBatchesViaLogstash(t, "multiple-small-tcp", false)
}

func TestSendMultipleSmallBatchesViaLogstashTLS(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testSendMultipleSmallBatchesViaLogstash(t, "multiple-small-tls", true)
}

Expand Down Expand Up @@ -421,10 +429,12 @@ func testSendMultipleBatchesViaLogstash(
}

func TestLogstashElasticOutputPluginCompatibleMessageTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testLogstashElasticOutputPluginCompatibleMessage(t, "cmp-tcp", false)
}

func TestLogstashElasticOutputPluginCompatibleMessageTLS(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testLogstashElasticOutputPluginCompatibleMessage(t, "cmp-tls", true)
}

Expand Down Expand Up @@ -473,10 +483,12 @@ func testLogstashElasticOutputPluginCompatibleMessage(t *testing.T, name string,
}

func TestLogstashElasticOutputPluginBulkCompatibleMessageTCP(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testLogstashElasticOutputPluginBulkCompatibleMessage(t, "cmpblk-tcp", false)
}

func TestLogstashElasticOutputPluginBulkCompatibleMessageTLS(t *testing.T) {
t.Skip("skipped until https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/887 is resolved")
testLogstashElasticOutputPluginBulkCompatibleMessage(t, "cmpblk-tls", true)
}

Expand Down
1 change: 0 additions & 1 deletion testing/environments/docker/logstash/pipeline/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ output {
elasticsearch {
hosts => ["${ES_HOST:elasticsearch}:${ES_PORT:9200}"]
index => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
document_type => "%{[@metadata][type]}"
}

# Used for easier debugging
Expand Down

0 comments on commit 82cc404

Please sign in to comment.