diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSnapshot.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSnapshot.java index bc93e951f7c..13415d2bbd5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSnapshot.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSnapshot.java @@ -89,6 +89,10 @@ public class ModelSnapshot implements ToXContentObject, Writeable { */ private final Version minVersion; + /** + * This is model snapshot's creation wall clock time. + * Use {@code latestResultTimeStamp} if you need model time instead. + */ private final Date timestamp; private final String description; private final String snapshotId; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessor.java index 49a687b264b..fe2b94d2946 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessor.java @@ -332,8 +332,8 @@ public class AutodetectResultProcessor { Messages.getMessage(Messages.JOB_AUDIT_SNAPSHOT_STORED, modelSnapshot.getSnapshotId()), currentTime, XPackUser.NAME, - modelSnapshot.getTimestamp(), - modelSnapshot.getTimestamp(), + modelSnapshot.getLatestResultTimeStamp(), + modelSnapshot.getLatestResultTimeStamp(), jobId, currentTime, XPackUser.NAME, diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java index edf680b203d..c11db70f1e6 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectResultProcessorIT.java @@ -482,7 +482,8 @@ public class AutodetectResultProcessorIT extends MlSingleNodeTestCase { private static ModelSnapshot createModelSnapshot() { return new ModelSnapshot.Builder(JOB_ID) .setSnapshotId(randomAlphaOfLength(12)) - .setTimestamp(Date.from(Instant.ofEpochMilli(1000000000))) + .setLatestResultTimeStamp(Date.from(Instant.ofEpochMilli(1000_000_000))) + .setTimestamp(Date.from(Instant.ofEpochMilli(2000_000_000))) .build(); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessorTests.java index 17c1c005982..934993e2ec2 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultProcessorTests.java @@ -365,7 +365,8 @@ public class AutodetectResultProcessorTests extends ESTestCase { AutodetectResult result = mock(AutodetectResult.class); ModelSnapshot modelSnapshot = new ModelSnapshot.Builder(JOB_ID) .setSnapshotId("a_snapshot_id") - .setTimestamp(Date.from(Instant.ofEpochMilli(1000000000))) + .setLatestResultTimeStamp(Date.from(Instant.ofEpochMilli(1000_000_000))) + .setTimestamp(Date.from(Instant.ofEpochMilli(2000_000_000))) .setMinVersion(Version.CURRENT) .build(); when(result.getModelSnapshot()).thenReturn(modelSnapshot); @@ -389,8 +390,8 @@ public class AutodetectResultProcessorTests extends ESTestCase { "Job model snapshot with id [a_snapshot_id] stored", Date.from(CURRENT_TIME), XPackUser.NAME, - modelSnapshot.getTimestamp(), - modelSnapshot.getTimestamp(), + Date.from(Instant.ofEpochMilli(1000_000_000)), + Date.from(Instant.ofEpochMilli(1000_000_000)), JOB_ID, Date.from(CURRENT_TIME), XPackUser.NAME,