Skip to content

Commit 2349f0d

Browse files
committed
Merge branch 'master' into testing/add-tests-for-pages
2 parents 8c59a1c + e9c31cd commit 2349f0d

File tree

803 files changed

+23403
-18214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

803 files changed

+23403
-18214
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ Summarize your PR. If it involves visual changes include a screenshot or gif.
44

55
### Checklist
66

7-
Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR.
7+
Delete any items that are not applicable to this PR.
88

9-
- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
109
- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
1110
- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials
1211
- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
1312
- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
13+
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
14+
- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
1415

1516
### For maintainers
1617

1718
- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
18-
- [ ] This includes a feature addition or change that requires a release note and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
19-

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"src/legacy/core_plugins/management",
2727
"src/plugins/management"
2828
],
29+
"advancedSettings": "src/plugins/advanced_settings",
2930
"kibana_react": "src/legacy/core_plugins/kibana_react",
3031
"kibana-react": "src/plugins/kibana_react",
3132
"kibana_utils": "src/plugins/kibana_utils",

NOTICE.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ which is available under a "MIT" license. The files based on this license are:
162162
- windows_priv_escalation_via_accessibility_features.json
163163
- windows_persistence_via_application_shimming.json
164164
- windows_execution_via_trusted_developer_utilities.json
165-
- windows_execution_via_net_com_assemblies.json
166-
- windows_execution_via_connection_manager.json
167165

168166
MIT License
169167

docs/setup/upgrade.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ instructions.
5050
[[upgrade-6x]]
5151
=== Upgrading from 6.x
5252

53-
The recommended path is to upgrade to 6.7 before upgrading to 7.0. This makes it
53+
The recommended path is to upgrade to 6.8 before upgrading to 7.0. This makes it
5454
easier to identify the required changes, and enables you to use the Upgrade
5555
Assistant to prepare for your upgrade to 7.0.
5656

@@ -59,11 +59,11 @@ dashboards is supported.
5959

6060
[float]
6161
[[upgrade-67]]
62-
=== Upgrading from 6.7
63-
To help you prepare for your upgrade to 7.0, 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant]
64-
To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
62+
=== Upgrading from 6.8
63+
To help you prepare for your upgrade to 7.0, 6.8 includes an https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade Assistant]
64+
To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
6565

66-
After you have addressed any issues that were identified by the Upgrade
66+
After you have addressed any issues that were identified by the Upgrade
6767
Assistant, <<upgrade-standard,upgrade to 7.0>>.
6868

6969

docs/siem/images/detections-ui.png

303 KB
Loading

docs/siem/images/hosts-ui.png

259 KB
Loading

docs/siem/images/network-ui.png

304 KB
Loading

docs/siem/images/overview-ui.png

392 KB
Loading

docs/siem/siem-ui.asciidoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,23 @@ investigation.
3333
[role="screenshot"]
3434
image::siem/images/network-ui.png[]
3535

36+
[float]
37+
[[detections-ui]]
38+
=== Detections
39+
40+
The Detections feature automatically searches for threats and creates
41+
signals when they are detected. Signal detection rules define the conditions
42+
for creating signals. The SIEM app comes with prebuilt rules that search for
43+
suspicious activity on your network and hosts. Additionally, you can
44+
create your own rules.
45+
46+
See {siem-guide}/detection-engine-overview.html[Detections] in the SIEM
47+
Guide for information on managing detection rules and signals via the UI
48+
or the Detections API.
49+
50+
[role="screenshot"]
51+
image::siem/images/detections-ui.png[]
52+
3653
[float]
3754
[[timelines-ui]]
3855
=== Timeline

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"@types/react-grid-layout": "^0.16.7",
145145
"@types/recompose": "^0.30.5",
146146
"JSONStream": "1.3.5",
147-
"abortcontroller-polyfill": "^1.3.0",
147+
"abort-controller": "^3.0.0",
148148
"angular": "^1.7.9",
149149
"angular-aria": "^1.7.8",
150150
"angular-elastic": "^2.5.1",
@@ -262,7 +262,7 @@
262262
"style-loader": "0.23.1",
263263
"symbol-observable": "^1.2.0",
264264
"tar": "4.4.13",
265-
"terser-webpack-plugin": "^2.1.2",
265+
"terser-webpack-plugin": "^2.3.4",
266266
"thread-loader": "^2.1.3",
267267
"tinygradient": "0.4.3",
268268
"tinymath": "1.2.1",
@@ -476,7 +476,7 @@
476476
"strip-ansi": "^3.0.1",
477477
"supertest": "^3.1.0",
478478
"supertest-as-promised": "^4.0.2",
479-
"tree-kill": "^1.2.1",
479+
"tree-kill": "^1.2.2",
480480
"typescript": "3.7.2",
481481
"typings-tester": "^0.3.2",
482482
"vinyl-fs": "^3.0.3",

0 commit comments

Comments
 (0)