Merge pull request #156 from elastic/master

🤖 ESQL: Merge upstream

Author: github-actions[bot]

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/Jdk.java

@@ -23,7 +23,7 @@
 public class Jdk implements Buildable, Iterable<File> {
 
     private static final List<String> ALLOWED_ARCHITECTURES = List.of("aarch64", "x64");
-    private static final List<String> ALLOWED_VENDORS = List.of("adoptium", "openjdk");
+    private static final List<String> ALLOWED_VENDORS = List.of("adoptium", "openjdk", "zulu");
     private static final List<String> ALLOWED_PLATFORMS = List.of("darwin", "linux", "windows", "mac");
     private static final Pattern VERSION_PATTERN = Pattern.compile(
         "(\\d+)(\\.\\d+\\.\\d+(?:\\.\\d+)?)?\\+(\\d+(?:\\.\\d+)?)(@([a-f0-9]{32}))?"
@@ -37,6 +37,7 @@ public class Jdk implements Buildable, Iterable<File> {
     private final Property<String> version;
     private final Property<String> platform;
     private final Property<String> architecture;
+    private final Property<String> distributionVersion;
     private String baseVersion;
     private String major;
     private String build;
@@ -49,6 +50,7 @@ public class Jdk implements Buildable, Iterable<File> {
         this.version = objectFactory.property(String.class);
         this.platform = objectFactory.property(String.class);
         this.architecture = objectFactory.property(String.class);
+        this.distributionVersion = objectFactory.property(String.class);
     }
 
     public String getName() {
@@ -104,6 +106,14 @@ public void setArchitecture(final String architecture) {
         this.architecture.set(architecture);
     }
 
+    public String getDistributionVersion() {
+        return distributionVersion.get();
+    }
+
+    public void setDistributionVersion(String distributionVersion) {
+        this.distributionVersion.set(distributionVersion);
+    }
+
     public String getBaseVersion() {
         return baseVersion;
     }
@@ -179,6 +189,7 @@ void finalizeValues() {
         platform.finalizeValue();
         vendor.finalizeValue();
         architecture.finalizeValue();
+        distributionVersion.finalizeValue();
     }
 
     @Override

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java

@@ -26,6 +26,7 @@ public class JdkDownloadPlugin implements Plugin<Project> {
 
     public static final String VENDOR_ADOPTIUM = "adoptium";
     public static final String VENDOR_OPENJDK = "openjdk";
+    public static final String VENDOR_ZULU = "zulu";
 
     private static final String REPO_NAME_PREFIX = "jdk_repo_";
     private static final String EXTENSION_NAME = "jdks";
@@ -125,6 +126,17 @@ private void setupRepository(Project project, Jdk jdk) {
                     + jdk.getBuild()
                     + "/GPL/openjdk-[revision]_[module]-[classifier]_bin.[ext]";
             }
+        } else if (jdk.getVendor().equals(VENDOR_ZULU)) {
+            repoUrl = "https://cdn.azul.com";
+            if (jdk.getMajor().equals("8") && isJdkOnMacOsPlatform(jdk) && jdk.getArchitecture().equals("aarch64")) {
+                artifactPattern = "zulu/bin/zulu"
+                    + jdk.getDistributionVersion()
+                    + "-ca-jdk"
+                    + jdk.getBaseVersion().replace("u", ".0.")
+                    + "-[module]x_[classifier].[ext]";
+            } else {
+                throw new GradleException("JDK vendor zulu is supported only for JDK8 on MacOS with Apple Silicon.");
+            }
         } else {
             throw new GradleException("Unknown JDK vendor [" + jdk.getVendor() + "]");
         }
@@ -147,14 +159,16 @@ public static NamedDomainObjectContainer<Jdk> getContainer(Project project) {
     }
 
     private static String dependencyNotation(Jdk jdk) {
-        String platformDep = jdk.getPlatform().equals("darwin") || jdk.getPlatform().equals("mac")
-            ? (jdk.getVendor().equals(VENDOR_ADOPTIUM) ? "mac" : "macos")
-            : jdk.getPlatform();
+        String platformDep = isJdkOnMacOsPlatform(jdk) ? (jdk.getVendor().equals(VENDOR_ADOPTIUM) ? "mac" : "macos") : jdk.getPlatform();
         String extension = jdk.getPlatform().equals("windows") ? "zip" : "tar.gz";
 
         return groupName(jdk) + ":" + platformDep + ":" + jdk.getBaseVersion() + ":" + jdk.getArchitecture() + "@" + extension;
     }
 
+    private static boolean isJdkOnMacOsPlatform(Jdk jdk) {
+        return jdk.getPlatform().equals("darwin") || jdk.getPlatform().equals("mac");
+    }
+
     private static String groupName(Jdk jdk) {
         return jdk.getVendor() + "_" + jdk.getMajor();
     }

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java

@@ -36,7 +36,7 @@ public void testUnknownVendor() {
             "11.0.2+33",
             "linux",
             "x64",
-            "unknown vendor [unknown] for jdk [testjdk], must be one of [adoptium, openjdk]"
+            "unknown vendor [unknown] for jdk [testjdk], must be one of [adoptium, openjdk, zulu]"
         );
     }
 

docs/changelog/87482.yaml

@@ -0,0 +1,5 @@
+pr: 87482
+summary: Adding additional capability to the `master_is_stable` health indicator service
+area: Health
+type: enhancement
+issues: []

docs/changelog/87675.yaml

@@ -0,0 +1,6 @@
+pr: 87675
+summary: Support removing ignore filters for audit logging
+area: Audit
+type: bug
+issues:
+  - 68588

docs/reference/health/health.asciidoc

@@ -205,7 +205,7 @@ for health status set `explain` to `false` to disable the more expensive analysi
 `details`::
     (Optional, object) An object that contains additional information about the cluster that
     has lead to the current health status result. This data is unstructured, and each
-    indicator may return a unique set of details. Details will not be calculated if the
+    indicator returns <<health-api-response-details, a unique set of details>>. Details will not be calculated if the
     `explain` property is set to false.
 
 `impacts`::
@@ -260,6 +260,123 @@ for health status set `explain` to `false` to disable the more expensive analysi
 =====
 ====
 
+[role="child_attributes"]
+[[health-api-response-details]]
+==== Indicator Details
+
+Each health indicator in the health api returns a set of details that further explains the state of the system. The
+details have contents and a structure that is unique to each indicator.
+
+[[health-api-response-details-master-is-stable]]
+===== master_is_stable
+
+`current_master`::
+    (object) Information about the currently elected master.
++
+.Properties of `current_master`
+[%collapsible%open]
+====
+`node_id`::
+    (string) The node id of the currently elected master, or null if no master is elected.
+
+`name`::
+    (string) The node name of the currently elected master, or null if no master is elected.
+====
+
+`recent_masters`::
+    (Optional, array) A list of nodes that have been elected or replaced as master in a recent
+    time window. This field is present if the master
+    is changing rapidly enough to cause problems, and also present as additional information
+    when the indicator is `green`.
++
+.Properties of `recent_masters`
+[%collapsible%open]
+====
+`node_id`::
+    (string) The node id of a recently active master node.
+
+`name`::
+    (string) The node name of a recently active master node.
+====
+
+`exception_fetching_history`::
+    (Optional, object) Master history is requested from the most recently elected master node for diagnosis purposes.
+    If fetching this remote history fails, the exception information is returned in this detail field.
++
+.Properties of `exception_fetching_history`
+[%collapsible%open]
+====
+`message`::
+(string) The exception message for the failed history fetch operation.
+
+`stack_trace`::
+(string) The stack trace for the failed history fetch operation.
+====
+
+[[health-api-response-details-shards-availability]]
+===== shards_availability
+
+`unassigned_primaries`::
+    (int) The number of primary shards that are unassigned for reasons other than initialization or relocation.
+
+`initializing_primaries`::
+    (int) The number of primary shards that are initializing or recovering.
+
+`creating_primaries`::
+    (int) The number of primary shards that are unassigned because they have been very recently created.
+
+`restarting_primaries`::
+    (int) The number of primary shards that are relocating because of a node shutdown operation.
+
+`started_primaries`::
+    (int) The number of primary shards that are active and available on the system.
+
+`unassigned_replicas`::
+    (int) The number of replica shards that are unassigned for reasons other than initialization or relocation.
+
+`initializing_replicas`::
+    (int) The number of replica shards that are initializing or recovering.
+
+`restarting_replicas`::
+    (int) The number of replica shards that are relocating because of a node shutdown operation.
+
+`started_replicas`::
+    (int) The number of replica shards that are active and available on the sysetm.
+
+
+[[health-api-response-details-repository-integrity]]
+===== repository_integrity
+
+`total_repositories`::
+    (Optional, int) The number of currently configured repositories on the system. If there are no repositories
+    configured then this detail is omitted.
+
+`corrupted_repositories`::
+    (Optional, int) The number of repositories on the system that have been determined to be corrupted. If there are
+    no corrupted repositories detected, this detail is omitted.
+
+`corrupted`::
+    (Optional, array of strings) If corrupted repositories have been detected in the system, the names of up to ten of
+    them are displayed in this field. If no corrupted repositories are found, this detail is omitted.
+
+[[health-api-response-details-ilm]]
+===== ilm
+
+`ilm_status`::
+    (string) The current status of the Indexing Lifecycle Management feature. Either `STOPPED`, `STOPPING`, or `RUNNING`.
+
+`policies`::
+    (int) The number of index lifecycle policies that the system is managing.
+
+[[health-api-response-details-slm]]
+===== slm
+
+`slm_status`::
+    (string) The current status of the Snapshot Lifecycle Management feature. Either `STOPPED`, `STOPPING`, or `RUNNING`.
+
+`policies`::
+    (int) The number of snapshot policies that the system is managing.
+
 [[health-api-example]]
 ==== {api-examples-title}
 

docs/reference/ml/anomaly-detection/apis/get-job.asciidoc

@@ -52,6 +52,7 @@ include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=allow-no-match-jobs]
 (Optional, Boolean)
 include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=exclude-generated]
 
+[role="child_attributes"]
 [[ml-get-job-results]]
 == {api-response-body-title}
 
@@ -86,6 +87,38 @@ property is informational; you cannot change its value.
 .Properties of `datafeed_config`
 [%collapsible%open]
 ====
+`authorization`:::
+(Optional, object)
+The security privileges that the {dfeed} uses to run its queries. If
+{stack-security-features} were disabled at the time of the most recent update to
+the {dfeed}, this property is omitted.
++
+.Properties of `authorization`
+[%collapsible%open]
+=====
+`api_key`:::
+(object) If an API key was used for the most recent update to the {dfeed}, its
+name and identifier are listed in the response.
++
+.Properties of `api_key`
+[%collapsible%open]
+======
+`id`::::
+(string) The identifier for the API key.
+
+`name`::::
+(string) The name of the API key.
+======
+
+`roles`:::
+(array of strings) If a user ID was used for the most recent update to the
+{dfeed}, its roles at the time of the update are listed in the response.
+
+`service_account`:::
+(string) If a service account was used for the most recent update to the {dfeed},
+the account name is listed in the response.
+=====
+
 `datafeed_id`:::
 (Optional, string)
 include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=datafeed-id]
@@ -208,14 +241,58 @@ The API returns the following results:
     {
       "job_id" : "high_sum_total_sales",
       "job_type" : "anomaly_detector",
-      "job_version" : "8.0.0",
+      "job_version" : "8.4.0",
+      "create_time" : 1655852735889,
+      "finished_time" : 1655852745980,
+      "model_snapshot_id" : "1575402237",
+      "custom_settings" : {
+        "created_by" : "ml-module-sample",
+        ...
+      },
+      "datafeed_config" : {
+        "datafeed_id" : "datafeed-high_sum_total_sales",
+        "job_id" : "high_sum_total_sales",
+        "authorization" : {
+          "roles" : [
+            "superuser"
+          ]
+        },
+        "query_delay" : "93169ms",
+        "chunking_config" : {
+          "mode" : "auto"
+        },
+        "indices_options" : {
+          "expand_wildcards" : [
+            "open"
+          ],
+          "ignore_unavailable" : false,
+          "allow_no_indices" : true,
+          "ignore_throttled" : true
+        },
+        "query" : {
+          "bool" : {
+            "filter" : [
+              {
+                "term" : {
+                  "event.dataset" : "sample_ecommerce"
+                }
+              }
+            ]
+          }
+        },
+        "indices" : [
+          "kibana_sample_data_ecommerce"
+        ],
+        "scroll_size" : 1000,
+        "delayed_data_check_config" : {
+          "enabled" : true
+        }
+      },
       "groups" : [
         "kibana_sample_data",
         "kibana_sample_ecommerce"
       ],
       "description" : "Find customers spending an unusually high amount in an hour",
-      "create_time" : 1575402224732,
-      "finished_time" : 1575402238311,
       "analysis_config" : {
         "bucket_span" : "1h",
         "detectors" : [
@@ -230,26 +307,23 @@ The API returns the following results:
         "influencers" : [
           "customer_full_name.keyword",
           "category.keyword"
-        ]
+        ],
+        "model_prune_window": "30d"
       },
       "analysis_limits" : {
-        "model_memory_limit" : "10mb",
+        "model_memory_limit" : "13mb",
         "categorization_examples_limit" : 4
       },
       "data_description" : {
         "time_field" : "order_date",
         "time_format" : "epoch_ms"
       },
       "model_plot_config" : {
-        "enabled" : true
+        "enabled" : true,
+        "annotations_enabled" : true
       },
       "model_snapshot_retention_days" : 10,
       "daily_model_snapshot_retention_after_days" : 1,
-      "custom_settings" : {
-        "created_by" : "ml-module-sample",
-        ...
-      },
-      "model_snapshot_id" : "1575402237",
       "results_index_name" : "shared",
       "allow_lazy_open" : false
     }