Skip to content

Commit 9a998c3

Browse files
limotovalimotova
authored
[ES|QL] Remove deprecated TS and agg metric capabilities (#135758)
With the release of `TS_COMMAND_V0` and `AGGREGATE_METRIC_DOUBLE_V0`, we can safely remove these capabilities, so this commit is cleaning them up.
1 parent cddcf68 commit 9a998c3

File tree

10 files changed

+1
-185
lines changed

10 files changed

+1
-185
lines changed

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-absent-over-time.csv-spec‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
absent_over_time_events_received
22
required_capability: ts_command_v0
3-
required_capability: absent_over_time
43

54
TS k8s
65
| WHERE cluster == "prod" AND pod == "two"
@@ -23,7 +22,6 @@ false | two | 2024-05-10T00:22:00.000Z
2322

2423
absent_over_time_of_long
2524
required_capability: ts_command_v0
26-
required_capability: absent_over_time
2725
TS k8s | STATS is_present = max(absent_over_time(network.bytes_in)) BY cluster, time_bucket = tbucket(10minute) | SORT cluster, time_bucket | LIMIT 10;
2826

2927
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -40,8 +38,6 @@ false | staging | 2024-05-10T00:20:00.000Z
4038

4139
absent_over_time_of_boolean
4240
required_capability: ts_command_v0
43-
required_capability: absent_over_time
44-
required_capability: k8s_dataset_additional_fields
4541
TS k8s | STATS is_present = max(absent_over_time(network.eth0.up)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
4642

4743
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -58,8 +54,6 @@ false | staging | 2024-05-10T00:20:00.000Z
5854

5955
absent_over_time_of_date_nanos
6056
required_capability: ts_command_v0
61-
required_capability: absent_over_time
62-
required_capability: k8s_dataset_additional_fields
6357
TS k8s | STATS is_present = max(absent_over_time(network.eth0.last_up)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
6458

6559
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -76,8 +70,6 @@ false | staging | 2024-05-10T00:20:00.000Z
7670

7771
absent_over_time_of_date
7872
required_capability: ts_command_v0
79-
required_capability: absent_over_time
80-
required_capability: k8s_dataset_additional_fields
8173
TS k8s | STATS is_present = max(absent_over_time(to_datetime(network.eth0.last_up))) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
8274

8375
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -94,8 +86,6 @@ false | staging | 2024-05-10T00:20:00.000Z
9486

9587
absent_over_time_of_version
9688
required_capability: ts_command_v0
97-
required_capability: absent_over_time
98-
required_capability: k8s_dataset_additional_fields
9989
TS k8s | STATS is_present = max(absent_over_time(network.eth0.firmware_version)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
10090

10191
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -112,8 +102,6 @@ false | staging | 2024-05-10T00:20:00.000Z
112102

113103
absent_over_time_of_integer
114104
required_capability: ts_command_v0
115-
required_capability: absent_over_time
116-
required_capability: k8s_dataset_additional_fields
117105
TS k8s | STATS is_present = max(absent_over_time(network.eth0.currently_connected_clients)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
118106

119107
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -130,7 +118,6 @@ false | staging | 2024-05-10T00:20:00.000Z
130118

131119
absent_over_time_of_text
132120
required_capability: ts_command_v0
133-
required_capability: absent_over_time
134121
TS k8s | STATS is_present = max(absent_over_time(event_log)) BY cluster, time_bucket = tbucket(10minute) | SORT cluster, time_bucket | LIMIT 10;
135122

136123
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -147,8 +134,6 @@ false | staging | 2024-05-10T00:20:00.000Z
147134

148135
absent_over_time_of_keyword
149136
required_capability: ts_command_v0
150-
required_capability: absent_over_time
151-
required_capability: k8s_dataset_additional_fields
152137
TS k8s | STATS is_present = max(absent_over_time(network.eth0.tx)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
153138

154139
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -182,8 +167,6 @@ false | staging | 2024-05-09T23:50:00.000Z
182167

183168
absent_over_time_of_geopoint
184169
required_capability: ts_command_v0
185-
required_capability: absent_over_time
186-
required_capability: k8s_datasets_geospatial_fields
187170
TS k8s | STATS is_present = max(absent_over_time(event_city)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
188171

189172
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -200,8 +183,6 @@ false | staging | 2024-05-10T00:20:00.000Z
200183

201184
absent_over_time_of_geoshape
202185
required_capability: ts_command_v0
203-
required_capability: absent_over_time
204-
required_capability: k8s_datasets_geospatial_fields
205186
TS k8s | STATS is_present = max(absent_over_time(event_city_boundary)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
206187

207188
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -218,8 +199,6 @@ false | staging | 2024-05-10T00:20:00.000Z
218199

219200
absent_over_time_of_shape
220201
required_capability: ts_command_v0
221-
required_capability: absent_over_time
222-
required_capability: k8s_datasets_geospatial_fields
223202
TS k8s | STATS is_present = max(absent_over_time(event_shape)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
224203

225204
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -236,8 +215,6 @@ false | staging | 2024-05-10T00:20:00.000Z
236215

237216
absent_over_time_of_point
238217
required_capability: ts_command_v0
239-
required_capability: absent_over_time
240-
required_capability: k8s_datasets_geospatial_fields
241218
TS k8s | STATS is_present = max(absent_over_time(event_location)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
242219

243220
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -254,7 +231,6 @@ false | staging | 2024-05-10T00:20:00.000Z
254231

255232
absent_over_time_with_filtering
256233
required_capability: ts_command_v0
257-
required_capability: absent_over_time
258234
TS k8s | WHERE pod != "three" | STATS is_present = max(absent_over_time(network.bytes_in)) BY cluster, time_bucket = tbucket(10 minute) | SORT time_bucket, cluster | LIMIT 10;
259235

260236
is_present:boolean | cluster:keyword | time_bucket:datetime
@@ -284,7 +260,6 @@ false | three | 2024-05-09T23:40:00.000Z
284260

285261
eval_on_absent_over_time
286262
required_capability: ts_command_v0
287-
required_capability: absent_over_time
288263
TS k8s | STATS is_present = max(absent_over_time(network.bytes_in)) BY pod, time_bucket = tbucket(10 minute) | EVAL int = to_integer(is_present) | LIMIT 10 | SORT time_bucket, pod;
289264

290265
is_present:boolean | pod:keyword | time_bucket:datetime | int:integer
@@ -301,7 +276,6 @@ false | two | 2024-05-10T00:20:00.000Z | 0
301276

302277
absent_over_time_events_received_as_integer
303278
required_capability: ts_command_v0
304-
required_capability: absent_over_time
305279

306280
TS k8s
307281
| WHERE cluster == "prod" AND pod == "two"

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-avg-over-time.csv-spec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ cost:double | time_bucket:datetime
1919

2020
avg_over_time_of_integer
2121
required_capability: ts_command_v0
22-
required_capability: k8s_dataset_additional_fields
2322
TS k8s | STATS clients = avg(avg_over_time(network.eth0.currently_connected_clients)) BY time_bucket = bucket(@timestamp,1minute) | SORT time_bucket | LIMIT 10;
2423

2524
clients:double | time_bucket:datetime

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-count-distinct-over-time.csv-spec‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ bytes:long | pod:keyword | time_bucket:datetime | kb:double
191191

192192
count_distinct_over_time_multi_values
193193
required_capability: ts_command_v0
194-
required_capability: count_distinct_over_time
195-
required_capability: k8s_dataset_additional_fields
196194
TS k8s | WHERE @timestamp < "2024-05-10T00:10:00.000Z" | STATS events = avg(count_distinct_over_time(events_received)) by pod, time_bucket = bucket(@timestamp, 10minute) | SORT time_bucket, pod | LIMIT 10;
197195

198196
events:double | pod:keyword | time_bucket:datetime

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-delta.csv-spec‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ null | 2024-05-10T00:01:00.000Z
2626
delta_of_integer
2727
required_capability: ts_command_v0
2828
required_capability: delta_ts_agg
29-
required_capability: k8s_dataset_additional_fields
3029
TS k8s | STATS clients = avg(delta(network.eth0.currently_connected_clients)) BY time_bucket = bucket(@timestamp,1minute) | SORT time_bucket | LIMIT 10;
3130

3231
clients:double | time_bucket:datetime
@@ -46,7 +45,6 @@ null | 2024-05-10T00:01:00.000Z
4645
delta_of_integer_grouping
4746
required_capability: ts_command_v0
4847
required_capability: delta_ts_agg
49-
required_capability: k8s_dataset_additional_fields
5048
TS k8s | STATS clients = avg(delta(network.eth0.currently_connected_clients)) BY cluster, time_bucket = bucket(@timestamp,1minute) | SORT time_bucket, cluster | LIMIT 10;
5149

5250
clients:double | cluster:keyword | time_bucket:datetime
@@ -126,7 +124,6 @@ avg_bytes:double | cluster:keyword | time_bucket:datetime | kb_minus_offs
126124
delta_multi_values
127125
required_capability: ts_command_v0
128126
required_capability: delta_ts_agg
129-
required_capability: k8s_dataset_additional_fields
130127
TS k8s | WHERE @timestamp < "2024-05-10T00:10:00.000Z" | STATS events = sum(delta(events_received)) by pod, time_bucket = bucket(@timestamp, 1minute) | SORT events desc, pod, time_bucket | LIMIT 10;
131128

132129
events:double | pod:keyword | time_bucket:datetime
@@ -146,7 +143,6 @@ null | two | 2024-05-10T00:07:00.000Z
146143
delta_null_values
147144
required_capability: ts_command_v0
148145
required_capability: delta_ts_agg
149-
required_capability: k8s_dataset_additional_fields
150146
TS k8s | WHERE @timestamp > "2024-05-10T00:10:00.000Z" and @timestamp < "2024-05-10T00:15:00.000Z" | STATS events = sum(delta(events_received)) by pod, time_bucket = bucket(@timestamp, 1minute) | SORT events desc, pod, time_bucket | LIMIT 10;
151147

152148
events:double | pod:keyword | time_bucket:datetime
@@ -167,7 +163,6 @@ null | two | 2024-05-10T00:13:00.000Z
167163
delta_all_value_types
168164
required_capability: ts_command_v0
169165
required_capability: delta_ts_agg
170-
required_capability: k8s_dataset_additional_fields
171166
TS k8s | STATS events = sum(delta(events_received)) by pod, time_bucket = bucket(@timestamp, 10minute) | SORT events desc, pod, time_bucket | LIMIT 10 ;
172167

173168
events:double | pod:keyword | time_bucket:datetime

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-idelta.csv-spec‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ avg_bytes:double | cluster:keyword | time_bucket:datetime | kb_minus_offs
113113

114114
idelta_multi_values
115115
required_capability: ts_command_v0
116-
required_capability: k8s_dataset_additional_fields
117116
TS k8s | WHERE @timestamp < "2024-05-10T00:10:00.000Z" | STATS events = sum(idelta(events_received)) by pod, time_bucket = bucket(@timestamp, 1minute) | SORT events desc, pod, time_bucket | LIMIT 10;
118117

119118
events:double | pod:keyword | time_bucket:datetime
@@ -132,7 +131,6 @@ null | two | 2024-05-10T00:07:00.000Z
132131

133132
idelta_null_values
134133
required_capability: ts_command_v0
135-
required_capability: k8s_dataset_additional_fields
136134
TS k8s | WHERE @timestamp > "2024-05-10T00:10:00.000Z" and @timestamp < "2024-05-10T00:15:00.000Z" | STATS events = sum(idelta(events_received)) by pod, time_bucket = bucket(@timestamp, 1minute) | SORT events desc, pod, time_bucket | LIMIT 10;
137135

138136
events:double | pod:keyword | time_bucket:datetime
@@ -152,7 +150,6 @@ null | two | 2024-05-10T00:13:00.000Z
152150

153151
idelta_all_value_types
154152
required_capability: ts_command_v0
155-
required_capability: k8s_dataset_additional_fields
156153
// tag::idelta[]
157154
TS k8s
158155
| STATS events = sum(idelta(events_received)) by pod, time_bucket = bucket(@timestamp, 10minute)

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-min-over-time.csv-spec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ events:long | pod:keyword | time_bucket:datetime
375375

376376
min_over_time_null_values
377377
required_capability: ts_command_v0
378-
required_capability: k8s_dataset_additional_fields
379378
TS k8s | WHERE @timestamp > "2024-05-10T00:10:00.000Z" and @timestamp < "2024-05-10T00:15:00.000Z" | STATS events = sum(min_over_time(events_received)) by pod, time_bucket = bucket(@timestamp, 1minute) | SORT events NULLS FIRST, time_bucket | LIMIT 10;
380379

381380
events:long | pod:keyword | time_bucket:datetime

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries-present-over-time.csv-spec‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
present_over_time_events_received
22
required_capability: ts_command_v0
3-
required_capability: present_over_time
43

54
TS k8s
65
| WHERE cluster == "prod" AND pod == "two"
@@ -135,8 +134,6 @@ true | staging | 2024-05-10T00:20:00.000Z
135134

136135
present_over_time_of_keyword
137136
required_capability: ts_command_v0
138-
required_capability: present_over_time
139-
required_capability: k8s_dataset_additional_fields
140137
TS k8s | STATS is_present = max(present_over_time(network.eth0.up)) BY cluster, time_bucket = tbucket(10minute) | SORT time_bucket, cluster | LIMIT 10;
141138

142139
is_present:boolean | cluster:keyword | time_bucket:datetime

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries.csv-spec‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ max_cost: double
4949

5050
maxRateAndBytes
5151
required_capability: ts_command_v0
52-
required_capability: implicit_last_over_time
5352
TS k8s | STATS max(60 * rate(network.total_bytes_in)), max(network.bytes_in);
5453

5554
max(60 * rate(network.total_bytes_in)): double | max(network.bytes_in): long
@@ -239,7 +238,6 @@ null | three | 2024-05-10T00:01:00.000
239238

240239
max_over_time
241240
required_capability: ts_command_v0
242-
required_capability: max_over_time
243241
// tag::max_over_time[]
244242
TS k8s
245243
| STATS cost=sum(max_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute)
@@ -263,7 +261,6 @@ cost:double | cluster:keyword | time_bucket:datetime
263261

264262
min_over_time
265263
required_capability: ts_command_v0
266-
required_capability: min_over_time
267264
// tag::min_over_time[]
268265
TS k8s
269266
| STATS cost=sum(min_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute)
@@ -287,7 +284,6 @@ cost:double | cluster:keyword | time_bucket:datetime
287284

288285
max_of_avg_over_time
289286
required_capability: ts_command_v0
290-
required_capability: avg_over_time
291287
// tag::avg_over_time[]
292288
TS k8s
293289
| STATS max_cost=max(avg_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute)
@@ -311,7 +307,6 @@ max_cost:double | cluster:keyword | time_bucket:datetime
311307

312308
avg_of_avg_over_time
313309
required_capability: ts_command_v0
314-
required_capability: avg_over_time
315310
TS k8s | STATS avg_cost=avg(avg_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute) | SORT avg_cost DESC, time_bucket DESC, cluster | LIMIT 10;
316311

317312
avg_cost:double | cluster:keyword | time_bucket:datetime
@@ -330,7 +325,6 @@ avg_cost:double | cluster:keyword | time_bucket:datetime
330325

331326
max_of_last_over_time
332327
required_capability: ts_command_v0
333-
required_capability: last_over_time
334328
// tag::last_over_time[]
335329
TS k8s
336330
| STATS max_cost=max(last_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute)
@@ -354,7 +348,6 @@ max_cost:double | cluster:keyword | time_bucket:datetime
354348

355349
max_of_first_over_time
356350
required_capability: ts_command_v0
357-
required_capability: first_over_time
358351
// tag::first_over_time[]
359352
TS k8s
360353
| STATS max_cost=max(first_over_time(network.cost)) BY cluster, time_bucket = bucket(@timestamp,1minute)
@@ -378,7 +371,6 @@ max_cost:double | cluster:keyword | time_bucket:datetime
378371

379372
sum_over_time
380373
required_capability: ts_command_v0
381-
required_capability: sum_over_time
382374

383375
// tag::sum_over_time[]
384376
TS k8s
@@ -405,7 +397,6 @@ sum_cost:double | cluster:keyword | time_bucket:datetime
405397

406398
count_over_time
407399
required_capability: ts_command_v0
408-
required_capability: count_over_time
409400

410401
// tag::count_over_time[]
411402
TS k8s
@@ -432,7 +423,6 @@ count:long | cluster:keyword | time_bucket:datetime
432423
;
433424
count_distinct_over_time
434425
required_capability: ts_command_v0
435-
required_capability: count_distinct_over_time
436426

437427
// tag::count_distinct_over_time[]
438428
TS k8s
@@ -474,7 +464,6 @@ cost_per_mb:double | cluster:keyword | time_bucket:datetime
474464

475465
present_over_time
476466
required_capability: ts_command_v0
477-
required_capability: present_over_time
478467

479468
// tag::present_over_time[]
480469
TS k8s
@@ -501,7 +490,6 @@ true | two | 2024-05-10T00:22:00.000Z
501490

502491
absent_over_time
503492
required_capability: ts_command_v0
504-
required_capability: absent_over_time
505493

506494
// tag::absent_over_time[]
507495
TS k8s

0 commit comments

Comments
 (0)