Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] [DOCS] Remove docs for rollup refactor (#70885) #70911

Merged
merged 1 commit into from
Mar 26, 2021
Merged
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
1 change: 0 additions & 1 deletion docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ testClusters.integTest {
if (singleNode().testDistribution == DEFAULT) {
setting 'xpack.license.self_generated.type', 'trial'
setting 'indices.lifecycle.history_index_enabled', 'false'
systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
systemProperty 'es.shutdown_feature_flag_enabled', 'true'
keystorePassword 'keystore-password'
}
Expand Down
14 changes: 0 additions & 14 deletions docs/reference/glossary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -356,18 +356,6 @@ A rollover can target a <<glossary-data-stream,data stream>> or an
<<glossary-index-alias,index alias>> with a write index.
// end::rollover-def[]

ifdef::permanently-unreleased-branch[]

[[glossary-rollup]] rollup::
// tag::rollup-def[]
Aggregates an <<glossary-index,index>>'s time series data and stores the results
in a new read-only index. For example, you can roll up hourly data into daily or
weekly summaries. See {ref}/xpack-rollup.html[Rollups].
// end::rollup-def[]

endif::[]
ifndef::permanently-unreleased-branch[]

[[glossary-rollup]] rollup::
// tag::rollup-def[]
Summarizes high-granularity data into a more compressed format to maintain access
Expand All @@ -391,8 +379,6 @@ The job configuration controls what data is rolled up and how often. See
{ref}/xpack-rollup.html[Rolling up historical data].
// end::rollup-job-def[]

endif::[]

[[glossary-routing]] routing::
// tag::routing-def[]
Process of sending and retrieving data from a specific
Expand Down
92 changes: 0 additions & 92 deletions docs/reference/ilm/actions/ilm-rollup.asciidoc

This file was deleted.

9 changes: 0 additions & 9 deletions docs/reference/ilm/ilm-actions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ Block write operations to the index.
Remove the index as the write index for the rollover alias and
start indexing to a new index.

ifdef::permanently-unreleased-branch[]
<<ilm-rollup,Rollup>>::
Aggregates an index's time series data and stores the results in a new read-only
index. For example, you can roll up hourly data into daily or weekly summaries.
endif::[]

<<ilm-searchable-snapshot, Searchable snapshot>>::
Take a snapshot of the managed index in the configured repository
and mount it as a searchable snapshot.
Expand All @@ -59,9 +53,6 @@ include::actions/ilm-freeze.asciidoc[]
include::actions/ilm-migrate.asciidoc[]
include::actions/ilm-readonly.asciidoc[]
include::actions/ilm-rollover.asciidoc[]
ifdef::permanently-unreleased-branch[]
include::actions/ilm-rollup.asciidoc[]
endif::[]
include::actions/ilm-searchable-snapshot.asciidoc[]
include::actions/ilm-set-priority.asciidoc[]
include::actions/ilm-shrink.asciidoc[]
Expand Down
6 changes: 0 additions & 6 deletions docs/reference/ilm/ilm-index-lifecycle.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ the rollover criteria, it could be 20 minutes before the rollover is complete.
- <<ilm-readonly,Read-Only>>
- <<ilm-shrink,Shrink>>
- <<ilm-forcemerge,Force Merge>>
ifdef::permanently-unreleased-branch[]
- <<ilm-rollup,Rollup>>
endif::[]
* Warm
- <<ilm-set-priority,Set Priority>>
- <<ilm-unfollow,Unfollow>>
Expand All @@ -106,9 +103,6 @@ endif::[]
- <<ilm-allocate,Allocate>>
- <<ilm-migrate,Migrate>>
- <<ilm-freeze,Freeze>>
ifdef::permanently-unreleased-branch[]
- <<ilm-rollup,Rollup>>
endif::[]
- <<ilm-searchable-snapshot, Searchable Snapshot>>
* Frozen
- <<ilm-searchable-snapshot, Searchable Snapshot>>
Expand Down
41 changes: 5 additions & 36 deletions docs/reference/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1439,42 +1439,6 @@ See <<search-aggregations-matrix-stats-aggregation>>.

See <<fielddata-mapping-param>>.

ifdef::permanently-unreleased-branch[]
[role="exclude",id="rollup-overview"]
=== {rollup-cap} overview

// tag::legacy-rollup-redirect[]
Legacy rollups are deprecated and will be replaced by <<xpack-rollup,new rollup
functionality>> introduced in Elasticsearch 7.x. For legacy rollup API
documentation, see <<legacy-rollup-apis>>.
// end::legacy-rollup-redirect[]

[role="exclude",id="rollup-getting-started"]
=== Getting started with {rollups}

include::redirects.asciidoc[tag=legacy-rollup-redirect]

[role="exclude",id="rollup-api-quickref"]
=== {rollup-cap} API quick reference

include::redirects.asciidoc[tag=legacy-rollup-redirect]

[role="exclude",id="rollup-understanding-groups"]
=== Understanding rollup groups

include::redirects.asciidoc[tag=legacy-rollup-redirect]

[role="exclude",id="rollup-agg-limitations"]
=== {rollup-cap} aggregation limitations

include::redirects.asciidoc[tag=legacy-rollup-redirect]

[role="exclude",id="rollup-search-limitations"]
=== {rollup-cap} search limitations

include::redirects.asciidoc[tag=legacy-rollup-redirect]
endif::[]

[role="exclude",id="pipeline"]
=== Pipeline definition

Expand Down Expand Up @@ -1525,3 +1489,8 @@ See <<processors>>.
=== Enrich policy definition

See <<put-enrich-policy-api>>.

[role="exclude",id="rollup-api"]
=== Rollup API

See <<rollup-apis>>.
20 changes: 0 additions & 20 deletions docs/reference/rollup/apis/delete-job.asciidoc
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
ifdef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-delete-job]]
=== Delete legacy {rollup-jobs} API
[subs="attributes"]
++++
<titleabbrev>Delete legacy {rollup-jobs}</titleabbrev>
++++

include::put-job.asciidoc[tag=legacy-rollup-admon]

Deletes a legacy {rollup-job}.

endif::[]
ifndef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-delete-job]]
Expand All @@ -29,8 +11,6 @@ Deletes an existing {rollup-job}.

experimental[]

endif::[]

[[rollup-delete-job-request]]
==== {api-request-title}

Expand Down
19 changes: 0 additions & 19 deletions docs/reference/rollup/apis/get-job.asciidoc
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
ifdef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-get-job]]
=== Get legacy {rollup-jobs} API
++++
<titleabbrev>Get legacy job</titleabbrev>
++++

include::put-job.asciidoc[tag=legacy-rollup-admon]

Gets the configuration, stats, and status of legacy {rollup-jobs}.

endif::[]
ifndef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-get-job]]
Expand All @@ -27,8 +10,6 @@ Retrieves the configuration, stats, and status of {rollup-jobs}.

experimental[]

endif::[]

[[rollup-get-job-request]]
==== {api-request-title}

Expand Down
24 changes: 0 additions & 24 deletions docs/reference/rollup/apis/put-job.asciidoc
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
ifdef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-put-job]]
=== Create legacy {rollup-jobs} API
[subs="attributes"]
++++
<titleabbrev>Create legacy {rollup-jobs}</titleabbrev>
++++

// tag::legacy-rollup-admon[]
WARNING: This documentation is about legacy rollups. Legacy rollups are
deprecated and will be replaced by <<xpack-rollup,new rollup functionality>>
introduced in {es} 7.x.
// end::legacy-rollup-admon[]

Creates a legacy {rollup-job}.

endif::[]
ifndef::permanently-unreleased-branch[]

[role="xpack"]
[testenv="basic"]
[[rollup-put-job]]
Expand All @@ -33,8 +11,6 @@ Creates a {rollup-job}.

experimental[]

endif::[]

[[rollup-put-job-api-request]]
==== {api-request-title}

Expand Down
Loading