Merge branch 'main' into ftr/migrate-so-bulk-api-tests-to-depl-agnostic

elastic · Sep 4, 2024 · f7072f3 · f7072f3
2 parents 1b3d6d6 + 00230cf
commit f7072f3
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 25 deletions.
diff --git a/.buildkite/scripts/steps/functional/osquery_cypress.sh b/.buildkite/scripts/steps/functional/osquery_cypress.sh
@@ -4,11 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/functional/common.sh
 
-# TODO: remove the line below to use build artifacts for tests.
-# in addition to remove the line, we will have to expose the kibana install dir into the downloaded build location
-# by exporting a var like:
-# export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
-node scripts/build_kibana_platform_plugins.js
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 export JOB=kibana-osquery-cypress
 

diff --git a/.buildkite/scripts/steps/functional/osquery_cypress_burn.sh b/.buildkite/scripts/steps/functional/osquery_cypress_burn.sh
@@ -2,10 +2,9 @@
 
 set -euo pipefail
 
-source .buildkite/scripts/common/util.sh
+source .buildkite/scripts/steps/functional/common.sh
 
-.buildkite/scripts/bootstrap.sh
-node scripts/build_kibana_platform_plugins.js
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 export JOB=kibana-osquery-cypress
 

diff --git a/.buildkite/scripts/steps/functional/security_serverless_osquery.sh b/.buildkite/scripts/steps/functional/security_serverless_osquery.sh
@@ -4,11 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/functional/common.sh
 
-# TODO: remove the line below to use build artifacts for tests.
-# in addition to remove the line, we will have to expose the kibana install dir into the downloaded build location
-# by exporting a var like:
-# export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
-node scripts/build_kibana_platform_plugins.js
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 export JOB=kibana-osquery-cypress-serverless
 

diff --git a/...ets_es_client/create_assets_es_clients.ts → ...es_es_client/create_entities_es_client.ts b/...ets_es_client/create_assets_es_clients.ts → ...es_es_client/create_entities_es_client.ts
diff --git a/...bservability_solution/apm/server/routes/custom_dashboards/get_entities_with_dashboards.ts b/...bservability_solution/apm/server/routes/custom_dashboards/get_entities_with_dashboards.ts
@@ -9,7 +9,7 @@ import { kqlQuery, termQuery } from '@kbn/observability-plugin/server';
 import { estypes } from '@elastic/elasticsearch';
 import { SERVICE_NAME } from '../../../common/es_fields/apm';
 import { SavedApmCustomDashboard } from '../../../common/custom_dashboards';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 
 function getSearchRequest(filters: estypes.QueryDslQueryContainer[]) {
   return {

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts
@@ -14,7 +14,7 @@ import { getCustomDashboards } from './get_custom_dashboards';
 import { getServicesWithDashboards } from './get_services_with_dashboards';
 import { getApmEventClient } from '../../lib/helpers/get_apm_event_client';
 import { rangeRt } from '../default_api_types';
-import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { getEntitiesWithDashboards } from './get_entities_with_dashboards';
 
 const serviceDashboardSaveRoute = createApmServerRoute({

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/get_entities.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/get_entities.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../common/es_fields/apm';
 import { FIRST_SEEN, LAST_SEEN, ENTITY, ENTITY_TYPE } from '../../../common/es_fields/entities';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { getServiceEntitiesHistoryMetrics } from './get_service_entities_history_metrics';
 import { EntitiesRaw, EntityType, ServiceEntities } from './types';
 import { isFiniteNumber } from '../../../common/utils/is_finite_number';

diff --git a/...observability_solution/apm/server/routes/entities/get_service_entities_history_metrics.ts b/...observability_solution/apm/server/routes/entities/get_service_entities_history_metrics.ts
@@ -16,7 +16,7 @@ import {
   ENTITY_METRICS_THROUGHPUT,
   LAST_SEEN,
 } from '../../../common/es_fields/entities';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 
 interface Params {
   entitiesESClient: EntitiesESClient;

diff --git a/...ervability_solution/apm/server/routes/entities/get_service_entities_history_timeseries.ts b/...ervability_solution/apm/server/routes/entities/get_service_entities_history_timeseries.ts
@@ -17,7 +17,7 @@ import {
   LAST_SEEN,
 } from '../../../common/es_fields/entities';
 import { SERVICE_NAME } from '../../../common/es_fields/apm';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { environmentQuery } from '../../../common/utils/environment_query';
 
 interface Params {

diff --git a/...k/plugins/observability_solution/apm/server/routes/entities/get_service_entity_summary.ts b/...k/plugins/observability_solution/apm/server/routes/entities/get_service_entity_summary.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getServiceLatestEntity } from './get_service_latest_entity';
 import { ServiceEntities } from './types';

diff --git a/...ck/plugins/observability_solution/apm/server/routes/entities/get_service_latest_entity.ts b/...ck/plugins/observability_solution/apm/server/routes/entities/get_service_latest_entity.ts
@@ -14,7 +14,7 @@ import {
 import { ENTITY, ENTITY_TYPE } from '../../../common/es_fields/entities';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { isFiniteNumber } from '../../../common/utils/is_finite_number';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { entitiesRangeQuery } from './get_entities';
 import { EntitiesRaw, EntityType, ServiceEntities } from './types';
 

diff --git a/...lugins/observability_solution/apm/server/routes/entities/services/get_service_entities.ts b/...lugins/observability_solution/apm/server/routes/entities/services/get_service_entities.ts
@@ -7,7 +7,7 @@
 import { errors } from '@elastic/elasticsearch';
 import { Logger } from '@kbn/core/server';
 import { WrappedElasticsearchClientError } from '@kbn/observability-plugin/server';
-import { EntitiesESClient } from '../../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { getEntities } from '../get_entities';
 import { calculateAvgMetrics } from '../utils/calculate_avg_metrics';

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
@@ -9,7 +9,7 @@ import { jsonRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { EntityServiceListItem } from '../../../../common/entities/types';
 import { environmentQuery } from '../../../../common/utils/environment_query';
-import { createEntitiesESClient } from '../../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { createEntitiesESClient } from '../../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
 import { environmentRt, kueryRt, rangeRt } from '../../default_api_types';
 import { getServiceEntities } from './get_service_entities';

diff --git a/.../observability_solution/apm/server/routes/historical_data/has_historical_entities_data.ts b/.../observability_solution/apm/server/routes/historical_data/has_historical_entities_data.ts
@@ -7,7 +7,7 @@
 import { WrappedElasticsearchClientError } from '@kbn/observability-plugin/server';
 import { Logger } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
-import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 
 export async function hasEntitiesData(entitiesESClient: EntitiesESClient, logger: Logger) {
   const params = {

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { getApmEventClient } from '../../lib/helpers/get_apm_event_client';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { hasHistoricalAgentData } from './has_historical_agent_data';

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/services/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/route.ts
@@ -80,7 +80,7 @@ import {
 import { getThroughput, ServiceThroughputResponse } from './get_throughput';
 import { getServiceEntitySummary } from '../entities/get_service_entity_summary';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
-import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 
 const servicesRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/services',