Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add back ESv6 support with e2e test #5704

Merged
merged 6 commits into from
Jul 4, 2024
Merged

Add back ESv6 support with e2e test #5704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db54d19
Bring back ES6 compatibility and e2e test
pavolloffay Jul 3, 2024
0f6bc35
Fix
pavolloffay Jul 3, 2024
f5f0d17
Fix
pavolloffay Jul 3, 2024
c144e7a
Fix
pavolloffay Jul 3, 2024
12c5997
Fix
pavolloffay Jul 3, 2024
42b0cb5
use vesion suffix for fixtures
yurishkuro Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ jobs:
fail-fast: false
matrix:
version:
- major: 6.x
distribution: elasticsearch
jaeger: v1
- major: 7.x
distribution: elasticsearch
jaeger: v1
Expand Down
11 changes: 11 additions & 0 deletions docker-compose/elasticsearch/v6/docker-compose.yml
View file
Open in desktop
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 plugin/storage/es/mappings/fixtures/jaeger-dependencies-6.json
View file
Open in desktop
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 plugin/storage/es/mappings/fixtures/jaeger-sampling-6.json
View file
Open in desktop
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":{}
}
49 changes: 49 additions & 0 deletions plugin/storage/es/mappings/fixtures/jaeger-service-6.json
View file
Open in desktop
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
}
}
}
}
}
165 changes: 165 additions & 0 deletions plugin/storage/es/mappings/fixtures/jaeger-span-6.json
View file
Open in desktop
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
}
}
}
}
}
}
}
10 changes: 10 additions & 0 deletions plugin/storage/es/mappings/jaeger-dependencies-6.json
View file
Open in desktop
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":{}
}
10 changes: 10 additions & 0 deletions plugin/storage/es/mappings/jaeger-sampling-6.json
View file
Open in desktop
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":{}
}
49 changes: 49 additions & 0 deletions plugin/storage/es/mappings/jaeger-service-6.json
View file
Open in desktop
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
}
}
}
}
}
Loading
Loading