Merge branch 'master' into bump-node-16.8.0

elastic · Oct 16, 2021 · f7d4173 · f7d4173
2 parents 1db9c01 + d98bf0c
commit f7d4173
Show file tree

Hide file tree

Showing 13 changed files with 1,066 additions and 49 deletions.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
@@ -110,7 +110,7 @@ COPY --chown=1000:0 config/kibana.yml /usr/share/kibana/config/kibana.yml
 
 # Add the launcher/wrapper script. It knows how to interpret environment
 # variables and translate them to Kibana CLI options.
-COPY --chown=1000:0 bin/kibana-docker /usr/local/bin/
+COPY bin/kibana-docker /usr/local/bin/
 
 # Ensure gid 0 write permissions for OpenShift.
 RUN chmod g+ws /usr/share/kibana && \

diff --git a/...lugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/...lugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -300,10 +300,8 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
   }, [rule, spacesApi]);
 
   const getLegacyUrlConflictCallout = useMemo(() => {
-    const outcome = rule?.outcome;
-    if (rule != null && spacesApi && outcome === 'conflict') {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const aliasTargetId = rule?.alias_target_id!; // This is always defined if outcome === 'conflict'
+    if (rule?.alias_target_id != null && spacesApi && rule.outcome === 'conflict') {
+      const aliasTargetId = rule.alias_target_id;
       // We have resolved to one rule, but there is another one with a legacy URL associated with this page. Display a
       // callout with a warning for the user, and provide a way for them to navigate to the other rule.
       const otherRulePath = `rules/id/${aliasTargetId}${window.location.search}${window.location.hash}`;