Skip to content

Commit

Permalink
Merge branch 'main' into fix-manage-saved-search-embeddable-columns
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine committed Sep 20, 2022
2 parents a911d5f + fe6060d commit 51cb98d
Show file tree
Hide file tree
Showing 2,725 changed files with 100,768 additions and 30,969 deletions.
41 changes: 15 additions & 26 deletions .buildkite/scripts/steps/cloud/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"instance_configuration_id": "gcp.integrationsserver.1",
"zone_count": 1,
"size": {
"value": 512,
"resource": "memory"
"resource": "memory",
"value": 1024
}
}
],
Expand All @@ -32,7 +32,7 @@
"autoscaling_enabled": false,
"cluster_topology": [
{
"zone_count": 2,
"zone_count": 1,
"instance_configuration_id": "gcp.coordinating.1",
"node_roles": [
"ingest",
Expand All @@ -42,18 +42,14 @@
"size": {
"resource": "memory",
"value": 0
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
},
{
"zone_count": 1,
"elasticsearch": {
"node_attributes": {
"data": "hot"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highio.1",
"node_roles": [
Expand All @@ -66,17 +62,16 @@
],
"id": "hot_content",
"size": {
"value": 1024,
"value": 2048,
"resource": "memory"
}
},
{
"zone_count": 2,
"zone_count": 1,
"elasticsearch": {
"node_attributes": {
"data": "warm"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": [
Expand All @@ -94,8 +89,7 @@
"elasticsearch": {
"node_attributes": {
"data": "cold"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": [
Expand All @@ -113,8 +107,7 @@
"elasticsearch": {
"node_attributes": {
"data": "frozen"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.es.datafrozen.n1.64x10x95",
"node_roles": [
Expand All @@ -127,7 +120,7 @@
}
},
{
"zone_count": 3,
"zone_count": 1,
"instance_configuration_id": "gcp.master.1",
"node_roles": [
"master",
Expand All @@ -137,9 +130,6 @@
"size": {
"resource": "memory",
"value": 0
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
},
{
Expand All @@ -153,14 +143,12 @@
"size": {
"value": 1024,
"resource": "memory"
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
}
],
"elasticsearch": {
"version": null
"version": null,
"enabled_built_in_plugins": []
},
"deployment_template": {
"id": "gcp-io-optimized-v2"
Expand Down Expand Up @@ -206,8 +194,8 @@
"instance_configuration_id": "gcp.kibana.1",
"zone_count": 1,
"size": {
"resource": "memory",
"value": 2048
"value": 2048,
"resource": "memory"
}
}
],
Expand All @@ -220,6 +208,7 @@
}
]
},
"settings": {},
"name": null,
"metadata": {
"system_owned": false
Expand Down
7 changes: 4 additions & 3 deletions .buildkite/scripts/steps/cloud/purge_deployments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const prDeployments = deployments.filter((deployment: any) =>
const deploymentsToPurge = [];

const NOW = new Date().getTime() / 1000;
const DAY_IN_SECONDS = 60 * 60 * 24;

for (const deployment of prDeployments) {
try {
Expand All @@ -37,12 +38,12 @@ for (const deployment of prDeployments) {
)
) {
console.log(
`Pull Request #${prNumber} no longer has the a cloud deployment label, will delete associated deployment`
`Pull Request #${prNumber} no longer has a cloud deployment label, will delete associated deployment`
);
deploymentsToPurge.push(deployment);
} else if (lastCommitTimestamp < NOW - 60 * 60 * 24 * 7) {
} else if (lastCommitTimestamp < NOW - DAY_IN_SECONDS * 2) {
console.log(
`Pull Request #${prNumber} has not been updated in more than 7 days, will delete associated deployment`
`Pull Request #${prNumber} has not been updated in more than 2 days, will delete associated deployment`
);
deploymentsToPurge.push(deployment);
}
Expand Down
11 changes: 9 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,14 @@ module.exports = {
],
},
},

// Profiling
{
files: ['x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}'],
rules: {
'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^(useAsync)$' }],
},
},
{
// disable imports from legacy uptime plugin
files: ['x-pack/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}'],
Expand Down Expand Up @@ -1306,7 +1313,7 @@ module.exports = {
{
// typescript for front and back end
files: [
'x-pack/plugins/{alerting,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}',
'x-pack/plugins/{alerting,stack_alerts,stack_connectors,actions,task_manager,event_log}/**/*.{ts,tsx}',
],
rules: {
'@typescript-eslint/no-explicit-any': 'error',
Expand Down
15 changes: 15 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ x-pack/examples/files_example @elastic/kibana-app-services
/x-pack/plugins/apm/public/components/app/rum_dashboard @elastic/uptime
/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime

# Profiling
/x-pack/plugins/profiling @elastic/profiling-ui

# Observability onboarding tour
/x-pack/plugins/observability/public/components/shared/tour @elastic/platform-onboarding
/x-pack/test/functional/apps/infra/tour.ts @elastic/platform-onboarding
Expand Down Expand Up @@ -323,6 +326,9 @@ x-pack/examples/files_example @elastic/kibana-app-services
/x-pack/plugins/actions/ @elastic/response-ops
/x-pack/plugins/event_log/ @elastic/response-ops
/x-pack/plugins/task_manager/ @elastic/response-ops
/x-pack/plugins/stack_connectors/ @elastic/response-ops
/x-pack/plugins/stack_connectors/server/connector_types/stack/ @elastic/response-ops-execution
/x-pack/plugins/stack_connectors/server/connector_types/cases/ @elastic/response-ops-cases
/x-pack/test/alerting_api_integration/ @elastic/response-ops
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
/x-pack/plugins/triggers_actions_ui/ @elastic/response-ops
Expand Down Expand Up @@ -362,6 +368,10 @@ x-pack/examples/files_example @elastic/kibana-app-services
/x-pack/plugins/ingest_pipelines/ @elastic/platform-deployment-management
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/platform-deployment-management

# Management Experience - Platform Onboarding
/src/plugins/guided_onboarding/ @elastic/platform-onboarding
/examples/guided_onboarding_example/ @elastic/platform-onboarding

# Security Solution
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
/x-pack/test/security_solution_endpoint/ @elastic/security-solution
Expand Down Expand Up @@ -498,6 +508,7 @@ x-pack/examples/files_example @elastic/kibana-app-services
/x-pack/plugins/security_solution/cypress/e2e/exceptions @elastic/security-solution-platform
/x-pack/plugins/security_solution/cypress/e2e/value_lists @elastic/security-solution-platform

/x-pack/plugins/security_solution/public/detection_engine/rule_exceptions @elastic/security-solution-platform
/x-pack/plugins/security_solution/public/common/components/exceptions @elastic/security-solution-platform
/x-pack/plugins/security_solution/public/exceptions @elastic/security-solution-platform
/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists @elastic/security-solution-platform
Expand Down Expand Up @@ -570,6 +581,9 @@ x-pack/test/threat_intelligence_cypress @elastic/protections-experience

# Security Asset Management
/x-pack/plugins/osquery @elastic/security-asset-management
/x-pack/plugins/security_solution/common/detection_engine/rule_response_actions @elastic/security-asset-management
/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions @elastic/security-asset-management
/x-pack/plugins/security_solution/server/lib/detection_engine/rule_response_actions @elastic/security-asset-management

# Cloud Security Posture
/x-pack/plugins/cloud_security_posture/ @elastic/kibana-cloud-security-posture
Expand Down Expand Up @@ -655,6 +669,7 @@ packages/analytics/shippers/elastic_v3/browser @elastic/kibana-core
packages/analytics/shippers/elastic_v3/common @elastic/kibana-core
packages/analytics/shippers/elastic_v3/server @elastic/kibana-core
packages/analytics/shippers/fullstory @elastic/kibana-core
packages/content-management/table_list @elastic/shared-ux
packages/core/analytics/core-analytics-browser @elastic/kibana-core
packages/core/analytics/core-analytics-browser-internal @elastic/kibana-core
packages/core/analytics/core-analytics-browser-mocks @elastic/kibana-core
Expand Down
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"bfetch": "src/plugins/bfetch",
"charts": "src/plugins/charts",
"console": "src/plugins/console",
"contentManagement": "packages/content-management",
"core": [
"src/core",
"packages/core"
Expand Down

0 comments on commit 51cb98d

Please sign in to comment.