Skip to content

Commit 340afbc

Browse files
limotovalimotova
committed
[ES|QL] Remove deprecated TS and agg metric capabilities
1 parent 310a1d4 commit 340afbc

13 files changed

+2
-229
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(pod)) 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
@@ -190,8 +190,6 @@ bytes:long | pod:keyword | time_bucket:datetime | kb:double
190190

191191
count_distinct_over_time_multi_values
192192
required_capability: ts_command_v0
193-
required_capability: count_distinct_over_time
194-
required_capability: k8s_dataset_additional_fields
195193
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;
196194

197195
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 & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
delta_of_double_no_grouping
22
required_capability: ts_command_v0
3-
required_capability: delta_ts_agg
43
// tag::delta[]
54
TS k8s
65
| STATS cost_change=sum(delta(network.cost)) BY time_bucket = bucket(@timestamp,1minute)
@@ -25,8 +24,6 @@ null | 2024-05-10T00:01:00.000Z
2524

2625
delta_of_integer
2726
required_capability: ts_command_v0
28-
required_capability: delta_ts_agg
29-
required_capability: k8s_dataset_additional_fields
3027
TS k8s | STATS clients = avg(delta(network.eth0.currently_connected_clients)) BY time_bucket = bucket(@timestamp,1minute) | SORT time_bucket | LIMIT 10;
3128

3229
clients:double | time_bucket:datetime
@@ -45,8 +42,6 @@ null | 2024-05-10T00:01:00.000Z
4542

4643
delta_of_integer_grouping
4744
required_capability: ts_command_v0
48-
required_capability: delta_ts_agg
49-
required_capability: k8s_dataset_additional_fields
5045
TS k8s | STATS clients = avg(delta(network.eth0.currently_connected_clients)) BY cluster, time_bucket = bucket(@timestamp,1minute) | SORT time_bucket, cluster | LIMIT 10;
5146

5247
clients:double | cluster:keyword | time_bucket:datetime
@@ -65,7 +60,6 @@ null | prod | 2024-05-10T00:03:00.000Z
6560

6661
delta_with_filtering
6762
required_capability: ts_command_v0
68-
required_capability: delta_ts_agg
6963
// tag::delta[]
7064
TS k8s
7165
| WHERE pod == "one"
@@ -89,7 +83,6 @@ tx:double | cluster:keyword | time_bucket:datetime
8983

9084
delta_with_inline_filtering
9185
required_capability: ts_command_v0
92-
required_capability: delta_ts_agg
9386
TS k8s
9487
| STATS tx = sum(delta(network.bytes_in)) WHERE pod == "one" BY cluster, time_bucket = bucket(@timestamp, 10minute)
9588
| SORT time_bucket, cluster | LIMIT 10;
@@ -108,7 +101,6 @@ tx:double | cluster:keyword | time_bucket:datetime
108101

109102
eval_on_delta
110103
required_capability: ts_command_v0
111-
required_capability: delta_ts_agg
112104
TS k8s | STATS avg_bytes = avg(delta(network.bytes_in)) BY cluster, time_bucket = bucket(@timestamp, 10minute) | EVAL kb_minus_offset = (avg_bytes - 100) / 1000.0 | LIMIT 10 | SORT time_bucket, cluster ;
113105

114106
avg_bytes:double | cluster:keyword | time_bucket:datetime | kb_minus_offset:double
@@ -125,8 +117,6 @@ avg_bytes:double | cluster:keyword | time_bucket:datetime | kb_minus_offs
125117

126118
delta_multi_values
127119
required_capability: ts_command_v0
128-
required_capability: delta_ts_agg
129-
required_capability: k8s_dataset_additional_fields
130120
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;
131121

132122
events:double | pod:keyword | time_bucket:datetime
@@ -145,8 +135,6 @@ null | two | 2024-05-10T00:07:00.000Z
145135

146136
delta_null_values
147137
required_capability: ts_command_v0
148-
required_capability: delta_ts_agg
149-
required_capability: k8s_dataset_additional_fields
150138
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;
151139

152140
events:double | pod:keyword | time_bucket:datetime
@@ -166,8 +154,6 @@ null | two | 2024-05-10T00:13:00.000Z
166154

167155
delta_all_value_types
168156
required_capability: ts_command_v0
169-
required_capability: delta_ts_agg
170-
required_capability: k8s_dataset_additional_fields
171157
TS k8s | STATS events = sum(delta(events_received)) by pod, time_bucket = bucket(@timestamp, 10minute) | SORT events desc, pod, time_bucket | LIMIT 10 ;
172158

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ events:long | pod:keyword | time_bucket:datetime
128128

129129
first_over_time_counter_double
130130
required_capability: ts_command_v0
131-
required_capability: first_last_over_time_counter_support
132131
TS k8s
133132
| STATS sum = sum(first_over_time(network.total_cost)) by pod, time_bucket = bucket(@timestamp, 10minute)
134133
| SORT time_bucket, pod
@@ -148,7 +147,6 @@ sum:double | pod:keyword | time_bucket:datetime
148147

149148
first_over_time_counter_long
150149
required_capability: ts_command_v0
151-
required_capability: first_last_over_time_counter_support
152150
TS k8s
153151
| STATS max = max(first_over_time(network.total_bytes_in)) by pod, time_bucket = bucket(@timestamp, 10minute)
154152
| SORT time_bucket, pod

‎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-increase.csv-spec‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
increase_of_long_no_grouping
2-
required_capability: increase
32
required_capability: ts_command_v0
43

54
// tag::increase[]
@@ -24,7 +23,6 @@ null | 2024-05-10T00:01:00.000Z
2423
;
2524

2625
increase_of_long_grouping
27-
required_capability: increase
2826
required_capability: ts_command_v0
2927
TS k8s
3028
| STATS increase_bytes_in=avg(increase(network.total_bytes_in)) BY cluster, time_bucket = bucket(@timestamp,5minute)
@@ -44,7 +42,6 @@ increase_bytes_in:double | cluster:keyword | time_bucket:datetime
4442
;
4543

4644
increase_of_double_no_grouping
47-
required_capability: increase
4845
required_capability: ts_command_v0
4946
TS k8s
5047
| STATS increase_cost=sum(increase(network.total_cost)) BY time_bucket = bucket(@timestamp,1minute)
@@ -66,7 +63,6 @@ null | 2024-05-10T00:01:00.000Z
6663
;
6764

6865
increase_with_filtering
69-
required_capability: increase
7066
required_capability: ts_command_v0
7167
// tag::increase[]
7268
TS k8s
@@ -90,7 +86,6 @@ increase_bytes_in:double | cluster:keyword | time_bucket:datetime
9086
;
9187

9288
increase_with_inline_filtering
93-
required_capability: increase
9489
required_capability: ts_command_v0
9590
TS k8s
9691
| STATS increase_bytes_in = sum(increase(network.total_bytes_in)) WHERE pod == "one" BY cluster, time_bucket = bucket(@timestamp, 10minute)
@@ -110,7 +105,6 @@ increase_bytes_in:double | cluster:keyword | time_bucket:datetime
110105
;
111106

112107
eval_on_increase
113-
required_capability: increase
114108
required_capability: ts_command_v0
115109
TS k8s
116110
| STATS increase_bytes = avg(increase(network.total_bytes_in)) BY cluster, time_bucket = bucket(@timestamp, 10minute)
@@ -131,7 +125,6 @@ increase_bytes:double | cluster:keyword | time_bucket:datetime | increase_kb
131125
;
132126

133127
increase_of_aggregate_metric
134-
required_capability: increase
135128
required_capability: ts_command_v0
136129
TS k8s-downsampled
137130
| STATS sum_bytes = sum(increase(network.total_bytes_in)),
@@ -145,7 +138,6 @@ sum_bytes:double | max_bytes:double | min_bytes:double | avg_bytes:double
145138
;
146139

147140
increase_of_expression
148-
required_capability: increase
149141
required_capability: ts_command_v0
150142
TS k8s
151143
| STATS increase_bytes_in=avg(increase(network.total_bytes_in) + 10) BY time_bucket = bucket(@timestamp,1minute)
@@ -166,7 +158,6 @@ null | 2024-05-10T00:01:00.000Z
166158
;
167159

168160
increase_combined_avg
169-
required_capability: increase
170161
required_capability: ts_command_v0
171162
TS k8s
172163
| STATS avg_increase_bytes = avg(increase(network.total_bytes_in)), avg_increase_cost = avg(increase(network.total_cost)) BY cluster, time_bucket = bucket(@timestamp, 10minute)
@@ -186,7 +177,6 @@ avg_increase_bytes:double | avg_increase_cost:double | cluster:keyword | time_bu
186177
;
187178

188179
increase_combined_sum
189-
required_capability: increase
190180
required_capability: ts_command_v0
191181
TS k8s
192182
| STATS sum_increase_bytes = sum(increase(network.total_bytes_in)), sum_increase_cost = sum(increase(network.total_cost)) BY cluster, time_bucket = bucket(@timestamp, 10minute)
@@ -208,7 +198,6 @@ sum_increase_bytes:double | sum_increase_cost:double | cluster:keyword | time_bu
208198
;
209199

210200
increase_of_ratio
211-
required_capability: increase
212201
required_capability: ts_command_v0
213202
TS k8s
214203
| STATS increase_of_ratio = sum(increase(network.total_cost) / increase(network.total_bytes_in)) BY cluster, time_bucket = bucket(@timestamp, 10minute)
@@ -228,7 +217,6 @@ increase_of_ratio:double | cluster:keyword | time_bucket:datetime
228217
;
229218

230219
increase_of_long_grouping_1min_nulls
231-
required_capability: increase
232220
required_capability: ts_command_v0
233221
TS k8s
234222
| STATS increase_bytes_in=avg(increase(network.total_bytes_in)) BY cluster, time_bucket = bucket(@timestamp,2minute)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ events:long | pod:keyword | time_bucket:datetime
278278

279279
last_over_time_counter_double
280280
required_capability: ts_command_v0
281-
required_capability: first_last_over_time_counter_support
282281
TS k8s
283282
| STATS sum = sum(last_over_time(network.total_cost)) by pod, time_bucket = bucket(@timestamp, 10minute)
284283
| SORT time_bucket, pod
@@ -298,7 +297,6 @@ sum:double | pod:keyword | time_bucket:datetime
298297

299298
last_over_time_counter_long
300299
required_capability: ts_command_v0
301-
required_capability: first_last_over_time_counter_support
302300
TS k8s
303301
| STATS max = max(last_over_time(network.total_bytes_in)) by pod, time_bucket = bucket(@timestamp, 10minute)
304302
| SORT time_bucket, pod

‎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
@@ -373,7 +373,6 @@ events:long | pod:keyword | time_bucket:datetime
373373

374374
min_over_time_null_values
375375
required_capability: ts_command_v0
376-
required_capability: k8s_dataset_additional_fields
377376
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;
378377

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

0 commit comments

Comments
 (0)