fix ct issues for tests

elastic · Oct 24, 2024 · 2e79d84 · 2e79d84
1 parent 3192cc7
commit 2e79d84
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 182 deletions.
diff --git a/x-pack/test/functional/apps/dataset_quality/custom_mappings/custom_integration_mappings.ts b/x-pack/test/functional/apps/dataset_quality/custom_mappings/custom_integration_mappings.ts
@@ -29,7 +29,7 @@ export const logsNginxMappings = (dataset: string): MappingTypeMapping => ({
       properties: {
         dataset: {
           type: 'constant_keyword',
-          value: 'nginx.access',
+          value: dataset,
         },
         namespace: {
           type: 'constant_keyword',

diff --git a/x-pack/test/functional/apps/dataset_quality/degraded_field_flyout.ts b/x-pack/test/functional/apps/dataset_quality/degraded_field_flyout.ts
@@ -741,7 +741,7 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
           );
 
           const currentFieldLimitValue = await currentFieldLimitInput.getAttribute('value');
-          const currentFieldLimit = parseInt(currentFieldLimitValue, 10);
+          const currentFieldLimit = parseInt(currentFieldLimitValue as string, 10);
           const currentFieldLimitDisabledStatus = await currentFieldLimitInput.getAttribute(
             'disabled'
           );
@@ -759,7 +759,7 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
           );
 
           const newFieldLimitValue = await newFieldLimitInput.getAttribute('value');
-          const newFieldLimit = parseInt(newFieldLimitValue, 10);
+          const newFieldLimit = parseInt(newFieldLimitValue as string, 10);
 
           // Should be 30% more the current limit
           const newLimit = Math.round(currentFieldLimit * 1.3);
@@ -841,7 +841,7 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
 
             // Should point to the component template page
             expect(
-              ctLinkURL.endsWith(
+              ctLinkURL?.endsWith(
                 `/data/index_management/component_templates/${encodeURIComponent(
                   componentTemplateName
                 )}`

diff --git a/x-pack/test/functional/page_objects/dataset_quality.ts b/x-pack/test/functional/page_objects/dataset_quality.ts
@@ -248,9 +248,9 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       dataset,
       namespace = 'default',
     }: {
-      type: string;
+      type?: string;
       dataset: string;
-      namespace: string;
+      namespace?: string;
     }) {
       return `.ds-${type}-${dataset}-${namespace}-${getCurrentDateFormatted()}`;
     },

diff --git a/.../test_suites/observability/dataset_quality/custom_mappings/custom_integration_mappings.ts b/.../test_suites/observability/dataset_quality/custom_mappings/custom_integration_mappings.ts
@@ -29,7 +29,7 @@ export const logsNginxMappings = (dataset: string): MappingTypeMapping => ({
       properties: {
         dataset: {
           type: 'constant_keyword',
-          value: 'nginx.access',
+          value: dataset,
         },
         namespace: {
           type: 'constant_keyword',
@@ -175,175 +175,3 @@ export const logsNginxMappings = (dataset: string): MappingTypeMapping => ({
     },
   },
 });
-
-const properties = {
-  '@timestamp': {
-    type: 'date',
-    ignore_malformed: false,
-  },
-  cloud: {
-    properties: {
-      image: {
-        properties: {
-          id: {
-            type: 'keyword',
-            ignore_above: 1024,
-          },
-        },
-      },
-    },
-  },
-  data_stream: {
-    properties: {
-      dataset: {
-        type: 'constant_keyword',
-        value: 'nginx.access',
-      },
-      namespace: {
-        type: 'constant_keyword',
-        value: 'default',
-      },
-      type: {
-        type: 'constant_keyword',
-        value: 'logs',
-      },
-    },
-  },
-  ecs: {
-    properties: {
-      version: {
-        type: 'keyword',
-        ignore_above: 1024,
-      },
-    },
-  },
-  error: {
-    properties: {
-      message: {
-        type: 'match_only_text',
-      },
-    },
-  },
-  event: {
-    properties: {
-      agent_id_status: {
-        type: 'keyword',
-        ignore_above: 1024,
-      },
-      dataset: {
-        type: 'constant_keyword',
-        value: 'nginx.access',
-      },
-      ingested: {
-        type: 'date',
-        format: 'strict_date_time_no_millis||strict_date_optional_time||epoch_millis',
-        ignore_malformed: false,
-      },
-      module: {
-        type: 'constant_keyword',
-        value: 'nginx',
-      },
-      original: {
-        type: 'keyword',
-        index: false,
-        doc_values: false,
-      },
-    },
-  },
-  host: {
-    properties: {
-      containerized: {
-        type: 'boolean',
-      },
-      name: {
-        type: 'keyword',
-        fields: {
-          text: {
-            type: 'match_only_text',
-          },
-        },
-      },
-      os: {
-        properties: {
-          build: {
-            type: 'keyword',
-            ignore_above: 1024,
-          },
-          codename: {
-            type: 'keyword',
-            ignore_above: 1024,
-          },
-        },
-      },
-    },
-  },
-  input: {
-    properties: {
-      type: {
-        type: 'keyword',
-        ignore_above: 1024,
-      },
-    },
-  },
-  log: {
-    properties: {
-      level: {
-        type: 'keyword',
-        ignore_above: 1024,
-      },
-      offset: {
-        type: 'long',
-      },
-    },
-  },
-  network: {
-    properties: {
-      bytes: {
-        type: 'long',
-      },
-    },
-  },
-  nginx: {
-    properties: {
-      access: {
-        properties: {
-          remote_ip_list: {
-            type: 'keyword',
-            ignore_above: 1024,
-          },
-        },
-      },
-    },
-  },
-  service: {
-    properties: {
-      name: {
-        type: 'keyword',
-        fields: {
-          text: {
-            type: 'match_only_text',
-          },
-        },
-      },
-    },
-  },
-  test_field: {
-    type: 'keyword',
-    ignore_above: 1024,
-  },
-  tls: {
-    properties: {
-      established: {
-        type: 'boolean',
-      },
-    },
-  },
-  trace: {
-    properties: {
-      id: {
-        type: 'keyword',
-        ignore_above: 1024,
-      },
-    },
-  },
-};
diff --git a/..._serverless/functional/test_suites/observability/dataset_quality/degraded_field_flyout.ts b/..._serverless/functional/test_suites/observability/dataset_quality/degraded_field_flyout.ts
@@ -742,7 +742,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           );
 
           const currentFieldLimitValue = await currentFieldLimitInput.getAttribute('value');
-          const currentFieldLimit = parseInt(currentFieldLimitValue, 10);
+          const currentFieldLimit = parseInt(currentFieldLimitValue as string, 10);
           const currentFieldLimitDisabledStatus = await currentFieldLimitInput.getAttribute(
             'disabled'
           );
@@ -760,7 +760,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           );
 
           const newFieldLimitValue = await newFieldLimitInput.getAttribute('value');
-          const newFieldLimit = parseInt(newFieldLimitValue, 10);
+          const newFieldLimit = parseInt(newFieldLimitValue as string, 10);
 
           // Should be 30% more the current limit
           const newLimit = Math.round(currentFieldLimit * 1.3);
@@ -864,7 +864,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
             // Should point to the component template page
             expect(
-              ctLinkURL.endsWith(
+              ctLinkURL?.endsWith(
                 `/data/index_management/component_templates/${encodeURIComponent(
                   componentTemplateName
                 )}`