Skip to content

Commit abf3c0f

Browse files
authored
Revert "[8.15] Emit deprecation warning when executing one of the rollup APIs (#113042)" (#113076)
Reverted to due test failures.
1 parent 6af6c75 commit abf3c0f

File tree

35 files changed

+28
-363
lines changed

35 files changed

+28
-363
lines changed

docs/build.gradle

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -852,9 +852,6 @@ buildRestTests.setups['library'] = '''
852852
853853
'''
854854
buildRestTests.setups['sensor_rollup_job'] = '''
855-
- requires:
856-
test_runner_features: [ "allowed_warnings" ]
857-
858855
- do:
859856
indices.create:
860857
index: dummy-rollup-index
@@ -885,10 +882,9 @@ buildRestTests.setups['sensor_rollup_job'] = '''
885882
node:
886883
type: keyword
887884
- do:
888-
allowed_warnings:
889-
- "The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information."
890-
rollup.put_job:
891-
id: sensor
885+
raw:
886+
method: PUT
887+
path: _rollup/job/sensor
892888
body: >
893889
{
894890
"index_pattern": "sensor-*",
@@ -918,9 +914,6 @@ buildRestTests.setups['sensor_rollup_job'] = '''
918914
}
919915
'''
920916
buildRestTests.setups['sensor_started_rollup_job'] = '''
921-
- requires:
922-
test_runner_features: [ "allowed_warnings" ]
923-
924917
- do:
925918
indices.create:
926919
index: dummy-rollup-index
@@ -970,10 +963,9 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
970963
{"timestamp": 1516297294000, "temperature": 202, "voltage": 4.0, "node": "c"}
971964
972965
- do:
973-
allowed_warnings:
974-
- "The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information."
975-
rollup.put_job:
976-
id: sensor
966+
raw:
967+
method: PUT
968+
path: _rollup/job/sensor
977969
body: >
978970
{
979971
"index_pattern": "sensor-*",
@@ -1002,10 +994,9 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
1002994
]
1003995
}
1004996
- do:
1005-
allowed_warnings:
1006-
- "The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information."
1007-
rollup.start_job:
1008-
id: sensor
997+
raw:
998+
method: POST
999+
path: _rollup/job/sensor/_start
10091000
'''
10101001

10111002
buildRestTests.setups['sensor_index'] = '''

docs/reference/rollup/apis/delete-job.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ If we have a rollup job named `sensor`, it can be deleted with:
8080
DELETE _rollup/job/sensor
8181
--------------------------------------------------
8282
// TEST[setup:sensor_rollup_job]
83-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
8483

8584
Which will return the response:
8685

docs/reference/rollup/apis/get-job.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ job can be retrieved with:
8989
GET _rollup/job/sensor
9090
--------------------------------------------------
9191
// TEST[setup:sensor_rollup_job]
92-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
9392

9493
The API yields the following response:
9594

@@ -193,7 +192,6 @@ PUT _rollup/job/sensor2 <1>
193192
GET _rollup/job/_all <2>
194193
--------------------------------------------------
195194
// TEST[setup:sensor_rollup_job]
196-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
197195
<1> We create a second job with name `sensor2`
198196
<2> Then request all jobs by using `_all` in the GetJobs API
199197

docs/reference/rollup/apis/put-job.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ PUT _rollup/job/sensor
281281
}
282282
--------------------------------------------------
283283
// TEST[setup:sensor_index]
284-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
285284
<1> This configuration enables date histograms to be used on the `timestamp`
286285
field and `terms` aggregations to be used on the `node` field.
287286
<2> This configuration defines metrics over two fields: `temperature` and

docs/reference/rollup/apis/rollup-caps.asciidoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ PUT _rollup/job/sensor
8383
}
8484
--------------------------------------------------
8585
// TEST[setup:sensor_index]
86-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
8786

8887
We can then retrieve the rollup capabilities of that index pattern (`sensor-*`)
8988
via the following command:
@@ -93,7 +92,6 @@ via the following command:
9392
GET _rollup/data/sensor-*
9493
--------------------------------------------------
9594
// TEST[continued]
96-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
9795

9896
Which will yield the following response:
9997

@@ -166,7 +164,6 @@ We could also retrieve the same information with a request to `_all`:
166164
GET _rollup/data/_all
167165
--------------------------------------------------
168166
// TEST[continued]
169-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
170167

171168
But note that if we use the concrete index name (`sensor-1`), we'll retrieve no
172169
rollup capabilities:
@@ -176,7 +173,6 @@ rollup capabilities:
176173
GET _rollup/data/sensor-1
177174
--------------------------------------------------
178175
// TEST[continued]
179-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
180176

181177
[source,console-result]
182178
----

docs/reference/rollup/apis/rollup-index-caps.asciidoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ PUT _rollup/job/sensor
8080
}
8181
--------------------------------------------------
8282
// TEST[setup:sensor_index]
83-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
8483

8584
If at a later date, we'd like to determine what jobs and capabilities were
8685
stored in the `sensor_rollup` index, we can use the get rollup index API:
@@ -90,7 +89,6 @@ stored in the `sensor_rollup` index, we can use the get rollup index API:
9089
GET /sensor_rollup/_rollup/data
9190
--------------------------------------------------
9291
// TEST[continued]
93-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
9492

9593
Note how we are requesting the concrete rollup index name (`sensor_rollup`) as
9694
the first part of the URL. This will yield the following response:
@@ -166,4 +164,3 @@ instead of explicit indices:
166164
GET /*_rollup/_rollup/data
167165
--------------------------------------------------
168166
// TEST[continued]
169-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]

docs/reference/rollup/apis/rollup-search.asciidoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ PUT _rollup/job/sensor
105105
}
106106
--------------------------------------------------
107107
// TEST[setup:sensor_index]
108-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
109108

110109
This rolls up the `sensor-*` pattern and stores the results in `sensor_rollup`.
111110
To search this rolled up data, we need to use the `_rollup_search` endpoint.
@@ -128,7 +127,6 @@ GET /sensor_rollup/_rollup_search
128127
--------------------------------------------------
129128
// TEST[setup:sensor_prefab_data]
130129
// TEST[s/_rollup_search/_rollup_search?filter_path=took,timed_out,terminated_early,_shards,hits,aggregations/]
131-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
132130

133131
The query is targeting the `sensor_rollup` data, since this contains the rollup
134132
data as configured in the job. A `max` aggregation has been used on the
@@ -184,7 +182,6 @@ GET sensor_rollup/_rollup_search
184182
--------------------------------------------------
185183
// TEST[continued]
186184
// TEST[catch:/illegal_argument_exception/]
187-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
188185

189186
[source,console-result]
190187
----
@@ -228,7 +225,6 @@ GET sensor-1,sensor_rollup/_rollup_search <1>
228225
--------------------------------------------------
229226
// TEST[continued]
230227
// TEST[s/_rollup_search/_rollup_search?filter_path=took,timed_out,terminated_early,_shards,hits,aggregations/]
231-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
232228
<1> Note the URI now searches `sensor-1` and `sensor_rollup` at the same time
233229

234230
When the search is executed, the rollup search endpoint does two things:

docs/reference/rollup/apis/start-job.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ If we have already created a {rollup-job} named `sensor`, it can be started with
5151
POST _rollup/job/sensor/_start
5252
--------------------------------------------------
5353
// TEST[setup:sensor_rollup_job]
54-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
5554

5655
Which will return the response:
5756

@@ -60,4 +59,4 @@ Which will return the response:
6059
{
6160
"started": true
6261
}
63-
----
62+
----

docs/reference/rollup/apis/stop-job.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ the indexer has fully stopped. This is accomplished with the
7676
POST _rollup/job/sensor/_stop?wait_for_completion=true&timeout=10s
7777
--------------------------------------------------
7878
// TEST[setup:sensor_started_rollup_job]
79-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
8079

8180
The parameter blocks the API call from returning until either the job has moved
8281
to `STOPPED` or the specified time has elapsed. If the specified time elapses

docs/reference/rollup/migrating-to-downsampling.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ PUT _rollup/job/sensor
5151
}
5252
--------------------------------------------------
5353
// TEST[setup:sensor_index]
54-
// TEST[warning:The rollup functionality will be removed in in Elasticsearch 9.0. See docs for more information.]
5554

5655
The equivalent <<tsds,time series data stream (TSDS)>> setup that uses downsampling via DSL:
5756

0 commit comments

Comments
 (0)