Fix tests again

Author: carsonip

x-pack/plugin/apm-data/src/yamlRestTest/resources/rest-api-spec/test/20_logs_pipeline.yml

@@ -11,10 +11,10 @@ setup:
         refresh: true
         body:
           - create: {}
-          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "log", "dataset": "apm.error", "namespace": "eventdataset"}, "log": {"level": "error"}, "error": {"log": {"message": "loglevel"}, "exception": [{"message": "exception_used"}]}}'
+          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "logs", "dataset": "apm.error", "namespace": "eventdataset"}, "log": {"level": "error"}, "error": {"log": {"message": "loglevel"}, "exception": [{"message": "exception_used"}]}}'
 
           - create: {}
-          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "log", "dataset": "apm.error", "namespace": "eventdataset"}, "event": {"dataset": "foo"}, "log": {"level": "error"}, "error": {"log": {"message": "loglevel"}, "exception": [{"message": "exception_used"}]}}'
+          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "logs", "dataset": "apm.error", "namespace": "eventdataset"}, "event": {"dataset": "foo"}, "log": {"level": "error"}, "error": {"log": {"message": "loglevel"}, "exception": [{"message": "exception_used"}]}}'
 
   - is_false: errors
 
@@ -24,7 +24,7 @@ setup:
         body:
           fields: ["event.dataset"]
   - length: { hits.hits: 2 }
-  - match: { hits.hits.0.fields: { "event.dataset": ["error"] } }
+  - match: { hits.hits.0.fields: { "event.dataset": ["apm.error"] } }
   - match: { hits.hits.1.fields: { "event.dataset": ["foo"] } }
 ---
 "Test logs-apm.app.*-* event.dataset field":
@@ -34,10 +34,10 @@ setup:
         refresh: true
         body:
           - create: {}
-          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "log", "dataset": "apm.app.foo", "namespace": "eventdataset"}, "message": "foo"}'
+          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "logs", "dataset": "apm.app.foo", "namespace": "eventdataset"}, "message": "foo"}'
 
           - create: {}
-          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "log", "dataset": "apm.app.foo", "namespace": "eventdataset"}, "event": {"dataset": "foo"}, "message": "foo"}'
+          - '{"@timestamp": "2017-06-22", "data_stream": {"type": "logs", "dataset": "apm.app.foo", "namespace": "eventdataset"}, "event": {"dataset": "foo"}, "message": "foo"}'
 
   - is_false: errors