-
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.
Add back ESv6 support with e2e test (#5704)
Reverts parts of #5439 Motivation: some vendors still provide commercial support for ES v6 to customers, even though ESv6 EOL was Nov 2020. --------- Signed-off-by: Pavol Loffay <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
- Loading branch information
1 parent
3b9428e
commit f202880
Showing
14 changed files
with
569 additions
and
15 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,11 @@ | ||
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 | ||
ports: | ||
- "9200:9200" |
10 changes: 10 additions & 0 deletions
10
plugin/storage/es/mappings/fixtures/jaeger-dependencies-6.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":{} | ||
} |
10 changes: 10 additions & 0 deletions
10
plugin/storage/es/mappings/fixtures/jaeger-sampling-6.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-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.