Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport] Bump to 5.1.2 #62117

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Conversation

sorenlouv
Copy link
Member

@sorenlouv sorenlouv commented Apr 1, 2020

This bumps backport from 4.9.0 to 5.1.2. Most notable changes:

Conflict resolution assistance
When a conflict happens:

  1. A list of the conflicting files will be displayed
  2. If configured (via "editor" property) the conflicting files will be opened in the user's preferred editor
  3. When resolved, the user can return to the backport terminal. The user does not have to stage (git add) or commit their changes - backport will do this for them when they agree to proceed.
  4. The backport process will continue as usual: the branch will be pushed and a PR created.

Kapture 2020-03-30 at 13 02 15

Improve heuristic for finding related backports
image
Green indicates a merged backport, and gray indicates a pending backport

Minor fixes:

  • ensure that backport -v and backport --version are equivalent

Full list of changes: https://github.com/sqren/backport/releases

@sorenlouv sorenlouv added release_note:skip Skip the PR/issue when compiling release notes v8.0.0 labels Apr 1, 2020
@sorenlouv sorenlouv merged commit 3b3e3f5 into elastic:master Apr 1, 2020
@sorenlouv sorenlouv deleted the bump-backport-5.1.2 branch April 1, 2020 12:10
@kibanamachine
Copy link
Contributor

💛 Build succeeded, but was flaky


Test Failures

Kibana Pipeline / kibana-xpack-agent / X-Pack Detection Engine API Integration Tests.x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules·ts.detection engine api security and spaces enabled create_rules creating rules should create a single Machine Learning rule

Link to Jenkins

Standard Out

Failed Tests Reporter:
  - Test has failed 8 times on tracked branches: https://github.com/elastic/kibana/issues/61995

[00:00:00]       │
[00:00:00]         └-: detection engine api security and spaces enabled
[00:00:00]           └-> "before all" hook
[00:00:10]           └-: create_rules
[00:00:10]             └-> "before all" hook
[00:00:10]             └-: creating rules
[00:00:10]               └-> "before all" hook
[00:00:10]               └-> should create a single rule with a rule_id
[00:00:10]                 └-> "before each" hook: global before each
[00:00:10]                 └-> "before each" hook
[00:00:10]                   │ info [o.e.x.i.a.TransportPutLifecycleAction] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding index lifecycle policy [.siem-signals-default]
[00:00:10]                   │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding template [.siem-signals-default] for index patterns [.siem-signals-default-*]
[00:00:10]                   │ info [o.e.c.m.MetaDataCreateIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001] creating index, cause [api], templates [.siem-signals-default], shards [1]/[1], mappings [_doc]
[00:00:10]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [null] to [{"phase":"new","action":"complete","name":"complete"}] in policy [.siem-signals-default]
[00:00:10]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"new","action":"complete","name":"complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] in policy [.siem-signals-default]
[00:00:10]                 │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-follow-shard-tasks"}] in policy [.siem-signals-default]
[00:00:17]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:17]                 │ proc [kibana]   log   [13:28:46.138] [error][plugins][siem] An error occurred during rule execution:
[00:00:17]                 │ proc [kibana] message: "[security_exception] missing authentication credentials for REST request [/auditbeat-*/_search?allow_no_indices=true&size=100&ignore_unavailable=true], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }"
[00:00:17]                 │ proc [kibana] name: "Simple Rule Query"
[00:00:17]                 │ proc [kibana] id: "d88706d9-f124-4ad4-b8eb-94fa42599ec5"
[00:00:17]                 │ proc [kibana] rule id: "rule-1"
[00:00:17]                 │ proc [kibana] signals index: ".siem-signals-default"
[00:00:17]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:17]                 └- ✓ pass  (7.3s) "detection engine api security and spaces enabled create_rules creating rules should create a single rule with a rule_id"
[00:00:17]               └-> "after each" hook
[00:00:17]                 │ proc [kibana]   log   [13:28:46.150] [error][alerting][alerting][plugins][plugins] Executing Alert "d88706d9-f124-4ad4-b8eb-94fa42599ec5" has resulted in Error: [security_exception] missing authentication credentials for REST request [/_security/user/_has_privileges], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }
[00:00:17]                 │ info [o.e.c.m.MetaDataDeleteIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001/cPgJmSmeR1Sos3nTKxlB9g] deleting index
[00:00:17]                 │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] removing template [.siem-signals-default]
[00:00:17]               └-> should create a single rule without an input index
[00:00:17]                 └-> "before each" hook: global before each
[00:00:17]                 └-> "before each" hook
[00:00:18]                   │ info [o.e.x.i.a.TransportPutLifecycleAction] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding index lifecycle policy [.siem-signals-default]
[00:00:18]                   │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding template [.siem-signals-default] for index patterns [.siem-signals-default-*]
[00:00:18]                   │ info [o.e.c.m.MetaDataCreateIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001] creating index, cause [api], templates [.siem-signals-default], shards [1]/[1], mappings [_doc]
[00:00:18]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [null] to [{"phase":"new","action":"complete","name":"complete"}] in policy [.siem-signals-default]
[00:00:18]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"new","action":"complete","name":"complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] in policy [.siem-signals-default]
[00:00:18]                 │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-follow-shard-tasks"}] in policy [.siem-signals-default]
[00:00:22]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:22]                 │ proc [kibana]   log   [13:28:51.284] [error][plugins][siem] An error occurred during rule execution:
[00:00:22]                 │ proc [kibana] message: "[security_exception] missing authentication credentials for REST request [/apm-*-transaction*%2Cauditbeat-*%2Cendgame-*%2Cfilebeat-*%2Cpacketbeat-*%2Cwinlogbeat-*/_search?allow_no_indices=true&size=100&ignore_unavailable=true], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }"
[00:00:22]                 │ proc [kibana] name: "Simple Rule Query"
[00:00:22]                 │ proc [kibana] id: "8ddfca2d-ef54-4d7b-aa35-fb605382ba81"
[00:00:22]                 │ proc [kibana] rule id: "rule-1"
[00:00:22]                 │ proc [kibana] signals index: ".siem-signals-default"
[00:00:22]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:22]                 │ proc [kibana]   log   [13:28:51.289] [error][alerting][alerting][plugins][plugins] Executing Alert "8ddfca2d-ef54-4d7b-aa35-fb605382ba81" has resulted in Error: [security_exception] missing authentication credentials for REST request [/_security/user/_has_privileges], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }
[00:00:23]                 └- ✓ pass  (5.5s) "detection engine api security and spaces enabled create_rules creating rules should create a single rule without an input index"
[00:00:23]               └-> "after each" hook
[00:00:23]                 │ info [o.e.c.m.MetaDataDeleteIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001/AuclPO-HQ9-iDox5P4evgg] deleting index
[00:00:23]                 │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] removing template [.siem-signals-default]
[00:00:23]               └-> should create a single rule without a rule_id
[00:00:23]                 └-> "before each" hook: global before each
[00:00:23]                 └-> "before each" hook
[00:00:24]                   │ info [o.e.x.i.a.TransportPutLifecycleAction] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding index lifecycle policy [.siem-signals-default]
[00:00:24]                   │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding template [.siem-signals-default] for index patterns [.siem-signals-default-*]
[00:00:24]                   │ info [o.e.c.m.MetaDataCreateIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001] creating index, cause [api], templates [.siem-signals-default], shards [1]/[1], mappings [_doc]
[00:00:24]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [null] to [{"phase":"new","action":"complete","name":"complete"}] in policy [.siem-signals-default]
[00:00:24]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"new","action":"complete","name":"complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] in policy [.siem-signals-default]
[00:00:24]                 │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-follow-shard-tasks"}] in policy [.siem-signals-default]
[00:00:28]                 └- ✓ pass  (4.6s) "detection engine api security and spaces enabled create_rules creating rules should create a single rule without a rule_id"
[00:00:28]               └-> "after each" hook
[00:00:28]                 │ info [o.e.c.m.MetaDataDeleteIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001/LeEKF5XIQH68XZwFYboZSQ] deleting index
[00:00:28]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:28]                 │ proc [kibana]   log   [13:28:57.375] [error][plugins][siem] An error occurred during rule execution:
[00:00:28]                 │ proc [kibana] message: "[security_exception] missing authentication credentials for REST request [/auditbeat-*/_search?allow_no_indices=true&size=100&ignore_unavailable=true], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }"
[00:00:28]                 │ proc [kibana] name: "Simple Rule Query"
[00:00:28]                 │ proc [kibana] id: "96abe9ee-b3d1-4483-95ee-b8022e46cd7a"
[00:00:28]                 │ proc [kibana] rule id: "e6277ea4-5800-47b6-a66f-ddceb6868c37"
[00:00:28]                 │ proc [kibana] signals index: ".siem-signals-default"
[00:00:28]                 │ info [o.e.x.s.a.AuthenticationService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] Authentication using apikey failed - api key has been invalidated
[00:00:28]                 │ proc [kibana]   log   [13:28:57.379] [error][alerting][alerting][plugins][plugins] Executing Alert "96abe9ee-b3d1-4483-95ee-b8022e46cd7a" has resulted in Error: [security_exception] missing authentication credentials for REST request [/_security/user/_has_privileges], with { header={ WWW-Authenticate={ 0="Bearer realm=\"security\"" & 1="ApiKey" & 2="Basic realm=\"security\" charset=\"UTF-8\"" } } }
[00:00:29]                 │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] removing template [.siem-signals-default]
[00:00:29]               └-> should create a single Machine Learning rule
[00:00:29]                 └-> "before each" hook: global before each
[00:00:29]                 └-> "before each" hook
[00:00:29]                   │ info [o.e.x.i.a.TransportPutLifecycleAction] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding index lifecycle policy [.siem-signals-default]
[00:00:29]                   │ info [o.e.c.m.MetaDataIndexTemplateService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] adding template [.siem-signals-default] for index patterns [.siem-signals-default-*]
[00:00:29]                   │ info [o.e.c.m.MetaDataCreateIndexService] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] [.siem-signals-default-000001] creating index, cause [api], templates [.siem-signals-default], shards [1]/[1], mappings [_doc]
[00:00:29]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [null] to [{"phase":"new","action":"complete","name":"complete"}] in policy [.siem-signals-default]
[00:00:29]                   │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"new","action":"complete","name":"complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] in policy [.siem-signals-default]
[00:00:29]                 │ info [o.e.x.i.IndexLifecycleTransition] [kibana-ci-immutable-centos-tests-xl-1585743682474162399] moving index [.siem-signals-default-000001] from [{"phase":"hot","action":"unfollow","name":"wait-for-indexing-complete"}] to [{"phase":"hot","action":"unfollow","name":"wait-for-follow-shard-tasks"}] in policy [.siem-signals-default]
[00:00:32]                 │ proc [kibana]   log   [13:29:00.493] [warning][plugins][siem] Machine learning job is not started:
[00:00:32]                 │ proc [kibana] job id: "some_job_id"
[00:00:32]                 │ proc [kibana] job status: "undefined"
[00:00:32]                 │ proc [kibana] datafeed status: "undefined"
[00:00:32]                 │ proc [kibana] name: "Simple ML Rule"
[00:00:32]                 │ proc [kibana] id: "34500f46-9b3e-4cd2-ba81-897d07c32968"
[00:00:32]                 │ proc [kibana] rule id: "rule-1"
[00:00:32]                 │ proc [kibana] signals index: ".siem-signals-default"
[00:00:33]                 └- ✖ fail: "detection engine api security and spaces enabled create_rules creating rules should create a single Machine Learning rule"
[00:00:33]                 │

Stack Trace

{ Error: expected { created_by: 'elastic',
  description: 'Simple Machine Learning Rule',
  enabled: true,
  false_positives: [],
  from: 'now-6m',
  immutable: false,
  interval: '5m',
  rule_id: 'rule-1',
  output_index: '.siem-signals-default',
  max_signals: 100,
  risk_score: 1,
  name: 'Simple ML Rule',
  references: [],
  severity: 'high',
  updated_by: 'elastic',
  tags: [],
  to: 'now',
  type: 'machine_learning',
  threat: [],
  version: 1,
  lists: [],
  actions: [],
  throttle: 'no_actions',
  last_failure_at: '2020-04-01T13:29:00.508Z',
  last_failure_message: 'Machine learning job is not started:\njob id: "some_job_id"\njob status: "undefined"\ndatafeed status: "undefined"\nname: "Simple ML Rule"\nid: "34500f46-9b3e-4cd2-ba81-897d07c32968"\nrule id: "rule-1"\nsignals index: ".siem-signals-default"',
  anomaly_threshold: 44,
  machine_learning_job_id: 'some_job_id' } to sort of equal { actions: [],
  created_by: 'elastic',
  description: 'Simple Machine Learning Rule',
  enabled: true,
  false_positives: [],
  from: 'now-6m',
  immutable: false,
  interval: '5m',
  rule_id: 'rule-1',
  output_index: '.siem-signals-default',
  max_signals: 100,
  risk_score: 1,
  name: 'Simple ML Rule',
  references: [],
  severity: 'high',
  updated_by: 'elastic',
  tags: [],
  to: 'now',
  type: 'machine_learning',
  threat: [],
  throttle: 'no_actions',
  lists: [],
  version: 1,
  anomaly_threshold: 44,
  machine_learning_job_id: 'some_job_id' }
    at Assertion.assert (/dev/shm/workspace/kibana/packages/kbn-expect/expect.js:100:11)
    at Assertion.eql (/dev/shm/workspace/kibana/packages/kbn-expect/expect.js:244:8)
    at Context.it (test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts:101:34)
  actual:
   '{\n  "actions": []\n  "anomaly_threshold": 44\n  "created_by": "elastic"\n  "description": "Simple Machine Learning Rule"\n  "enabled": true\n  "false_positives": []\n  "from": "now-6m"\n  "immutable": false\n  "interval": "5m"\n  "last_failure_at": "2020-04-01T13:29:00.508Z"\n  "last_failure_message": "Machine learning job is not started:\\njob id: \\"some_job_id\\"\\njob status: \\"undefined\\"\\ndatafeed status: \\"undefined\\"\\nname: \\"Simple ML Rule\\"\\nid: \\"34500f46-9b3e-4cd2-ba81-897d07c32968\\"\\nrule id: \\"rule-1\\"\\nsignals index: \\".siem-signals-default\\""\n  "lists": []\n  "machine_learning_job_id": "some_job_id"\n  "max_signals": 100\n  "name": "Simple ML Rule"\n  "output_index": ".siem-signals-default"\n  "references": []\n  "risk_score": 1\n  "rule_id": "rule-1"\n  "severity": "high"\n  "tags": []\n  "threat": []\n  "throttle": "no_actions"\n  "to": "now"\n  "type": "machine_learning"\n  "updated_by": "elastic"\n  "version": 1\n}',
  expected:
   '{\n  "actions": []\n  "anomaly_threshold": 44\n  "created_by": "elastic"\n  "description": "Simple Machine Learning Rule"\n  "enabled": true\n  "false_positives": []\n  "from": "now-6m"\n  "immutable": false\n  "interval": "5m"\n  "lists": []\n  "machine_learning_job_id": "some_job_id"\n  "max_signals": 100\n  "name": "Simple ML Rule"\n  "output_index": ".siem-signals-default"\n  "references": []\n  "risk_score": 1\n  "rule_id": "rule-1"\n  "severity": "high"\n  "tags": []\n  "threat": []\n  "throttle": "no_actions"\n  "to": "now"\n  "type": "machine_learning"\n  "updated_by": "elastic"\n  "version": 1\n}',
  showDiff: true }

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

gmmorris added a commit to gmmorris/kibana that referenced this pull request Apr 1, 2020
* master: (44 commits)
  [Alerting] add alerting privileges for uptime and metrics (elastic#61113)
  Update percy agent to latest version (elastic#62089)
  [APM] Update central configuration text (elastic#61556)
  [Fleet] Ouput api key do not need metricbeat* access (elastic#60319)
  Document new `xpack.security.authc.*` settings and related 8.0.0 breaking changes. (elastic#61443)
  Migrate test plugins ⇒ NP (kbn_tp_sample_panel_action) (elastic#60749)
  [Alerting] Add "Start trial" button for connectors (elastic#61774)
  [ML] Transforms: Fix handling of default and advanced search on step summary view. (elastic#61799)
  [Task Manager] Change info message "ran out Available Workers" to debug (elastic#62083)
  [Maps] Highlight selected layer in TOC (elastic#61510)
  ensure pageIndex is set correclty in analytics list (elastic#62041)
  [ML] Functional API tests - fix mml request bodies (elastic#62116)
  Fix validation for index threshold when selecting an index (elastic#61615)
  [SIEM][Detection Engine] Adds release notes link and updates one UI section
  [backport] Bump to 5.1.2 (elastic#62117)
  [APM] .apm-agent-configuration is not created if Kibana is started while ES is not ready (elastic#61610)
  [Fleet] Enrollment list page (elastic#61346)
  [ML] Fix maximum default enabled columns for data grid. (elastic#62005)
  [Home][Tutorial] Add Oracle data UI (elastic#61595)
  [APM] Ensure telemetry data matches SO/telemetry mapping (elastic#61957)
  ...
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 3, 2020
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 62117 or prevent reminders by adding the backport:skip label.

@sorenlouv sorenlouv added the backport:skip This commit does not require backporting label Apr 4, 2020
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants