Skip to content

Remove archival functionality from 8.2 branch #85524

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Mar 31, 2022
Merged

Remove archival functionality from 8.2 branch #85524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c425cd0
Remove archival from 8.2
ywelsch Mar 31, 2022
3fa2eea
Merge remote-tracking branch 'elastic/8.2' into readd-extra-repo-flag
ywelsch Mar 31, 2022
dde003d
more remove
ywelsch Mar 31, 2022
12a5aca
fix
ywelsch Mar 31, 2022
c665556
fix
ywelsch Mar 31, 2022
5406a51
Merge remote-tracking branch 'elastic/8.2' into readd-extra-repo-flag
ywelsch Mar 31, 2022
0fb4f31
Merge branch '8.2' into readd-extra-repo-flag
elasticmachine Mar 31, 2022
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
5 changes: 0 additions & 5 deletions ...hmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,11 +1233,6 @@
"total" : 0,
"failed" : 0
}
},
"archive" : {
"available" : false,
"enabled" : true,
"indices_count" : 0
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions docs/reference/rest-api/info.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ Example response:
"available" : true,
"enabled" : true
},
"archive" : {
"available" : true,
"enabled" : true
},
"enrich" : {
"available" : true,
"enabled" : true
Expand Down
5 changes: 0 additions & 5 deletions docs/reference/rest-api/usage.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,6 @@ GET /_xpack/usage
"aggregate_metric" : {
"available" : true,
"enabled" : true
},
"archive" : {
"available" : true,
"enabled" : true,
"indices_count" : 0
}
}
------------------------------------------------------------
Expand Down
5 changes: 1 addition & 4 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.elasticsearch.xpack.core.action.XPackUsageAction;
import org.elasticsearch.xpack.core.aggregatemetric.AggregateMetricFeatureSetUsage;
import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage;
import org.elasticsearch.xpack.core.archive.ArchiveFeatureSetUsage;
import org.elasticsearch.xpack.core.async.DeleteAsyncResultAction;
import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata;
import org.elasticsearch.xpack.core.datastreams.DataStreamFeatureSetUsage;
Expand Down Expand Up @@ -559,9 +558,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
// Data Streams
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_STREAMS, DataStreamFeatureSetUsage::new),
// Data Tiers
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new),
// Archive
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.ARCHIVE, ArchiveFeatureSetUsage::new)
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new)
)
);

Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ public final class XPackField {
public static final String AGGREGATE_METRIC = "aggregate_metric";
/** Name constant for the operator privileges feature. */
public static final String OPERATOR_PRIVILEGES = "operator_privileges";
/** Name constant for the archive feature. */
public static final String ARCHIVE = "archive";

private XPackField() {}

Expand Down
4 changes: 1 addition & 3 deletions ...plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackInfoFeatureAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
public static final XPackInfoFeatureAction DATA_STREAMS = new XPackInfoFeatureAction(XPackField.DATA_STREAMS);
public static final XPackInfoFeatureAction DATA_TIERS = new XPackInfoFeatureAction(XPackField.DATA_TIERS);
public static final XPackInfoFeatureAction AGGREGATE_METRIC = new XPackInfoFeatureAction(XPackField.AGGREGATE_METRIC);
public static final XPackInfoFeatureAction ARCHIVE = new XPackInfoFeatureAction(XPackField.ARCHIVE);

public static final List<XPackInfoFeatureAction> ALL;
static {
Expand Down Expand Up @@ -75,8 +74,7 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
DATA_STREAMS,
SEARCHABLE_SNAPSHOTS,
DATA_TIERS,
AGGREGATE_METRIC,
ARCHIVE
AGGREGATE_METRIC
)
);
ALL = Collections.unmodifiableList(actions);
Expand Down
4 changes: 1 addition & 3 deletions ...lugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
public static final XPackUsageFeatureAction DATA_STREAMS = new XPackUsageFeatureAction(XPackField.DATA_STREAMS);
public static final XPackUsageFeatureAction DATA_TIERS = new XPackUsageFeatureAction(XPackField.DATA_TIERS);
public static final XPackUsageFeatureAction AGGREGATE_METRIC = new XPackUsageFeatureAction(XPackField.AGGREGATE_METRIC);
public static final XPackUsageFeatureAction ARCHIVE = new XPackUsageFeatureAction(XPackField.ARCHIVE);

static final List<XPackUsageFeatureAction> ALL = List.of(
AGGREGATE_METRIC,
Expand All @@ -67,8 +66,7 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
SQL,
TRANSFORM,
VOTING_ONLY,
WATCHER,
ARCHIVE
WATCHER
);

// public for testing
Expand Down
73 changes: 0 additions & 73 deletions ...lugin/core/src/main/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsage.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions .../core/src/test/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsageTests.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions x-pack/plugin/old-lucene-versions/build.gradle
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions .../internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/AbstractArchiveTestCase.java
View file
Open in desktop

This file was deleted.

Loading