Skip to content

Commit

Permalink
Merge branch 'master' into task-manager/capacity-estimation
Browse files Browse the repository at this point in the history 
* master: (54 commits)
  Implement "select all" rules feature (elastic#100554)
  [ML] Remove script fields from the Anomaly detection alerting rule executor  (elastic#101607)
  [Security solutions][Endpoint] Update event filtering texts (elastic#101563)
  [Enterprise Search] Mocks/tests tech debt - avoid hungry mocking (elastic#101107)
  [FTR] Updates esArchive paths
  [FTR] Updates esArchive paths
  [Security Solution][Detection Engine] Adds runtime field tests (elastic#101664)
  Added APM PHP agent to the list of agent names (elastic#101062)
  [CI] Restore old version_info behavior when .git directory is present (elastic#101642)
  [Fleet] Add fleet server telemetry (elastic#101400)
  [APM] Syncs agent config settings to APM Fleet policies (elastic#100744)
  [esArchiver] drop support for --dir, use repo-relative paths instead (elastic#101345)
  Revert "[xpack/test] restore incremental: false in ts project"
  [Security Solution] Remove Host Isolation feature flag (elastic#101655)
  [xpack/test] restore incremental: false in ts project
  [DOCS] Adds link to video landing page (elastic#101413)
  [ML] Move Index Data Visualizer into separate plugin (Part 1) (elastic#100922)
  Improve security plugin return types (elastic#101492)
  [ts] migrate `x-pack/test` to composite ts project (elastic#101441)
  [App Search] Updated Search UI to new URL (elastic#101320)
  ...
  • Loading branch information
@gmmorris
gmmorris committed Jun 9, 2021
2 parents 6bfc2b8 + 16e66b8 commit 0270133
Show file tree
Hide file tree
Showing 2,468 changed files with 35,625 additions and 27,484 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ module.exports = {
{
// Source files only - allow `any` in test/mock files
files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock,test_helper}.{ts,tsx}'],
rules: {
'@typescript-eslint/no-explicit-any': 'error',
},
Expand Down
46 changes: 24 additions & 22 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@

# ML team owns and maintains the transform plugin despite it living in the Data management section.
/x-pack/plugins/transform/ @elastic/ml-ui
/x-pack/plugins/data_visualizer/ @elastic/ml-ui
/x-pack/plugins/file_upload/ @elastic/ml-ui
/x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui
/x-pack/test/api_integration/apis/transform/ @elastic/ml-ui
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
Expand Down Expand Up @@ -306,28 +308,28 @@
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend

# Stack Management
/src/plugins/dev_tools/ @elastic/kibana-stack-management
/src/plugins/console/ @elastic/kibana-stack-management
/src/plugins/es_ui_shared/ @elastic/kibana-stack-management
/x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management
/x-pack/plugins/index_lifecycle_management/ @elastic/kibana-stack-management
/x-pack/plugins/console_extensions/ @elastic/kibana-stack-management
/x-pack/plugins/grokdebugger/ @elastic/kibana-stack-management
/x-pack/plugins/index_management/ @elastic/kibana-stack-management
/x-pack/plugins/license_api_guard/ @elastic/kibana-stack-management
/x-pack/plugins/license_management/ @elastic/kibana-stack-management
/x-pack/plugins/painless_lab/ @elastic/kibana-stack-management
/x-pack/plugins/remote_clusters/ @elastic/kibana-stack-management
/x-pack/plugins/rollup/ @elastic/kibana-stack-management
/x-pack/plugins/searchprofiler/ @elastic/kibana-stack-management
/x-pack/plugins/snapshot_restore/ @elastic/kibana-stack-management
/x-pack/plugins/upgrade_assistant/ @elastic/kibana-stack-management
/x-pack/plugins/watcher/ @elastic/kibana-stack-management
/x-pack/plugins/ingest_pipelines/ @elastic/kibana-stack-management
/packages/kbn-ace/ @elastic/kibana-stack-management
/packages/kbn-monaco/ @elastic/kibana-stack-management
#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management
/src/plugins/dev_tools/ @elastic/kibana-stack-management
/src/plugins/console/ @elastic/kibana-stack-management
/src/plugins/es_ui_shared/ @elastic/kibana-stack-management
/x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management
/x-pack/plugins/index_lifecycle_management/ @elastic/kibana-stack-management
/x-pack/plugins/console_extensions/ @elastic/kibana-stack-management
/x-pack/plugins/grokdebugger/ @elastic/kibana-stack-management
/x-pack/plugins/index_management/ @elastic/kibana-stack-management
/x-pack/plugins/license_api_guard/ @elastic/kibana-stack-management
/x-pack/plugins/license_management/ @elastic/kibana-stack-management
/x-pack/plugins/painless_lab/ @elastic/kibana-stack-management
/x-pack/plugins/remote_clusters/ @elastic/kibana-stack-management
/x-pack/plugins/rollup/ @elastic/kibana-stack-management
/x-pack/plugins/searchprofiler/ @elastic/kibana-stack-management
/x-pack/plugins/snapshot_restore/ @elastic/kibana-stack-management
/x-pack/plugins/upgrade_assistant/ @elastic/kibana-stack-management
/x-pack/plugins/watcher/ @elastic/kibana-stack-management
/x-pack/plugins/ingest_pipelines/ @elastic/kibana-stack-management
/packages/kbn-ace/ @elastic/kibana-stack-management
/packages/kbn-monaco/ @elastic/kibana-stack-management
#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management

# Security Solution
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ npm-debug.log*
.vagrant

## @cypress/snapshot from apm plugin
snapshots.js
/snapshots.js

# release notes script output
report.csv
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@
],
"source": {
"path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
"lineNumber": 121
"lineNumber": 129
},
"deprecated": false,
"initialIsOpen": false
Expand Down
22 changes: 11 additions & 11 deletions api_docs/apm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
],
"source": {
"path": "x-pack/plugins/apm/public/plugin.ts",
"lineNumber": 45
"lineNumber": 47
},
"deprecated": false,
"lifecycle": "setup",
Expand All @@ -96,7 +96,7 @@
],
"source": {
"path": "x-pack/plugins/apm/public/plugin.ts",
"lineNumber": 47
"lineNumber": 49
},
"deprecated": false,
"lifecycle": "start",
Expand Down Expand Up @@ -144,7 +144,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 55
"lineNumber": 54
},
"deprecated": false,
"children": [
Expand All @@ -160,7 +160,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 65
"lineNumber": 64
},
"deprecated": false,
"children": [
Expand All @@ -183,7 +183,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 65
"lineNumber": 64
},
"deprecated": false,
"isRequired": true
Expand Down Expand Up @@ -237,7 +237,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 69
"lineNumber": 68
},
"deprecated": false,
"children": [
Expand All @@ -262,7 +262,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 70
"lineNumber": 69
},
"deprecated": false,
"isRequired": true
Expand All @@ -281,7 +281,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 71
"lineNumber": 70
},
"deprecated": false,
"isRequired": true
Expand Down Expand Up @@ -309,7 +309,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 269
"lineNumber": 260
},
"deprecated": false,
"children": [
Expand All @@ -331,7 +331,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 269
"lineNumber": 260
},
"deprecated": false,
"isRequired": true
Expand All @@ -351,7 +351,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 288
"lineNumber": 279
},
"deprecated": false,
"children": [],
Expand Down
Loading

0 comments on commit 0270133

Please sign in to comment.