diff --git a/.ci/build.sh b/.ci/build.sh index 6dfc06a0912fb..b86acfd8cef1d 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk12} +JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk13} RUNTIME_JAVA_HOME=${RUNTIME_JAVA_HOME:-$HOME/.java/openjdk11} JAVA7_HOME=$HOME/.java/java7 diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties index 1c1e813553670..f5c4978113ba3 100644 --- a/.ci/java-versions.properties +++ b/.ci/java-versions.properties @@ -4,7 +4,7 @@ # build and test Elasticsearch for this branch. Valid Java versions # are 'java' or 'openjdk' followed by the major release number. -ES_BUILD_JAVA=openjdk12 +ES_BUILD_JAVA=openjdk13 ES_RUNTIME_JAVA=openjdk11 GRADLE_TASK=build diff --git a/.ci/matrix-build-javas.yml b/.ci/matrix-build-javas.yml index 202fd60edea4c..49b904f2c32ac 100644 --- a/.ci/matrix-build-javas.yml +++ b/.ci/matrix-build-javas.yml @@ -6,4 +6,4 @@ # or 'openjdk' followed by the major release number. ES_BUILD_JAVA: - - openjdk12 + - openjdk13 diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml index 29e3c95004fdc..9e2422d950931 100644 --- a/.ci/matrix-runtime-javas.yml +++ b/.ci/matrix-runtime-javas.yml @@ -7,11 +7,8 @@ ES_RUNTIME_JAVA: - java11 - - java12 - - openjdk12 - openjdk13 - openjdk14 - zulu11 - - zulu12 - corretto11 - adoptopenjdk11 diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh index adc4f80d4960d..759a3aae9aeb6 100755 --- a/.ci/packer_cache.sh +++ b/.ci/packer_cache.sh @@ -21,5 +21,6 @@ export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA} export JAVA8_HOME="${HOME}"/.java/java8 export JAVA11_HOME="${HOME}"/.java/java11 export JAVA12_HOME="${HOME}"/.java/openjdk12 +export JAVA13_HOME="${HOME}"/.java/openjdk13 ./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 53935ec15feb4..ed96a2449568a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,16 +92,16 @@ Contributing to the Elasticsearch codebase **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) -JDK 12 is required to build Elasticsearch. You must have a JDK 12 installation +JDK 13 is required to build Elasticsearch. You must have a JDK 13 installation with the environment variable `JAVA_HOME` referencing the path to Java home for -your JDK 12 installation. By default, tests use the same runtime as `JAVA_HOME`. +your JDK 13 installation. By default, tests use the same runtime as `JAVA_HOME`. However, since Elasticsearch supports JDK 11, the build supports compiling with -JDK 12 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME` +JDK 13 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME` pointing to the Java home of a JDK 11 installation. Note that this mechanism can be used to test against other JDKs as well, this is not only limited to JDK 11. > Note: It is also required to have `JAVA8_HOME`, `JAVA9_HOME`, `JAVA10_HOME` -and `JAVA11_HOME` available so that the tests can pass. +and `JAVA11_HOME`, and `JAVA12_HOME` available so that the tests can pass. > Warning: do not use `sdkman` for Java installations which do not have proper `jrunscript` for jdk distributions. diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy index 8bc47407b1754..52f98330ee50d 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy @@ -24,6 +24,7 @@ import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.info.BuildParams +import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.plugins.JavaBasePlugin @@ -145,16 +146,13 @@ class PrecommitTasks { doFirst { // we need to defer this configuration since we don't know the runtime java version until execution time targetCompatibility = BuildParams.runtimeJavaVersion.majorVersion - /* - TODO: Reenable once Gradle supports Java 13 or later! if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_13) { - project.logger.info( - "Forbidden APIs does not support java version past 13. Will use the signatures from 13 for ", - BuildParams.runtimeJavaVersion` + project.logger.warn( + "Forbidden APIs does not support Java versions past 13. Will use the signatures from 13 for {}.", + BuildParams.runtimeJavaVersion ) - targetCompatibility = JavaVersion.VERSION_13.getMajorVersion() + targetCompatibility = JavaVersion.VERSION_13.majorVersion } - */ } bundledSignatures = [ "jdk-unsafe", "jdk-deprecated", "jdk-non-portable", "jdk-system-out" diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java index 45a1fc0266b65..e8294ce738b7f 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java @@ -75,7 +75,7 @@ public class DistroTestPlugin implements Plugin { private static final String SYSTEM_JDK_VERSION = "11.0.2+9"; private static final String SYSTEM_JDK_VENDOR = "openjdk"; - private static final String GRADLE_JDK_VERSION = "12.0.1+12@69cfe15208a647278a19ef0990eea691"; + private static final String GRADLE_JDK_VERSION = "13.0.1+9@cec27d702aa74d5a8630c65ae61e4305"; private static final String GRADLE_JDK_VENDOR = "openjdk"; // all distributions used by distro tests. this is temporary until tests are per distribution diff --git a/buildSrc/src/main/resources/minimumCompilerVersion b/buildSrc/src/main/resources/minimumCompilerVersion index 3cacc0b93c9c9..b1bd38b62a080 100644 --- a/buildSrc/src/main/resources/minimumCompilerVersion +++ b/buildSrc/src/main/resources/minimumCompilerVersion @@ -1 +1 @@ -12 \ No newline at end of file +13 diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java b/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java index 9fba20c7db77c..19748de1b96f1 100644 --- a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java +++ b/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java @@ -137,7 +137,7 @@ private static T value(T object) { } private static String propertyName(String methodName) { - String propertyName = methodName.substring("get".length()); + String propertyName = methodName.startsWith("is") ? methodName.substring("is".length()) : methodName.substring("get".length()); return propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1); } diff --git a/docs/reference/ml/anomaly-detection/apis/get-job-stats.asciidoc b/docs/reference/ml/anomaly-detection/apis/get-job-stats.asciidoc index 99928e43ca5f3..4ef7704fe9fd0 100644 --- a/docs/reference/ml/anomaly-detection/apis/get-job-stats.asciidoc +++ b/docs/reference/ml/anomaly-detection/apis/get-job-stats.asciidoc @@ -53,11 +53,274 @@ include::{docdir}/ml/ml-shared.asciidoc[tag=allow-no-jobs] [[ml-get-job-stats-results]] ==== {api-response-body-title} -The API returns the following information: +The API returns the following information about the operational progress of a +job: -`jobs`:: -(array) -include::{docdir}/ml/ml-shared.asciidoc[tag=jobs-stats-anomaly-detection] +`assignment_explanation`:: +(string) For open jobs only, contains messages relating to the selection +of a node to run the job. + +[[datacounts]]`data_counts`:: +(object) An object that describes the quantity of input to the job and any +related error counts. The `data_count` values are cumulative for the lifetime of +a job. If a model snapshot is reverted or old results are deleted, the job +counts are not reset. + +`bucket_count`::: +(long) The number of bucket results produced by the job. + +`earliest_record_timestamp`::: +(date) The timestamp of the earliest chronologically input document. + +`empty_bucket_count`::: +(long) The number of buckets which did not contain any data. If your data +contains many empty buckets, consider increasing your `bucket_span` or using +functions that are tolerant to gaps in data such as `mean`, `non_null_sum` or +`non_zero_count`. + +`input_bytes`::: +(long) The number of bytes of input data posted to the job. + +`input_field_count`::: +(long) The total number of fields in input documents posted to the job. This +count includes fields that are not used in the analysis. However, be aware that +if you are using a {dfeed}, it extracts only the required fields from the +documents it retrieves before posting them to the job. + +`input_record_count`::: +(long) The number of input documents posted to the job. + +`invalid_date_count`::: +(long) The number of input documents with either a missing date field or a date +that could not be parsed. + +`job_id`::: +(string) +include::{docdir}/ml/ml-shared.asciidoc[tag=job-id-anomaly-detection] + +`last_data_time`::: +(date) The timestamp at which data was last analyzed, according to server time. + +`latest_empty_bucket_timestamp`::: +(date) The timestamp of the last bucket that did not contain any data. + +`latest_record_timestamp`::: +(date) The timestamp of the latest chronologically input document. + +`latest_sparse_bucket_timestamp`::: +(date) The timestamp of the last bucket that was considered sparse. + +`missing_field_count`::: +(long) The number of input documents that are missing a field that the job is +configured to analyze. Input documents with missing fields are still processed +because it is possible that not all fields are missing. The value of +`processed_record_count` includes this count. ++ +-- +NOTE: If you are using {dfeeds} or posting data to the job in JSON format, a +high `missing_field_count` is often not an indication of data issues. It is not +necessarily a cause for concern. + +-- + +`out_of_order_timestamp_count`::: +(long) The number of input documents that are out of time sequence and outside +of the latency window. This information is applicable only when you provide data +to the job by using the <>. These out of order +documents are discarded, since jobs require time series data to be in ascending +chronological order. + +`processed_field_count`::: +(long) The total number of fields in all the documents that have been processed +by the job. Only fields that are specified in the detector configuration object +contribute to this count. The timestamp is not included in this count. + +`processed_record_count`::: +(long) The number of input documents that have been processed by the job. This +value includes documents with missing fields, since they are nonetheless +analyzed. If you use {dfeeds} and have aggregations in your search query, the +`processed_record_count` will be the number of aggregation results processed, +not the number of {es} documents. + +`sparse_bucket_count`::: +(long) The number of buckets that contained few data points compared to the +expected number of data points. If your data contains many sparse buckets, +consider using a longer `bucket_span`. + +[[forecastsstats]]`forecasts_stats`:: +(object) An object that provides statistical information about forecasts +of this job. It has the following properties: ++ +-- +NOTE: Unless there is at least one forecast, `memory_bytes`, `records`, +`processing_time_ms` and `status` properties are omitted. + +-- + +`forecasted_jobs`::: +(long) The number of jobs that have at least one forecast. + +`memory_bytes`::: +(object) Statistics about the memory usage: minimum, maximum, average and total. + +`records`::: +(object) Statistics about the number of forecast records: minimum, maximum, +saverage and total. + +`processing_time_ms`::: +(object) Statistics about the forecast runtime in milliseconds: minimum, maximum, +average and total. + +`status`::: +(object) Counts per forecast status. For example: `{"finished" : 2}`. + +`total`::: +(long) The number of forecasts currently available for this model. + +`job_id`:: +(string) +include::{docdir}/ml/ml-shared.asciidoc[tag=job-id-anomaly-detection] + +[[modelsizestats]]`model_size_stats`:: +(object) An object that provides information about the size and contents of the +model. It has the following properties: + +`bucket_allocation_failures_count`::: +(long) The number of buckets for which new entities in incoming data were not +processed due to insufficient model memory. This situation is also signified +by a `hard_limit: memory_status` property value. + +`job_id`::: +(string) +include::{docdir}/ml/ml-shared.asciidoc[tag=job-id-anomaly-detection] + +`log_time`::: +(date) The timestamp of the `model_size_stats` according to server time. + +`memory_status`::: +(string) The status of the mathematical models. This property can have one of +the following values: ++ +-- +* `ok`: The models stayed below the configured value. +* `soft_limit`: The models used more than 60% of the configured memory limit +and older unused models will be pruned to free up space. +* `hard_limit`: The models used more space than the configured memory limit. +As a result, not all incoming data was processed. +-- + +`model_bytes`::: +(long) The number of bytes of memory used by the models. This is the maximum +value since the last time the model was persisted. If the job is closed, +this value indicates the latest size. + +`model_bytes_exceeded`::: + (long) The number of bytes over the high limit for memory usage at the last + allocation failure. + +`model_bytes_memory_limit`::: +(long) The upper limit for memory usage, checked on increasing values. + +`result_type`::: +(string) For internal use. The type of result. + +`total_by_field_count`::: +(long) The number of `by` field values that were analyzed by the models. ++ +-- +NOTE: The `by` field values are counted separately for each detector and +partition. + +-- + +`total_over_field_count`::: +(long) The number of `over` field values that were analyzed by the models. ++ +-- +NOTE: The `over` field values are counted separately for each detector and +partition. + +-- + +`total_partition_field_count`::: +(long) The number of `partition` field values that were analyzed by the models. + +`timestamp`::: +(date) The timestamp of the `model_size_stats` according to the timestamp of the +data. + +[[stats-node]]`node`:: +(object) Contains properties for the node that runs the job. This information is +available only for open jobs. + +`attributes`::: +(object) Lists node attributes. For example, +`{"ml.machine_memory": "17179869184", "ml.max_open_jobs" : "20"}`. + +`ephemeral_id`::: +(string) The ephemeral ID of the node. + +`id`::: +(string) The unique identifier of the node. + +`name`::: +(string) The node name. + +`transport_address`::: +(string) The host and port where transport HTTP connections are accepted. + +`open_time`:: +(string) For open jobs only, the elapsed time for which the job has been open. +For example, `28746386s`. + +`state`:: +(string) The status of the job, which can be one of the following values: ++ +-- +* `closed`: The job finished successfully with its model state persisted. The +job must be opened before it can accept further data. +* `closing`: The job close action is in progress and has not yet completed. A +closing job cannot accept further data. +* `failed`: The job did not finish successfully due to an error. This situation +can occur due to invalid input data, a fatal error occurring during the analysis, +or an external interaction such as the process being killed by the Linux out of +memory (OOM) killer. If the job had irrevocably failed, it must be force closed +and then deleted. If the {dfeed} can be corrected, the job can be closed and +then re-opened. +* `opened`: The job is available to receive and process data. +* `opening`: The job open action is in progress and has not yet completed. +-- + +[[timingstats]]`timing_stats`:: +(object) An object that provides statistical information about timing aspect of +this job. It has the following properties: + +`average_bucket_processing_time_ms`::: +(double) Average of all bucket processing times in milliseconds. + +`bucket_count`::: +(long) The number of buckets processed. + +`exponential_average_bucket_processing_time_ms`::: +(double) Exponential moving average of all bucket processing times in +milliseconds. + +`exponential_average_bucket_processing_time_per_hour_ms`::: +(double) Exponentially-weighted moving average of bucket processing times +calculated in a 1 hour time window. + +`job_id`::: +(string) +include::{docdir}/ml/ml-shared.asciidoc[tag=job-id-anomaly-detection] + +`maximum_bucket_processing_time_ms`::: +(double) Maximum among all bucket processing times in milliseconds. + +`minimum_bucket_processing_time_ms`::: +(double) Minimum among all bucket processing times in milliseconds. + +`total_bucket_processing_time_ms`::: +(double) Sum of all bucket processing times in milliseconds. [[ml-get-job-stats-response-codes]] ==== {api-response-codes-title} @@ -69,59 +332,100 @@ include::{docdir}/ml/ml-shared.asciidoc[tag=jobs-stats-anomaly-detection] [[ml-get-job-stats-example]] ==== {api-examples-title} -The following example gets usage information for the `farequote` job: - [source,console] -------------------------------------------------- -GET _ml/anomaly_detectors/farequote/_stats +GET _ml/anomaly_detectors/low_request_rate/_stats -------------------------------------------------- -// TEST[skip:todo] +// TEST[skip:Kibana sample data] The API returns the following results: [source,js] ---- { - "count": 1, - "jobs": [ + "count" : 1, + "jobs" : [ { - "job_id": "farequote", - "data_counts": { - "job_id": "farequote", - "processed_record_count": 86275, - "processed_field_count": 172550, - "input_bytes": 6744714, - "input_field_count": 172550, - "invalid_date_count": 0, - "missing_field_count": 0, - "out_of_order_timestamp_count": 0, - "empty_bucket_count": 0, - "sparse_bucket_count": 15, - "bucket_count": 1528, - "earliest_record_timestamp": 1454803200000, - "latest_record_timestamp": 1455235196000, - "last_data_time": 1491948163685, - "latest_sparse_bucket_timestamp": 1455174900000, - "input_record_count": 86275 + "job_id" : "low_request_rate", + "data_counts" : { + "job_id" : "low_request_rate", + "processed_record_count" : 1216, + "processed_field_count" : 1216, + "input_bytes" : 51678, + "input_field_count" : 1216, + "invalid_date_count" : 0, + "missing_field_count" : 0, + "out_of_order_timestamp_count" : 0, + "empty_bucket_count" : 242, + "sparse_bucket_count" : 0, + "bucket_count" : 1457, + "earliest_record_timestamp" : 1575172659612, + "latest_record_timestamp" : 1580417369440, + "last_data_time" : 1576017595046, + "latest_empty_bucket_timestamp" : 1580356800000, + "input_record_count" : 1216 + }, + "model_size_stats" : { + "job_id" : "low_request_rate", + "result_type" : "model_size_stats", + "model_bytes" : 41480, + "model_bytes_exceeded" : 0, + "model_bytes_memory_limit" : 10485760, + "total_by_field_count" : 3, + "total_over_field_count" : 0, + "total_partition_field_count" : 2, + "bucket_allocation_failures_count" : 0, + "memory_status" : "ok", + "log_time" : 1576017596000, + "timestamp" : 1580410800000 + }, + "forecasts_stats" : { + "total" : 1, + "forecasted_jobs" : 1, + "memory_bytes" : { + "total" : 9179.0, + "min" : 9179.0, + "avg" : 9179.0, + "max" : 9179.0 + }, + "records" : { + "total" : 168.0, + "min" : 168.0, + "avg" : 168.0, + "max" : 168.0 + }, + "processing_time_ms" : { + "total" : 40.0, + "min" : 40.0, + "avg" : 40.0, + "max" : 40.0 + }, + "status" : { + "finished" : 1 + } }, - "model_size_stats": { - "job_id": "farequote", - "result_type": "model_size_stats", - "model_bytes": 387594, - "total_by_field_count": 21, - "total_over_field_count": 0, - "total_partition_field_count": 20, - "bucket_allocation_failures_count": 0, - "memory_status": "ok", - "log_time": 1491948163000, - "timestamp": 1455234600000 + "state" : "opened", + "node" : { + "id" : "7bmMXyWCRs-TuPfGJJ_yMw", + "name" : "node-0", + "ephemeral_id" : "hoXMLZB0RWKfR9UPPUCxXX", + "transport_address" : "127.0.0.1:9300", + "attributes" : { + "ml.machine_memory" : "17179869184", + "xpack.installed" : "true", + "ml.max_open_jobs" : "20" + } }, - "state": "closed", - "timing_stats": { - "job_id": "farequote", - "minimum_bucket_processing_time_ms": 0.0, - "maximum_bucket_processing_time_ms": 15.0, - "average_bucket_processing_time_ms": 8.75, - "exponential_average_bucket_processing_time_ms": 6.1435899 + "assignment_explanation" : "", + "open_time" : "13s", + "timing_stats" : { + "job_id" : "low_request_rate", + "bucket_count" : 1457, + "total_bucket_processing_time_ms" : 1094.000000000001, + "minimum_bucket_processing_time_ms" : 0.0, + "maximum_bucket_processing_time_ms" : 48.0, + "average_bucket_processing_time_ms" : 0.75085792724777, + "exponential_average_bucket_processing_time_ms" : 0.5571716855800993, + "exponential_average_bucket_processing_time_per_hour_ms" : 15.0 } } ] diff --git a/docs/reference/ml/anomaly-detection/apis/jobcounts.asciidoc b/docs/reference/ml/anomaly-detection/apis/jobcounts.asciidoc deleted file mode 100644 index 9f205d6f614bf..0000000000000 --- a/docs/reference/ml/anomaly-detection/apis/jobcounts.asciidoc +++ /dev/null @@ -1,260 +0,0 @@ -[role="xpack"] -[testenv="platinum"] -[[ml-jobstats]] -=== Job statistics - -The get job statistics API provides information about the operational -progress of a job. - -`assignment_explanation`:: - (string) For open jobs only, contains messages relating to the selection - of a node to run the job. - -`data_counts`:: - (object) An object that describes the number of records processed and - any related error counts. See <>. - -`job_id`:: - (string) A unique identifier for the job. - -`model_size_stats`:: - (object) An object that provides information about the size and contents of the model. - See <>. - -`forecasts_stats`:: - (object) An object that provides statistical information about forecasts - of this job. See <>. - -`timing_stats`:: - (object) An object that provides statistical information about timing aspect - of this job. See <>. - -`node`:: - (object) For open jobs only, contains information about the node where the - job runs. See <>. - -`open_time`:: - (string) For open jobs only, the elapsed time for which the job has been open. - For example, `28746386s`. - -`state`:: - (string) The status of the job, which can be one of the following values: - - `opened`::: The job is available to receive and process data. - `closed`::: The job finished successfully with its model state persisted. - The job must be opened before it can accept further data. - `closing`::: The job close action is in progress and has not yet completed. - A closing job cannot accept further data. - `failed`::: The job did not finish successfully due to an error. - This situation can occur due to invalid input data. - If the job had irrevocably failed, it must be force closed and then deleted. - If the {dfeed} can be corrected, the job can be closed and then re-opened. - `opening`::: The job open action is in progress and has not yet completed. - -[float] -[[ml-datacounts]] -==== Data Counts Objects - -The `data_counts` object describes the number of records processed -and any related error counts. - -The `data_count` values are cumulative for the lifetime of a job. If a model snapshot is reverted -or old results are deleted, the job counts are not reset. - -`bucket_count`:: - (long) The number of bucket results produced by the job. - -`earliest_record_timestamp`:: - (date) The timestamp of the earliest chronologically input document. - -`empty_bucket_count`:: - (long) The number of buckets which did not contain any data. If your data contains many - empty buckets, consider increasing your `bucket_span` or using functions that are tolerant - to gaps in data such as `mean`, `non_null_sum` or `non_zero_count`. - -`input_bytes`:: - (long) The number of raw bytes read by the job. - -`input_field_count`:: - (long) The total number of record fields read by the job. This count includes - fields that are not used in the analysis. - -`input_record_count`:: - (long) The number of data records read by the job. - -`invalid_date_count`:: - (long) The number of records with either a missing date field or a date that could not be parsed. - -`job_id`:: - (string) A unique identifier for the job. - -`last_data_time`:: - (date) The timestamp at which data was last analyzed, according to server time. - -`latest_empty_bucket_timestamp`:: - (date) The timestamp of the last bucket that did not contain any data. - -`latest_record_timestamp`:: - (date) The timestamp of the latest chronologically input document. - -`latest_sparse_bucket_timestamp`:: - (date) The timestamp of the last bucket that was considered sparse. - -`missing_field_count`:: - (long) The number of records that are missing a field that the job is - configured to analyze. Records with missing fields are still processed because - it is possible that not all fields are missing. The value of - `processed_record_count` includes this count. + - -NOTE: If you are using {dfeeds} or posting data to the job in JSON format, a -high `missing_field_count` is often not an indication of data issues. It is not -necessarily a cause for concern. - -`out_of_order_timestamp_count`:: - (long) The number of records that are out of time sequence and - outside of the latency window. This information is applicable only when - you provide data to the job by using the <>. - These out of order records are discarded, since jobs require time series data - to be in ascending chronological order. - -`processed_field_count`:: - (long) The total number of fields in all the records that have been processed - by the job. Only fields that are specified in the detector configuration - object contribute to this count. The time stamp is not included in this count. - -`processed_record_count`:: - (long) The number of records that have been processed by the job. - This value includes records with missing fields, since they are nonetheless - analyzed. + - If you use {dfeeds} and have aggregations in your search query, - the `processed_record_count` will be the number of aggregated records - processed, not the number of {es} documents. - -`sparse_bucket_count`:: - (long) The number of buckets that contained few data points compared to the - expected number of data points. If your data contains many sparse buckets, - consider using a longer `bucket_span`. - -[float] -[[ml-modelsizestats]] -==== Model Size Stats Objects - -The `model_size_stats` object has the following properties: - -`bucket_allocation_failures_count`:: - (long) The number of buckets for which new entities in incoming data were not - processed due to insufficient model memory. This situation is also signified - by a `hard_limit: memory_status` property value. - -`job_id`:: - (string) A numerical character string that uniquely identifies the job. - -`log_time`:: - (date) The timestamp of the `model_size_stats` according to server time. - -`memory_status`:: - (string) The status of the mathematical models. - This property can have one of the following values: - `ok`::: The models stayed below the configured value. - `soft_limit`::: The models used more than 60% of the configured memory limit - and older unused models will be pruned to free up space. - `hard_limit`::: The models used more space than the configured memory limit. - As a result, not all incoming data was processed. - -`model_bytes`:: - (long) The number of bytes of memory used by the models. This is the maximum - value since the last time the model was persisted. If the job is closed, - this value indicates the latest size. - -`result_type`:: - (string) For internal use. The type of result. - -`total_by_field_count`:: - (long) The number of `by` field values that were analyzed by the models.+ - -NOTE: The `by` field values are counted separately for each detector and partition. - -`total_over_field_count`:: - (long) The number of `over` field values that were analyzed by the models.+ - -NOTE: The `over` field values are counted separately for each detector and partition. - -`total_partition_field_count`:: - (long) The number of `partition` field values that were analyzed by the models. - -`timestamp`:: - (date) The timestamp of the `model_size_stats` according to the timestamp of the data. - -[float] -[[ml-forecastsstats]] -==== Forecasts Stats Objects - -The `forecasts_stats` object shows statistics about forecasts. It has the following properties: - -`total`:: - (long) The number of forecasts currently available for this model. - -`forecasted_jobs`:: - (long) The number of jobs that have at least one forecast. - -`memory_bytes`:: - (object) Statistics about the memory usage: minimum, maximum, average and total. - -`records`:: - (object) Statistics about the number of forecast records: minimum, maximum, average and total. - -`processing_time_ms`:: - (object) Statistics about the forecast runtime in milliseconds: minimum, maximum, average and total. - -`status`:: - (object) Counts per forecast status, for example: {"finished" : 2}. - -NOTE: `memory_bytes`, `records`, `processing_time_ms` and `status` require at least 1 forecast, otherwise -these fields are omitted. - -[float] -[[ml-timingstats]] -==== Timing Stats Objects - -The `timing_stats` object shows timing-related statistics about the job's progress. It has the following properties: - -`job_id`:: - (string) A numerical character string that uniquely identifies the job. - -`bucket_count`:: - (long) The number of buckets processed. - -`minimum_bucket_processing_time_ms`:: - (double) Minimum among all bucket processing times in milliseconds. - -`maximum_bucket_processing_time_ms`:: - (double) Maximum among all bucket processing times in milliseconds. - -`average_bucket_processing_time_ms`:: - (double) Average of all bucket processing times in milliseconds. - -`exponential_average_bucket_processing_time_ms`:: - (double) Exponential moving average of all bucket processing times in milliseconds. - - -[float] -[[ml-stats-node]] -==== Node Objects - -The `node` objects contains properties for the node that runs the job. -This information is available only for open jobs. - -`id`:: - (string) The unique identifier of the node. - -`name`:: - (string) The node name. - -`ephemeral_id`:: - (string) The ephemeral id of the node. - -`transport_address`:: - (string) The host and port where transport HTTP connections are accepted. - -`attributes`:: - (object) For example, {"ml.machine_memory": "17179869184"}. diff --git a/docs/reference/ml/anomaly-detection/apis/post-data.asciidoc b/docs/reference/ml/anomaly-detection/apis/post-data.asciidoc index cfd3d4ca67fdc..d4fa82b217f64 100644 --- a/docs/reference/ml/anomaly-detection/apis/post-data.asciidoc +++ b/docs/reference/ml/anomaly-detection/apis/post-data.asciidoc @@ -37,10 +37,10 @@ and upload each one separately in sequential time order. When running in real time, it is generally recommended that you perform many small uploads, rather than queueing data to upload larger files. -When uploading data, check the <> for progress. -The following records will not be processed: +When uploading data, check the job data counts for progress. +The following documents will not be processed: -* Records not in chronological order and outside the latency window +* Documents not in chronological order and outside the latency window * Records with an invalid timestamp //TBD link to Working with Out of Order timeseries concept doc @@ -109,4 +109,4 @@ the job. For example: } ---- -For more information about these properties, see <>. +For more information about these properties, see <>. diff --git a/docs/reference/ml/ml-shared.asciidoc b/docs/reference/ml/ml-shared.asciidoc index f277e6ab2e4ad..65fd370dda9ad 100644 --- a/docs/reference/ml/ml-shared.asciidoc +++ b/docs/reference/ml/ml-shared.asciidoc @@ -576,11 +576,6 @@ tag::job-id-datafeed[] The unique identifier for the job to which the {dfeed} sends data. end::job-id-datafeed[] -tag::jobs-stats-anomaly-detection[] -An array of {anomaly-job} statistics objects. -For more information, see <>. -end::jobs-stats-anomaly-detection[] - tag::lambda[] `lambda`:: (Optional, double) Regularization parameter to prevent overfitting on the diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc index afc10a4493b17..858e128944742 100644 --- a/docs/reference/redirects.asciidoc +++ b/docs/reference/redirects.asciidoc @@ -1065,4 +1065,20 @@ See the details in <>, <>, [[ml-datafeed-delayed-data-check-config]] <>, [[ml-datafeed-counts]] -<>. \ No newline at end of file +<>. + +[role="exclude",id="ml-jobstats"] +=== Job statistics + +This +[[ml-datacounts]] +page +[[ml-modelsizestats]] +was +[[ml-forecastsstats]] +deleted. +[[ml-timingstats]] +See +[[ml-stats-node]] +the details in <>. + diff --git a/docs/reference/rest-api/defs.asciidoc b/docs/reference/rest-api/defs.asciidoc index 8bdf35e62f11b..0ef152e917f8e 100644 --- a/docs/reference/rest-api/defs.asciidoc +++ b/docs/reference/rest-api/defs.asciidoc @@ -7,7 +7,6 @@ These resource definitions are used in APIs related to {ml-features} and * <> * <> -* <> * <> * <> * <> @@ -15,7 +14,6 @@ These resource definitions are used in APIs related to {ml-features} and include::{es-repo-dir}/ml/df-analytics/apis/dfanalyticsresources.asciidoc[] include::{es-repo-dir}/ml/df-analytics/apis/evaluateresources.asciidoc[] -include::{es-repo-dir}/ml/anomaly-detection/apis/jobcounts.asciidoc[] include::{es-repo-dir}/ml/anomaly-detection/apis/snapshotresource.asciidoc[] include::{xes-repo-dir}/rest-api/security/role-mapping-resources.asciidoc[] include::{es-repo-dir}/ml/anomaly-detection/apis/resultsresource.asciidoc[] diff --git a/server/src/test/java/org/elasticsearch/common/UUIDTests.java b/server/src/test/java/org/elasticsearch/common/UUIDTests.java index 1d23570064fe5..5f7dea14946e6 100644 --- a/server/src/test/java/org/elasticsearch/common/UUIDTests.java +++ b/server/src/test/java/org/elasticsearch/common/UUIDTests.java @@ -22,6 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; @@ -29,6 +30,8 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.store.Directory; +import org.apache.lucene.util.TestUtil; +import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; @@ -116,7 +119,6 @@ public void testUUIDThreaded(UUIDGenerator uuidSource) { assertEquals(count*uuids, globalSet.size()); } - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/50048") public void testCompression() throws Exception { Logger logger = LogManager.getLogger(UUIDTests.class); // Low number so that the test runs quickly, but the results are more interesting with larger numbers @@ -135,7 +137,7 @@ private static double testCompression(int numDocs, int numDocsPerSecond, int num random().nextBytes(macAddresses[i]); } UUIDGenerator generator = new TimeBasedUUIDGenerator() { - double currentTimeMillis = System.currentTimeMillis(); + double currentTimeMillis = TestUtil.nextLong(random(), 0L, 10000000000L); @Override protected long currentTimeMillis() { @@ -152,6 +154,7 @@ protected byte[] macAddress() { // the quality of this test Directory dir = newFSDirectory(createTempDir()); IndexWriterConfig config = new IndexWriterConfig() + .setCodec(Codec.forName(Lucene.LATEST_CODEC)) .setMergeScheduler(new SerialMergeScheduler()); // for reproducibility IndexWriter w = new IndexWriter(dir, config); Document doc = new Document(); diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec index ed1ae60b14c85..2c1e1126ee1da 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/agg.csv-spec @@ -657,6 +657,29 @@ SELECT COUNT(first_name)=COUNT(DISTINCT first_name) AS areEqual, COUNT(first_nam true |90 |90 ; +aggCountWithNull +schema::COUNT(NULL):l|COUNT(*):l|COUNT(DISTINCT languages):l|languages:bt +SELECT COUNT(NULL), COUNT(*), COUNT(DISTINCT languages), languages FROM test_emp GROUP BY languages ORDER BY languages DESC; + + COUNT(NULL) | COUNT(*) |COUNT(DISTINCT languages)| languages +---------------+---------------+-------------------------+--------------- +null |21 |1 |5 +null |18 |1 |4 +null |17 |1 |3 +null |19 |1 |2 +null |15 |1 |1 +null |10 |0 |null +; + +aggCountZeroDocuments +schema::COUNT(NULL):l|COUNT(*):l|COUNT(DISTINCT languages):l +SELECT COUNT(NULL), COUNT(*), COUNT(DISTINCT languages) FROM test_emp WHERE languages > 100; + + COUNT(NULL) | COUNT(*) |COUNT(DISTINCT languages) +---------------+---------------+------------------------- +null |0 |0 +; + aggCountAllEquality schema::areEqual:b|afn:l SELECT COUNT(first_name)=COUNT(ALL first_name) AS areEqual, COUNT(ALL first_name) afn FROM test_emp; diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/extractor/MetricAggExtractor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/extractor/MetricAggExtractor.java index 07309c3582200..007c7a26c4966 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/extractor/MetricAggExtractor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/extractor/MetricAggExtractor.java @@ -12,7 +12,6 @@ import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter; import org.elasticsearch.search.aggregations.matrix.stats.InternalMatrixStats; import org.elasticsearch.search.aggregations.metrics.InternalAvg; -import org.elasticsearch.search.aggregations.metrics.InternalCardinality; import org.elasticsearch.search.aggregations.metrics.InternalMax; import org.elasticsearch.search.aggregations.metrics.InternalMin; import org.elasticsearch.search.aggregations.metrics.InternalNumericMetricsAggregation; @@ -149,9 +148,6 @@ private static boolean containsValues(InternalAggregation agg) { if (agg instanceof InternalAvg) { return hasValue((InternalAvg) agg); } - if (agg instanceof InternalCardinality) { - return hasValue((InternalCardinality) agg); - } if (agg instanceof InternalSum) { return hasValue((InternalSum) agg); }