Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
173 changes: 109 additions & 64 deletions big5/operations/default.json

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions big5/queries/range_asc_sort.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"query": {
"range": {
"@timestamp": {
"gte": "2023-01-01T00:00:00",
"lte": "2023-01-13T00:00:00"
}
}
},
"sort": [
{ "@timestamp": "asc" }
]
}
13 changes: 13 additions & 0 deletions big5/queries/range_desc_sort.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"query": {
"range": {
"@timestamp": {
"gte": "2023-01-01T00:00:00",
"lte": "2023-01-13T00:00:00"
}
}
},
"sort": [
{ "@timestamp": "desc" }
]
}
14 changes: 14 additions & 0 deletions big5/test_procedures/common/big5-schedule.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,20 @@
"target-throughput": {{ target_throughput | default(2) | tojson }},
"clients": {{ search_clients | default(1) }}
},
{
"operation": "range_asc_sort",
"warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
"iterations": {{ test_iterations | default(100) | tojson }},
"target-throughput": {{ target_throughput | default(2) | tojson }},
"clients": {{ search_clients | default(1) }}
},
{
"operation": "range_desc_sort",
"warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
"iterations": {{ test_iterations | default(100) | tojson }},
"target-throughput": {{ target_throughput | default(2) | tojson }},
"clients": {{ search_clients | default(1) }}
},
{
"operation": "range-numeric",
"warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
Expand Down
139 changes: 121 additions & 18 deletions http_logs/operations/default.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"name": "index-append",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"corpora": "http_logs"
},
{
"name": "index-append-with-ingest-baseline-pipeline",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"pipeline": "http-log-baseline-pipeline",
"corpora": "http_logs"
},
{
"name": "index-append-with-ingest-grok-pipeline",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"pipeline": "http-log-grok-pipeline",
"corpora": "http_logs_unparsed"
},
{
"name": "index-append-with-ingest-geoip-pipeline",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"pipeline": "http-log-geoip-pipeline",
"corpora": "http_logs"
},
{
"name": "index-append-with-timestamp-pipeline",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"pipeline": "timestamp-pipeline",
"corpora": "http_logs_unparsed"
},
{
"name": "update",
"operation-type": "bulk",
"bulk-size": {{bulk_size | default(5000)}},
"ingest-percentage": {{ingest_percentage | default(100)}},
"conflicts": "{{conflicts | default('random')}}",
"on-conflict": "{{on_conflict | default('update')}}",
"conflict-probability": {{conflict_probability | default(25)}},
"recency": {{recency | default(0)}},
"bulk-size": {{ bulk_size | default(5000) }},
"ingest-percentage": {{ ingest_percentage | default(100) }},
"conflicts": "{{ conflicts | default('random') }}",
"on-conflict": "{{ on_conflict | default('update') }}",
"conflict-probability": {{ conflict_probability | default(25) }},
"recency": {{ recency | default(0) }},
"corpora": "http_logs"
},
{
Expand Down Expand Up @@ -125,7 +125,7 @@
"query": {
"range": {
"@timestamp": {
"gte": "now-{{'15-05-1998' | days_ago(now)}}d/d",
"gte": "now-{{ '15-05-1998' | days_ago(now) }}d/d",
"lt": "now/d"
}
}
Expand Down Expand Up @@ -474,7 +474,10 @@
"field": "status",
"target_field": "status_{{ i }}"
}
}{% if not loop.last %},{% endif %}
}
{% if not loop.first %}
,
{% endif %}
{% endfor %}
]
}
Expand Down Expand Up @@ -545,3 +548,103 @@
]
}
}
{
"name": "range_status",
"operation-type": "search",
"index": "logs-*",
"body": {
"query": {
"range": {
"status": {
"gte": 20,
"lte": 200
}
}
}
}
},
{
"name": "desc_sort_status",
"operation-type": "search",
"index": "logs-*",
"body": {
"track_total_hits": false,
"query": {
"match_all": {}
},
"sort": [
{
"status": "desc"
}
]
}
},
{
"name": "asc_sort_status",
"operation-type": "search",
"index": "logs-*",
"body": {
"track_total_hits": false,
"query": {
"match_all": {}
},
"sort": [
{
"status": "asc"
}
]
}
},
{
"name": "range_size",
"operation-type": "search",
"index": "logs-*",
"body": {
"query": {
"range": {
"size": {
"gte": 20,
"lte": 200
}
}
}
}
},
{
"name": "range_size_desc_sort",
"operation-type": "search",
"index": "logs-*",
"body": {
"size": 100,
"query": {
"range": {
"size": {
"gte": 20,
"lte": 200
}
}
},
"sort": [
{ "size": "desc" }
]
}
},
{
"name": "range_size_asc_sort",
"operation-type": "search",
"index": "logs-*",
"body": {
"size": 100,
"query": {
"range": {
"size": {
"gte": 20,
"lte": 200
}
}
},
"sort": [
{ "size": "asc" }
]
}
}
66 changes: 54 additions & 12 deletions http_logs/test_procedures/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,51 @@
"operation": "range",
"warmup-iterations": {{ range_warmup_iterations or warmup_iterations | default(100) | tojson }},
"iterations": {{ range_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ range_target_throughput or target_throughput | default(1) | tojson }},
"target-throughput": {{ range_target_throughput or target_throughput | default(2) | tojson }},
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prudhvigodithi was this arbitrarily changed? Seems like it was done to match the range operations added below.

@OVI3D0 brought up a good point offline: if this isn't backported to previous PRs, there will be a discrepancy when comparing range operations across OpenSearch versions. We should also be careful about making changes to default values in pre-existing operations for legacy workloads.

"clients": {{ range_search_clients or search_clients | default(1) }}
},
{
"operation": "range_size",
"warmup-iterations": {{ range_size_warmup_iterations or warmup_iterations | default(100) | tojson }},
"iterations": {{ range_size_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ range_size_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ range_size_search_clients or search_clients | default(1) }}
},
{
"operation": "asc_sort_status",
"warmup-iterations": {{ asc_sort_status_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ asc_sort_status_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ asc_sort_status_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ asc_sort_status_search_clients or search_clients | default(1) }}
},
{
"operation": "desc_sort_status",
"warmup-iterations": {{ desc_sort_status_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ desc_sort_status_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ desc_sort_status_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ desc_sort_status_search_clients or search_clients | default(1) }}
},
{
"operation": "range_status",
"warmup-iterations": {{ range_status_warmup_iterations or warmup_iterations | default(100) | tojson }},
"iterations": {{ range_status_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ range_status_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ range_status_search_clients or search_clients | default(1) }}
},
{
"operation": "range_size_asc_sort",
"warmup-iterations": {{ range_size_asc_sort_warmup_iterations or warmup_iterations | default(100) | tojson }},
"iterations": {{ range_size_asc_sort_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ range_size_asc_sort_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ range_size_asc_sort_search_clients or search_clients | default(1) }}
},
{
"operation": "range_size_desc_sort",
"warmup-iterations": {{ range_size_desc_sort_warmup_iterations or warmup_iterations | default(100) | tojson }},
"iterations": {{ range_size_desc_sort_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ range_size_desc_sort_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ range_size_desc_sort_search_clients or search_clients | default(1) }}
},
{
"name": "status-200s-in-range",
"operation": "200s-in-range",
Expand Down Expand Up @@ -69,28 +111,28 @@
"operation": "desc_sort_size",
"warmup-iterations": {{ desc_sort_size_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ desc_sort_size_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ desc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }},
"target-throughput": {{ desc_sort_size_target_throughput or target_throughput | default(2) | tojson }},
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above for range

"clients": {{ desc_sort_size_search_clients or search_clients | default(1) }}
},
{
"operation": "asc_sort_size",
"warmup-iterations": {{ asc_sort_size_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ asc_sort_size_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ asc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }},
"target-throughput": {{ asc_sort_size_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ asc_sort_size_search_clients or search_clients | default(1) }}
},
{
"operation": "desc_sort_timestamp",
"warmup-iterations": {{ desc_sort_timestamp_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ desc_sort_timestamp_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }},
"target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ desc_sort_timestamp_search_clients or search_clients | default(1) }}
},
{
"operation": "asc_sort_timestamp",
"warmup-iterations": {{ asc_sort_timestamp_warmup_iterations or warmup_iterations | default(200) | tojson }},
"iterations": {{ asc_sort_timestamp_iterations or iterations | default(100) | tojson }},
"target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }},
"target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ asc_sort_timestamp_search_clients or search_clients | default(1) }}
},
{
Expand Down Expand Up @@ -357,13 +399,13 @@
{{ benchmark.collect(parts="../../common_operations/check_cluster_health.json") }},
{% endwith %}
{
"operation": "create-http-log-{{ingest_pipeline | default('baseline')}}-pipeline"
"operation": "create-http-log-{{ ingest_pipeline | default('baseline') }}-pipeline"
},
{
"operation": "index-append-with-ingest-{{ingest_pipeline | default('baseline')}}-pipeline",
"operation": "index-append-with-ingest-{{ ingest_pipeline | default('baseline') }}-pipeline",
"warmup-time-period": 240,
"clients": {{bulk_indexing_clients | default(8)}},
"ignore-response-error-level": "{{error_level | default('non-fatal')}}"
"clients": {{ bulk_indexing_clients | default(8) }},
"ignore-response-error-level": "{{ error_level | default('non-fatal') }}"
},
{
"name": "refresh-after-index",
Expand All @@ -387,8 +429,8 @@
{
"operation": "update",
"warmup-time-period": 240,
"clients": {{bulk_indexing_clients | default(8)}},
"ignore-response-error-level": "{{error_level | default('non-fatal')}}"
"clients": {{ bulk_indexing_clients | default(8) }},
"ignore-response-error-level": "{{ error_level | default('non-fatal') }}"
},
{
"name": "refresh-after-index",
Expand Down Expand Up @@ -454,7 +496,7 @@
{
"operation": "index-append",
"warmup-time-period": 240,
"clients": {{bulk_indexing_clients | default(8)}}
"clients": {{ bulk_indexing_clients | default(8) }}
},
{
"name": "refresh-after-index",
Expand Down
Loading