Revert "Added some ESQL queries to elastic/logs (#466)" (#478)

This reverts commit 249332b for compatibility with pre-8.11 releases.
elastic · Oct 18, 2023 · 75ccd47 · 75ccd47
1 parent e2c8cb9
commit 75ccd47
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 120 deletions.
diff --git a/elastic/logs/challenges/logging-querying.json b/elastic/logs/challenges/logging-querying.json
@@ -54,55 +54,6 @@
           {% endfor %}
         ]
       }
-    },
-    {
-      "operation": "esql_basic_count_group_1",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_basic_count_group_2",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_basic_count_group_3",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 10,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_basic_count_group_4",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 10,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_pre_filter",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_post_filter",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql"]
-    },
-    {
-      "operation": "esql_dissect_duration_and_stats",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql"]
     }
   ]
 }
diff --git a/elastic/logs/operations/esql.json b/elastic/logs/operations/esql.json
diff --git a/elastic/logs/track.json b/elastic/logs/track.json
@@ -650,8 +650,5 @@
   ],
   "challenges": [
     {{ rally.collect(parts="challenges/*.json") }}
-  ],
-  "operations": [
-    {{ rally.collect(parts="operations/*.json") }}
   ]
 }
diff --git a/it/test_logs.py b/it/test_logs.py
@@ -23,7 +23,7 @@
 
 BASE_PARAMS = {
     "start_date": "2021-01-01T00-00-00Z",
-    "end_date": "2021-01-01T00-01-00Z",
+    "end_date": "2021-01-01T00-00-02Z",
     "max_total_download_gb": "18",
     "raw_data_volume_per_day": "72GB",
     "max_generated_corpus_size": "1GB",
@@ -129,7 +129,7 @@ def test_logs_indexing_querying_throttled(self, es_cluster, rally):
     def test_logs_querying_with_preloaded_data(self, es_cluster, rally):
         custom = {
             "bulk_start_date": "2020-09-30T00-00-00Z",
-            "bulk_end_date": "2020-09-30T00-01-00Z",
+            "bulk_end_date": "2020-09-30T00-00-02Z",
             "query_warmup_time_period": "1",
             "query_time_period": "1",
             "workflow_time_interval": "1",