-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bring back ES6 compatibility and e2e test
This reverts commit afd39dd.
- Loading branch information
1 parent
bbd863f
commit 1f945f3
Showing
12 changed files
with
557 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| version: '3.8' | ||
|
|
||
| services: | ||
| elasticsearch: | ||
| image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.23 | ||
| environment: | ||
| - discovery.type=single-node | ||
| - http.host=0.0.0.0 | ||
| - transport.host=127.0.0.1 | ||
| - xpack.security.enabled=false # Disable security features | ||
| - xpack.security.http.ssl.enabled=false # Disable HTTPS | ||
| - xpack.monitoring.enabled=false # Disable monitoring features | ||
| ports: | ||
| - "9200:9200" |
10 changes: 10 additions & 0 deletions
10
plugin/storage/es/mappings/fixtures/jaeger-dependencies.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "template": "*jaeger-dependencies-*", | ||
| "settings":{ | ||
| "index.number_of_shards": 3, | ||
| "index.number_of_replicas": 3, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true | ||
| }, | ||
| "mappings":{} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "template": "*jaeger-sampling-*", | ||
| "settings":{ | ||
| "index.number_of_shards": 3, | ||
| "index.number_of_replicas": 3, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true | ||
| }, | ||
| "mappings":{} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "template": "*jaeger-service-*", | ||
| "settings":{ | ||
| "index.number_of_shards": 3, | ||
| "index.number_of_replicas": 3, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true, | ||
| "index.mapper.dynamic":false | ||
| }, | ||
| "mappings":{ | ||
| "_default_":{ | ||
| "_all":{ | ||
| "enabled":false | ||
| }, | ||
| "dynamic_templates":[ | ||
| { | ||
| "span_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"tag.*" | ||
| } | ||
| }, | ||
| { | ||
| "process_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"process.tag.*" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "service":{ | ||
| "properties":{ | ||
| "serviceName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "operationName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| { | ||
| "template": "*jaeger-span-*", | ||
| "settings":{ | ||
| "index.number_of_shards": 3, | ||
| "index.number_of_replicas": 3, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true, | ||
| "index.mapper.dynamic":false | ||
| }, | ||
| "mappings":{ | ||
| "_default_":{ | ||
| "_all":{ | ||
| "enabled":false | ||
| }, | ||
| "dynamic_templates":[ | ||
| { | ||
| "span_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"tag.*" | ||
| } | ||
| }, | ||
| { | ||
| "process_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"process.tag.*" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "span":{ | ||
| "properties":{ | ||
| "traceID":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "parentSpanID":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "spanID":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "operationName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "startTime":{ | ||
| "type":"long" | ||
| }, | ||
| "startTimeMillis":{ | ||
| "type":"date", | ||
| "format":"epoch_millis" | ||
| }, | ||
| "duration":{ | ||
| "type":"long" | ||
| }, | ||
| "flags":{ | ||
| "type":"integer" | ||
| }, | ||
| "logs":{ | ||
| "type":"nested", | ||
| "dynamic":false, | ||
| "properties":{ | ||
| "timestamp":{ | ||
| "type":"long" | ||
| }, | ||
| "fields":{ | ||
| "type":"nested", | ||
| "dynamic":false, | ||
| "properties":{ | ||
| "key":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "value":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "tagType":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "process":{ | ||
| "properties":{ | ||
| "serviceName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "tag":{ | ||
| "type":"object" | ||
| }, | ||
| "tags":{ | ||
| "type":"nested", | ||
| "dynamic":false, | ||
| "properties":{ | ||
| "key":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "value":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "tagType":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "references":{ | ||
| "type":"nested", | ||
| "dynamic":false, | ||
| "properties":{ | ||
| "refType":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "traceID":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "spanID":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| }, | ||
| "tag":{ | ||
| "type":"object" | ||
| }, | ||
| "tags":{ | ||
| "type":"nested", | ||
| "dynamic":false, | ||
| "properties":{ | ||
| "key":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "value":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "tagType":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "template": "*jaeger-dependencies-*", | ||
| "settings":{ | ||
| "index.number_of_shards": {{ .Shards }}, | ||
| "index.number_of_replicas": {{ .Replicas }}, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true | ||
| }, | ||
| "mappings":{} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "template": "*jaeger-sampling-*", | ||
| "settings":{ | ||
| "index.number_of_shards": {{ .Shards }}, | ||
| "index.number_of_replicas": {{ .Replicas }}, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":false | ||
| }, | ||
| "mappings":{} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "template": "*jaeger-service-*", | ||
| "settings":{ | ||
| "index.number_of_shards": {{ .Shards }}, | ||
| "index.number_of_replicas": {{ .Replicas }}, | ||
| "index.mapping.nested_fields.limit":50, | ||
| "index.requests.cache.enable":true, | ||
| "index.mapper.dynamic":false | ||
| }, | ||
| "mappings":{ | ||
| "_default_":{ | ||
| "_all":{ | ||
| "enabled":false | ||
| }, | ||
| "dynamic_templates":[ | ||
| { | ||
| "span_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"tag.*" | ||
| } | ||
| }, | ||
| { | ||
| "process_tags_map":{ | ||
| "mapping":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "path_match":"process.tag.*" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "service":{ | ||
| "properties":{ | ||
| "serviceName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| }, | ||
| "operationName":{ | ||
| "type":"keyword", | ||
| "ignore_above":256 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.