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

[Security Solution] Init Osquery plugin #87109

Merged
merged 64 commits into from
Jan 28, 2021
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4a8791b
[Fleet] Use fleet server indices for enrollment keys
nchaulet Dec 16, 2020
e704999
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 22, 2020
272926f
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 22, 2020
4b93480
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 27, 2020
87c3452
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 28, 2020
cae8106
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 29, 2020
f738b37
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 29, 2020
47be337
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 29, 2020
d75033e
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Dec 30, 2020
cfd49c4
WIP
patrykkopycinski Dec 30, 2020
b828357
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 3, 2021
5f04a27
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Jan 3, 2021
175a379
[Fleet Server] Add support for index based agents
patrykkopycinski Jan 3, 2021
0989147
add missing files
patrykkopycinski Jan 3, 2021
1fa3c49
fix types
patrykkopycinski Jan 3, 2021
3bd57b1
Merge branch 'feature-poc-kibana-fleet-server-feature-flag-2' of gith…
patrykkopycinski Jan 4, 2021
a87337a
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 4, 2021
d40e18a
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 4, 2021
1ae8494
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 4, 2021
9da7de1
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 5, 2021
4f34ef5
Merge branch 'master' of github.com:elastic/kibana into feature-poc-k…
patrykkopycinski Jan 6, 2021
8c0d9f7
Merge branch 'feature-poc-kibana-fleet-server-feature-flag' of github…
patrykkopycinski Jan 7, 2021
bd1835f
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 7, 2021
1a36c03
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 8, 2021
97a2de7
WIP
patrykkopycinski Jan 9, 2021
d4f7885
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 9, 2021
328d562
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 11, 2021
5da5bb5
WIP
patrykkopycinski Jan 11, 2021
1049773
WIP
patrykkopycinski Jan 11, 2021
84e5757
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 11, 2021
43d9266
WIP
patrykkopycinski Jan 12, 2021
6a26cc2
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 12, 2021
dcd94ea
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 13, 2021
8aa8ef1
WIP
patrykkopycinski Jan 13, 2021
43c8848
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 13, 2021
dc0f1cd
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 13, 2021
c34d70f
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 13, 2021
de46ac4
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 14, 2021
cef4e1c
WIP
patrykkopycinski Jan 15, 2021
19117c4
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 15, 2021
ff66dd0
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 15, 2021
c2136ab
fix import
patrykkopycinski Jan 15, 2021
c5c5456
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 25, 2021
f04bbc0
sql autocomplete
lykkin Jan 20, 2021
0644248
added osquery mode to autocomplete
lykkin Jan 25, 2021
6f5a04c
Merge pull request #3 from lykkin/osquery-autocomplete
patrykkopycinski Jan 25, 2021
f81349b
cleanup
patrykkopycinski Jan 25, 2021
52cb197
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 25, 2021
6c1bb5c
docs
patrykkopycinski Jan 25, 2021
92a3894
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 26, 2021
5f7c561
cleanup
patrykkopycinski Jan 26, 2021
6d692e5
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 26, 2021
fd93e71
WIP
patrykkopycinski Jan 26, 2021
650e7d5
add osquery config
patrykkopycinski Jan 26, 2021
3303ecc
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 26, 2021
395abff
fix types
patrykkopycinski Jan 26, 2021
6f42f46
update i18n config
patrykkopycinski Jan 26, 2021
dc7e5b6
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 26, 2021
44e66d2
fix i18n
patrykkopycinski Jan 26, 2021
3ded958
fix types
patrykkopycinski Jan 26, 2021
c19334a
Merge branch 'master' of github.com:elastic/kibana into feat/init-osq…
patrykkopycinski Jan 26, 2021
049aa08
update readme
patrykkopycinski Jan 26, 2021
00b6ea1
Update plugin-list.asciidoc
patrykkopycinski Jan 26, 2021
69d5bb9
Merge branch 'master' into feat/init-osquery
patrykkopycinski Jan 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sql autocomplete
lykkin committed Jan 25, 2021
commit f04bbc0c04fd3b350ea9146295565e91245be696
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -275,7 +275,6 @@
"raw-loader": "^3.1.0",
"re2": "^1.15.4",
"react": "^16.12.0",
"react-ace": "^9.2.1",
"react-color": "^2.13.8",
"react-datetime": "^2.14.0",
"react-dom": "^16.12.0",
15 changes: 7 additions & 8 deletions x-pack/plugins/osquery/public/editor/index.tsx
Original file line number Diff line number Diff line change
@@ -5,16 +5,15 @@
*/

import React, { useCallback } from 'react';
import AceEditor from 'react-ace';

import 'ace-builds/src-min-noconflict/ext-searchbox';
import 'ace-builds/src-min-noconflict/ext-language_tools';
import 'ace-builds/src-noconflict/mode-sql';
import 'ace-builds/src-noconflict/theme-tomorrow';
import { EuiCodeEditor } from '@elastic/eui';
import 'brace/mode/sql';
import 'brace/theme/tomorrow';
import 'brace/ext/language_tools';

const EDITOR_SET_OPTIONS = {
enableBasicAutocompletion: true,
// useWorker: false,
enableBasicAutocompletion: true,
enableLiveAutocompletion: true,
};

interface OsqueryEditorProps {
@@ -32,7 +31,7 @@ const OsqueryEditorComponent: React.FC<OsqueryEditorProps> = ({ defaultValue, on
);

return (
<AceEditor
<EuiCodeEditor
value={defaultValue}
mode="sql"
theme="tomorrow"
13 changes: 1 addition & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -6445,7 +6445,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
mime-types "~2.1.24"
negotiator "0.6.2"

ace-builds@^1.4.12, ace-builds@^1.4.6:
ace-builds@^1.4.12:
version "1.4.12"
resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==
@@ -22993,17 +22993,6 @@ react-ace@^7.0.5:
lodash.isequal "^4.5.0"
prop-types "^15.7.2"

react-ace@^9.2.1:
version "9.2.1"
resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-9.2.1.tgz#1efaa0476c77649136def50e5c4ca30c7e546036"
integrity sha512-2arIeMER/W6/h+QGHs0YJ0pEJo5AmBOUs/R72Poa6eXSOSTpJPp/WkwD/KE7BgNy9vZ7YjlbqA+2ZcoVf6AjsQ==
dependencies:
ace-builds "^1.4.6"
diff-match-patch "^1.0.4"
lodash.get "^4.4.2"
lodash.isequal "^4.5.0"
prop-types "^15.7.2"

react-apollo@^2.1.4:
version "2.1.8"
resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.1.8.tgz#ebac0d9bee0f0906df3ce29207f94df337009887"