|
@@ -79,6 +79,7 @@ import org.elasticsearch.xpack.core.ml.MachineLearningField;
|
|
|
import org.elasticsearch.xpack.core.ml.MlConfigIndex;
|
|
|
import org.elasticsearch.xpack.core.ml.MlMetaIndex;
|
|
|
import org.elasticsearch.xpack.core.ml.MlMetadata;
|
|
|
+import org.elasticsearch.xpack.core.ml.MlStatsIndex;
|
|
|
import org.elasticsearch.xpack.core.ml.MlTasks;
|
|
|
import org.elasticsearch.xpack.core.ml.action.CloseJobAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.DeleteCalendarAction;
|
|
@@ -130,6 +131,7 @@ import org.elasticsearch.xpack.core.ml.action.PutDatafeedAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.PutFilterAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.PutJobAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.PutTrainedModelAction;
|
|
|
+import org.elasticsearch.xpack.core.ml.action.PutTrainedModelAliasAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.RevertModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.SetUpgradeModeAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.StartDataFrameAnalyticsAction;
|
|
@@ -143,7 +145,6 @@ import org.elasticsearch.xpack.core.ml.action.UpdateFilterAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.UpdateJobAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.UpdateModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.UpdateProcessAction;
|
|
|
-import org.elasticsearch.xpack.core.ml.action.PutTrainedModelAliasAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.UpgradeJobModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.ValidateDetectorAction;
|
|
|
import org.elasticsearch.xpack.core.ml.action.ValidateJobConfigAction;
|
|
@@ -156,7 +157,6 @@ import org.elasticsearch.xpack.core.ml.inference.MlInferenceNamedXContentProvide
|
|
|
import org.elasticsearch.xpack.core.ml.inference.persistence.InferenceIndexConstants;
|
|
|
import org.elasticsearch.xpack.core.ml.job.config.JobTaskState;
|
|
|
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
|
|
|
-import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields;
|
|
|
import org.elasticsearch.xpack.core.ml.job.snapshot.upgrade.SnapshotUpgradeTaskState;
|
|
|
import org.elasticsearch.xpack.core.ml.notifications.NotificationsIndex;
|
|
|
import org.elasticsearch.xpack.core.template.TemplateUtils;
|
|
@@ -210,6 +210,7 @@ import org.elasticsearch.xpack.ml.action.TransportPutDatafeedAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportPutFilterAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportPutJobAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportPutTrainedModelAction;
|
|
|
+import org.elasticsearch.xpack.ml.action.TransportPutTrainedModelAliasAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportRevertModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportSetUpgradeModeAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportStartDataFrameAnalyticsAction;
|
|
@@ -223,7 +224,6 @@ import org.elasticsearch.xpack.ml.action.TransportUpdateFilterAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportUpdateJobAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportUpdateModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportUpdateProcessAction;
|
|
|
-import org.elasticsearch.xpack.ml.action.TransportPutTrainedModelAliasAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportUpgradeJobModelSnapshotAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportValidateDetectorAction;
|
|
|
import org.elasticsearch.xpack.ml.action.TransportValidateJobConfigAction;
|
|
@@ -367,6 +367,8 @@ import java.util.function.UnaryOperator;
|
|
|
import static java.util.Collections.emptyList;
|
|
|
import static java.util.Collections.singletonList;
|
|
|
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
|
|
|
+import static org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields.RESULTS_INDEX_PREFIX;
|
|
|
+import static org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields.STATE_INDEX_PREFIX;
|
|
|
|
|
|
public class MachineLearning extends Plugin implements SystemIndexPlugin,
|
|
|
AnalysisPlugin,
|
|
@@ -1096,7 +1098,7 @@ public class MachineLearning extends Plugin implements SystemIndexPlugin,
|
|
|
List<String> templateNames =
|
|
|
Arrays.asList(
|
|
|
NotificationsIndex.NOTIFICATIONS_INDEX,
|
|
|
- AnomalyDetectorsIndexFields.STATE_INDEX_PREFIX,
|
|
|
+ STATE_INDEX_PREFIX,
|
|
|
AnomalyDetectorsIndex.jobResultsIndexPrefix());
|
|
|
for (String templateName : templateNames) {
|
|
|
allPresent = allPresent && TemplateUtils.checkTemplateExistsAndVersionIsGTECurrentVersion(templateName, clusterState);
|
|
@@ -1217,6 +1219,17 @@ public class MachineLearning extends Plugin implements SystemIndexPlugin,
|
|
|
.build();
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Collection<String> getAssociatedIndexPatterns() {
|
|
|
+ return List.of(
|
|
|
+ RESULTS_INDEX_PREFIX + "*",
|
|
|
+ STATE_INDEX_PREFIX + "*",
|
|
|
+ MlStatsIndex.indexPattern(),
|
|
|
+ ".ml-notifications*",
|
|
|
+ ".ml-annotations*"
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public String getFeatureName() {
|
|
|
return "machine_learning";
|