Merge branch 'main' into plugins-async-import

.github/CODEOWNERS

@@ -989,7 +989,8 @@ packages/kbn-monaco/src/esql @elastic/kibana-visualizations
 /x-pack/plugins/infra/public/common @elastic/obs-ux-infra_services-team
 /x-pack/plugins/infra/public/observability_logs @elastic/obs-ux-logs-team
 /x-pack/plugins/infra/public/services @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
+/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team
+/x-pack/test/functional/apps/infra/logs @elastic/infra-monitoring-ui @elastic/obs-ux-logs-team
 /x-pack/test/api_integration/apis/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team
 
 # Observability UX management team

packages/kbn-doc-links/src/get_doc_links.ts

@@ -536,7 +536,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       infrastructureThreshold: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/infrastructure-threshold-alert.html`,
       logsThreshold: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/logs-threshold-alert.html`,
       metricsThreshold: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/metrics-threshold-alert.html`,
-      threshold: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/threshold-alert.html`,
+      customThreshold: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/custom-threshold-alert.html`,
       monitorStatus: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/monitor-status-alert.html`,
       monitorUptime: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/monitor-uptime.html`,
       tlsCertificate: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/tls-certificate-alert.html`,

packages/kbn-doc-links/src/types.ts

@@ -408,7 +408,7 @@ export interface DocLinks {
     infrastructureThreshold: string;
     logsThreshold: string;
     metricsThreshold: string;
-    threshold: string;
+    customThreshold: string;
     monitorStatus: string;
     monitorUptime: string;
     tlsCertificate: string;

test/analytics/tests/instrumented_events/from_the_server/core_overall_status_changed.ts

@@ -13,7 +13,8 @@ import { FtrProviderContext } from '../../../services';
 export default function ({ getService }: FtrProviderContext) {
   const ebtServerHelper = getService('kibana_ebt_server');
 
-  describe('core-overall_status_changed', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/171164
+  describe.skip('core-overall_status_changed', () => {
     let initialEvent: Event<Record<string, unknown>>;
     let secondEvent: Event<Record<string, unknown>>;
 

versions.json

@@ -14,7 +14,7 @@
       "previousMinor": true
     },
     {
-      "version": "7.17.15",
+      "version": "7.17.16",
       "branch": "7.17",
       "previousMajor": true
     }

x-pack/plugins/observability/public/rules/register_observability_rule_types.ts

@@ -112,7 +112,7 @@ export const registerObservabilityRuleTypes = (
       ),
       iconClass: 'bell',
       documentationUrl(docLinks) {
-        return `${docLinks.links.observability.threshold}`;
+        return `${docLinks.links.observability.customThreshold}`;
       },
       ruleParamsExpression: lazy(
         () => import('../components/custom_threshold/custom_threshold_rule_expression')

x-pack/test/functional/apps/infra/index.ts

@@ -23,12 +23,12 @@ export default ({ loadTestFile }: FtrProviderContext) => {
     });
 
     describe('Logs UI', function () {
-      loadTestFile(require.resolve('./log_entry_categories_tab'));
-      loadTestFile(require.resolve('./log_entry_rate_tab'));
-      loadTestFile(require.resolve('./logs_source_configuration'));
-      loadTestFile(require.resolve('./log_stream_date_nano'));
-      loadTestFile(require.resolve('./link_to'));
-      loadTestFile(require.resolve('./log_stream'));
+      loadTestFile(require.resolve('./logs/log_entry_categories_tab'));
+      loadTestFile(require.resolve('./logs/log_entry_rate_tab'));
+      loadTestFile(require.resolve('./logs/logs_source_configuration'));
+      loadTestFile(require.resolve('./logs/log_stream_date_nano'));
+      loadTestFile(require.resolve('./logs/link_to'));
+      loadTestFile(require.resolve('./logs/log_stream'));
     });
   });
 };

x-pack/test/functional/apps/infra/link_to.ts → x-pack/test/functional/apps/infra/logs/link_to.ts

@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const ONE_HOUR = 60 * 60 * 1000;
 const LOG_VIEW_ID = 'testView';

x-pack/test/functional/apps/infra/log_entry_categories_tab.ts → x-pack/test/functional/apps/infra/logs/log_entry_categories_tab.ts

@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');

x-pack/test/functional/apps/infra/log_entry_rate_tab.ts → x-pack/test/functional/apps/infra/logs/log_entry_rate_tab.ts

@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default ({ getService }: FtrProviderContext) => {
   const logsUi = getService('logsUi');

x-pack/test/functional/apps/infra/log_stream.ts → x-pack/test/functional/apps/infra/logs/log_stream.ts

@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const SERVICE_ID = '49a18510598271e924253ed2581d7ada';
 

x-pack/test/functional/apps/infra/log_stream_date_nano.ts → x-pack/test/functional/apps/infra/logs/log_stream_date_nano.ts

@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATES } from './constants';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { DATES } from '../constants';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const retry = getService('retry');

x-pack/test/functional/apps/infra/logs_source_configuration.ts → x-pack/test/functional/apps/infra/logs/logs_source_configuration.ts

@@ -10,9 +10,9 @@ import {
   ELASTIC_HTTP_VERSION_HEADER,
   X_ELASTIC_INTERNAL_ORIGIN_REQUEST,
 } from '@kbn/core-http-common';
-import { DATES } from './constants';
+import { DATES } from '../constants';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const COMMON_REQUEST_HEADERS = {
   'kbn-xsrf': 'some-xsrf-token',