Merge branch 'main' into search-remove-warning-toast

elastic · Nov 9, 2021 · 080725f · 080725f
2 parents 67639d2 + 7d27afe
commit 080725f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 40 deletions.
diff --git a/src/dev/ci_setup/.bazelrc-ci b/src/dev/ci_setup/.bazelrc-ci
diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh
@@ -10,17 +10,6 @@ echo " -- PARENT_DIR='$PARENT_DIR'"
 echo " -- KIBANA_PKG_BRANCH='$KIBANA_PKG_BRANCH'"
 echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'"
 
-###
-### copy .bazelrc-ci into $HOME/.bazelrc
-###
-cp "src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc";
-
-###
-### append auth token to buildbuddy into "$HOME/.bazelrc";
-###
-echo "# Appended by src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc"
-echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
-
 ###
 ### install dependencies
 ###

diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
@@ -181,24 +181,4 @@ if [[ -d "$ES_DIR" && -f "$ES_JAVA_PROP_PATH" ]]; then
   export JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
 fi
 
-###
-### copy .bazelrc-ci into $HOME/.bazelrc
-###
-cp -f "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc";
-
-###
-### remove write permissions on buildbuddy remote cache for prs
-###
-if [[ "$ghprbPullId" ]] ; then
-  echo "# Appended by $KIBANA_DIR/src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc"
-  echo "# Uploads logs & artifacts without writing to cache" >> "$HOME/.bazelrc"
-  echo "build --noremote_upload_local_results" >> "$HOME/.bazelrc"
-fi
-
-###
-### append auth token to buildbuddy into "$HOME/.bazelrc";
-###
-echo "# Appended by $KIBANA_DIR/src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc"
-echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
-
 export CI_ENV_SETUP=true
diff --git a/x-pack/plugins/apm/server/routes/correlations.ts b/x-pack/plugins/apm/server/routes/correlations.ts
@@ -9,7 +9,7 @@ import * as t from 'io-ts';
 import Boom from '@hapi/boom';
 
 import { i18n } from '@kbn/i18n';
-import { toNumberRt } from '@kbn/io-ts-utils';
+import { toNumberRt } from '@kbn/io-ts-utils/to_number_rt';
 
 import { isActivePlatinumLicense } from '../../common/license_check';
 

diff --git a/...s/security_solution/public/management/pages/event_filters/view/components/empty/index.tsx b/...s/security_solution/public/management/pages/event_filters/view/components/empty/index.tsx
@@ -38,7 +38,7 @@ export const EventFiltersListEmptyState = memo<{
         body={
           <FormattedMessage
             id="xpack.securitySolution.eventFilters.listEmpty.message"
-            defaultMessage="There are currently no event filters on your endpoint."
+            defaultMessage="Add an event filter to exclude high volume or unwanted events from being written to Elasticsearch."
           />
         }
         actions={

diff --git a/...rity_solution/public/management/pages/host_isolation_exceptions/view/components/empty.tsx b/...rity_solution/public/management/pages/host_isolation_exceptions/view/components/empty.tsx
@@ -34,7 +34,7 @@ export const HostIsolationExceptionsEmptyState = memo<{ onAdd: () => void }>(({
         body={
           <FormattedMessage
             id="xpack.securitySolution.hostIsolationExceptions.listEmpty.message"
-            defaultMessage="There are currently no host isolation exceptions"
+            defaultMessage="Add a Host isolation exception to allow isolated hosts to communicate with specific IPs."
           />
         }
         actions={

diff --git a/...ns/security_solution/public/management/pages/trusted_apps/view/components/empty_state.tsx b/...ns/security_solution/public/management/pages/trusted_apps/view/components/empty_state.tsx
@@ -31,7 +31,7 @@ export const EmptyState = memo<{
         body={
           <FormattedMessage
             id="xpack.securitySolution.trustedapps.listEmptyState.message"
-            defaultMessage="There are currently no trusted applications on your endpoint."
+            defaultMessage="Add a trusted application to improve performance or alleviate conflicts with other applications running on your hosts."
           />
         }
         actions={