Merge branch 'main' into fix-lens-in-markdown-serverless

elastic · Sep 1, 2023 · 5410e27 · 5410e27
2 parents 4e94d86 + f721e3a
commit 5410e27
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/.buildkite/scripts/steps/artifacts/docker_image.sh b/.buildkite/scripts/steps/artifacts/docker_image.sh
@@ -98,12 +98,14 @@ steps:
   - label: ":argo: Update kibana image tag for kibana-controller using gpctl"
     async: true
     branches: main
-    trigger: gpctl-promote
+    trigger: gpctl-promote-with-e2e-tests
     build:
       env:
         SERVICE_COMMIT_HASH: "$GIT_ABBREV_COMMIT"
+        SERVICE: kibana-controller
+        NAMESPACE: kibana-ci
+        IMAGE_NAME: kibana-serverless
         REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
-
 EOF
 
 else

diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -153,7 +153,6 @@ spec:
         # https://regex101.com/r/tY52jo/1
         filter_condition: 'build.tag =~ "/^deploy@\d+\$/"'
         filter_enabled: true
-        trigger_mode: none
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
@@ -918,8 +918,12 @@ export class SearchSource {
     };
     body.query = buildEsQuery(index, query, filters, esQueryConfigs);
 
-    // For testing shard failure messages in UI, uncomment the next block and switch to `kibana*` data view
-    // body.query = {
+    // For testing shard failure messages in the UI, follow these steps:
+    // 1. Add all three sample data sets (flights, ecommerce, logs) to Kibana.
+    // 2. Create a data view using the index pattern `kibana*` and don't use a timestamp field.
+    // 3. Uncomment the lines below, navigate to Discover,
+    //    and switch to the data view created in step 2.
+    // body.query.bool.must.push({
     //   error_query: {
     //     indices: [
     //       {
@@ -930,7 +934,8 @@ export class SearchSource {
     //       },
     //     ],
     //   },
-    // };
+    // });
+    // Alternatively you could also add this query via "Edit as Query DSL", then it needs no code to be changed
 
     if (highlightAll && body.query) {
       body.highlight = getHighlightRequest(getConfig(UI_SETTINGS.DOC_HIGHLIGHT));

diff --git a/test/functional/apps/console/_autocomplete.ts b/test/functional/apps/console/_autocomplete.ts
@@ -44,7 +44,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(PageObjects.console.isAutocompleteVisible()).to.be.eql(true);
     });
 
-    describe('Autocomplete behavior', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/165465
+    describe.skip('Autocomplete behavior', () => {
       beforeEach(async () => {
         await PageObjects.console.clearTextArea();
         await PageObjects.console.pressEnter();

diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts
@@ -664,6 +664,12 @@ class BrowserService extends FtrService {
           this.log.error(
             `WebDriver session is no longer valid.\nProbably Chrome process crashed when it tried to use more memory than what was available.`
           );
+          // TODO: Remove this after a while. We are enabling richer logs in order to try catch the real error cause.
+          this.log.error(
+            `Original Error Logging.\n Name: ${err.name};\n Message: ${err.message};\n Stack: ${
+              err.stack
+            }\n RemoteStack: ${(err as NoSuchSessionError).remoteStacktrace}`
+          );
         }
         return false;
       }

diff --git a/x-pack/test_serverless/api_integration/test_suites/common/security/user_profiles.ts b/x-pack/test_serverless/api_integration/test_suites/common/security/user_profiles.ts
@@ -16,7 +16,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('security/user_profiles', function () {
     describe('route access', () => {
-      describe('internal', () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/165391
+      describe.skip('internal', () => {
         // When we run tests on MKI, SAML realm is configured differently, and we cannot handcraft SAML responses to
         // log in as SAML users.
         this.tags(['skipMKI']);