Skip to content

Commit

Permalink
Revert "Remove support for Elasticsearch v5/v6 (jaegertracing#5448)"
Browse files Browse the repository at this point in the history
This reverts commit afd39dd.
  • Loading branch information
pavolloffay committed Jul 3, 2024
1 parent bbd863f commit d5ea5b6
Show file tree
Hide file tree
Showing 10 changed files with 540 additions and 2 deletions.
10 changes: 10 additions & 0 deletions plugin/storage/es/mappings/fixtures/jaeger-dependencies.json
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.json
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.json
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.json
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.json
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.json
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.json
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

0 comments on commit d5ea5b6

Please # to comment.