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

Add Data - CSV #7372

Merged
merged 391 commits into from
Jun 17, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
391 commits
Select commit Hold shift + click to select a range
32b6bec
[ingest client] modified buildProcessorTypeList to use map
BigFunger Mar 15, 2016
f561883
[ingest client] Removed processor.data property and added model gette…
BigFunger Mar 15, 2016
98f9f53
Merge branch 'master' into feature/ingest
Bargs Mar 15, 2016
0be2544
[ingest client] tweaks to make preview work with new structure
BigFunger Mar 16, 2016
a11c13e
[ingest client] Finished peer review with bargs
BigFunger Mar 16, 2016
2c32d9f
Update ingest POST endpoint to accept the new processor schema
Bargs Mar 16, 2016
95c80a0
[ingest client] added additional tests for pipeline
BigFunger Mar 17, 2016
d0f1f07
Merge pull request #6552 from Bargs/ingest/newSchema
Mar 17, 2016
1ca3d27
Merge branch 'feature/ingest' into ingest-pipeline-setup-client
BigFunger Mar 17, 2016
91be043
[ingest client] fixes invalid-set-processor simulate test
BigFunger Mar 18, 2016
ad349b5
Merge pull request #6497 from BigFunger/ingest-pipeline-setup-client
BigFunger Mar 18, 2016
bbd7187
Merge branch 'master' into feature/ingest
Bargs Mar 18, 2016
89c3ecf
Merge branch 'master' into feature/ingest
Bargs Mar 21, 2016
85be042
Merge branch 'master' into feature/ingest
Bargs Mar 22, 2016
9083930
Implements a pattern checker directive for use in the Add Data UI
Bargs Mar 9, 2016
43e7eb0
Cancel timeout on scope
Bargs Mar 14, 2016
7931f1a
Remove user control of pattern polling and add some explanation to th…
Bargs Mar 14, 2016
c450934
Use the new count API in place of the elasticsearch proxy
Bargs Mar 16, 2016
f83c4fd
Fix incorrect property access
Bargs Mar 18, 2016
615560f
Added tests for patternChecker directive
Bargs Mar 21, 2016
e39fc50
Merge pull request #6493 from Bargs/ingest/filebeatVerify
Mar 22, 2016
ad01828
Merge branch 'master' into feature/ingest
Bargs Mar 23, 2016
d9aecd3
Merge branch 'master' into feature/ingest
Bargs Mar 23, 2016
818cf60
Merge branch 'master' of github.com:elastic/kibana into es6ify/module…
spalger Mar 23, 2016
f4517fb
[es6ify] re-apply automated transforms after ingest work
spalger Mar 23, 2016
e52125a
Merge branch 'feature/ingest' of github.com:elastic/kibana into es6if…
spalger Mar 23, 2016
8c54187
Fixing a few extra require statements hanging about in the ingest code
Bargs Mar 23, 2016
996d649
Merge pull request #15 from Bargs/hangingChads
spalger Mar 23, 2016
26f63d3
[ingest] export/consume register functions consistently
spalger Mar 23, 2016
ad56095
Merge pull request #6623 from spalger/es6ify/modules/ingest
Mar 24, 2016
b1e1c63
Merge branch 'master' into feature/ingest
Bargs Mar 24, 2016
0e7ffff
Merge branch 'master' into feature/ingest
Bargs Mar 25, 2016
b48a284
[ingest client/server] added logic to deal with errors from simulate API
BigFunger Mar 28, 2016
7c57c34
[ingest] removed unnecessary optional statement from joi schema
BigFunger Mar 28, 2016
7278cb3
[ingest] small tweek
BigFunger Mar 28, 2016
3e39928
Merge branch 'master' into feature/ingest
Bargs Mar 28, 2016
7e697cf
[add data] addresses underscore function names in pipeline class
BigFunger Mar 29, 2016
9b25c3b
[add data] fixed bug where I didnt pass in pipeline
BigFunger Mar 29, 2016
4fb1118
Merge branch 'feature/ingest' into ingest-error-handling
BigFunger Mar 29, 2016
8e94b1f
Merge branch 'master' into feature/ingest
Bargs Mar 29, 2016
1b6a6f9
Merge branch 'master' into feature/ingest
Bargs Mar 31, 2016
c63a5a2
[add data] Attempts to deal with unhandled errors in the ingest API
BigFunger Apr 5, 2016
ea71928
[add data] added error-flow tests to the _simulate suite
BigFunger Apr 6, 2016
4317045
[add data] removed dirtyProcessor logic.
BigFunger Apr 6, 2016
699ecfa
Merge branch 'feature/ingest' into ingest-error-handling
BigFunger Apr 6, 2016
add7e81
[add data] fixed failing test
BigFunger Apr 6, 2016
889c9c1
Merge pull request #6675 from BigFunger/ingest-error-handling
BigFunger Apr 7, 2016
7c0c6e2
[add data] fixed pipeline output when no processors in error
BigFunger Apr 7, 2016
34dcd7f
[add data] added append processor to processor_types
BigFunger Apr 7, 2016
be93f5c
[add data] updated test case
BigFunger Apr 7, 2016
930a44d
[add data] adds convert processor
BigFunger Apr 7, 2016
7de50bf
[add data] Finished adding the append processor
BigFunger Apr 7, 2016
168a173
[add data] removed hasValidOutput and reworked pipeline output logic
BigFunger Apr 7, 2016
00a5bb2
Merge pull request #6817 from BigFunger/ingest-pipeline-output
Apr 7, 2016
44e1e87
Merge pull request #6818 from BigFunger/add-data-processors-append
BigFunger Apr 7, 2016
d646768
Merge branch 'master' into feature/ingest
Bargs Apr 8, 2016
3fe7dd9
Merge branch 'feature/ingest' into add-data-processors-convert
BigFunger Apr 8, 2016
61dd02e
[add data] added auto type and target field to convert processor
BigFunger Apr 8, 2016
14799bf
[add data] adds the date processor
BigFunger Apr 8, 2016
70be789
[add data] fixed test comment
BigFunger Apr 8, 2016
2f32551
[add data] removes default value for target_field
BigFunger Apr 8, 2016
1f18bda
[MISC] Fix malformed requests preventing charles proxy from working
Bargs Apr 1, 2016
41dffa2
[add data] PR review changes
BigFunger Apr 11, 2016
9851446
[add data] adds unit tests for create_multi_select_model
BigFunger Apr 11, 2016
04d5662
[add data] adds external link for locale help
BigFunger Apr 11, 2016
96ca564
[add data] changes convert message logic
BigFunger Apr 11, 2016
3f8cdab
Merge pull request #6819 from BigFunger/add-data-processors-convert
BigFunger Apr 11, 2016
6bd9dba
Merge branch 'feature/ingest' into add-data-processors-date
BigFunger Apr 11, 2016
2ec8900
Merge pull request #6831 from BigFunger/add-data-processors-date
BigFunger Apr 11, 2016
96cbe89
[add data] adds the geoip processor
BigFunger Apr 11, 2016
093cced
[add data] adds grok processor
BigFunger Apr 11, 2016
db305cb
Merge pull request #6843 from Bargs/fix/transportUrl
Apr 11, 2016
335c82a
[add data] adds the join processor
BigFunger Apr 11, 2016
3462a5f
[add data] adds database_file and fields to the geoip processor
BigFunger Apr 12, 2016
d42ac6e
[add data] adds the lowercase processor
BigFunger Apr 12, 2016
f62ebc4
[add data] adds the remove processor
BigFunger Apr 12, 2016
33dd6d6
[add data] adds rename processor
BigFunger Apr 12, 2016
07664a8
[add data] adds the split processor
BigFunger Apr 12, 2016
ee802ee
[add data] removed default values for database_file and fields from g…
BigFunger Apr 12, 2016
69d1660
[add data] geoip processor - added advanced settings section
BigFunger Apr 12, 2016
d03818f
Merge pull request #6853 from BigFunger/add-data-processors-geoip
BigFunger Apr 12, 2016
da5489d
Merge branch 'feature/ingest' into add-data-processors-grok
BigFunger Apr 12, 2016
f60cb04
Merge pull request #6854 from BigFunger/add-data-processors-grok
BigFunger Apr 12, 2016
6904664
[add data] adds the trim processor
BigFunger Apr 13, 2016
6127251
[add data] adds the uppercase processor
BigFunger Apr 13, 2016
48c719d
Merge branch 'master' into feature/ingest
Bargs Apr 18, 2016
2b035f0
Merge branch 'feature/ingest' into add-data-processors-join
BigFunger Apr 19, 2016
9aed9a2
Merge pull request #6857 from BigFunger/add-data-processors-join
BigFunger Apr 19, 2016
a873c6f
Merge branch 'feature/ingest' into add-data-processors-lowercase
BigFunger Apr 19, 2016
590dcaa
[add data] added filter to lowercase processor to only list strings
BigFunger Apr 19, 2016
f690c65
Merge pull request #6869 from BigFunger/add-data-processors-lowercase
BigFunger Apr 19, 2016
a54a1bb
Merge branch 'feature/ingest' into add-data-processors-remove
BigFunger Apr 19, 2016
5f4bc2c
Merge pull request #6871 from BigFunger/add-data-processors-remove
BigFunger Apr 19, 2016
2992d77
Merge branch 'feature/ingest' into add-data-processors-rename
BigFunger Apr 19, 2016
56b5082
Merge pull request #6873 from BigFunger/add-data-processors-rename
BigFunger Apr 19, 2016
6eb544f
Merge branch 'feature/ingest' into add-data-processors-split
BigFunger Apr 19, 2016
e49d139
[add data] adds string field filter to the split processor
BigFunger Apr 19, 2016
67691bd
Merge pull request #6874 from BigFunger/add-data-processors-split
BigFunger Apr 19, 2016
3e8eab9
Merge branch 'feature/ingest' into add-data-processors-trim
BigFunger Apr 19, 2016
59d6e21
[add data] adds string filter to trim processor
BigFunger Apr 19, 2016
1b59516
Merge pull request #6891 from BigFunger/add-data-processors-trim
BigFunger Apr 19, 2016
7c3ac16
Merge branch 'feature/ingest' into add-data-processors-uppercase
BigFunger Apr 19, 2016
5c0af95
[add data] adds string filter to uppercase processor
BigFunger Apr 19, 2016
84755e5
Merge pull request #6897 from BigFunger/add-data-processors-uppercase
BigFunger Apr 19, 2016
c2c2946
Fixes #6912 - Adjustments to the Add Data template to better align wi…
Bargs Apr 19, 2016
22edba9
Fix #6980 - Add instruction to update filebeat template
Bargs Apr 19, 2016
939a6f8
[add data] removed Add Processor button
BigFunger Apr 20, 2016
523b5d9
[add data] Modifies the pipeline output and source data directives
BigFunger Apr 20, 2016
506c4bf
[add data] Layout redesign changes
BigFunger Apr 20, 2016
36b332f
Merge pull request #6990 from BigFunger/add-data-processor-dropdown
BigFunger Apr 20, 2016
5ab7548
[add data] removes duplicate scope attribute
BigFunger Apr 20, 2016
99767bd
Merge branch 'feature/ingest' into add-data-source-record
BigFunger Apr 20, 2016
398747b
Merge pull request #6992 from BigFunger/add-data-source-record
BigFunger Apr 20, 2016
6f5afe8
Merge branch 'feature/ingest' into add-data-redesign
BigFunger Apr 20, 2016
2795724
[add data] adds ability to collapse panels on pipeline setup
BigFunger Apr 20, 2016
bbb487e
[add data] modifies the helper text at the top of the pipeline setup …
BigFunger Apr 20, 2016
943f38b
[add data] adds some help bubbles
BigFunger Apr 21, 2016
446e3b4
[add data] changes default height of build pipeline section
BigFunger Apr 21, 2016
3b147e0
[add data] removed unnecessary class and moved styles
BigFunger Apr 21, 2016
a78b771
[add data] changes expand/collapse tooltips
BigFunger Apr 21, 2016
9b7edf6
[add data] removed help link from grok processor
BigFunger Apr 21, 2016
a00e033
Merge pull request #6993 from BigFunger/add-data-redesign
BigFunger Apr 21, 2016
753c112
Merge pull request #6994 from BigFunger/add-data-collapse-panels
BigFunger Apr 21, 2016
6ad24bd
Merge branch 'feature/ingest' into add-data-help-bubbles
BigFunger Apr 21, 2016
bf5367c
Merge pull request #7000 from BigFunger/add-data-help-bubbles
BigFunger Apr 21, 2016
4246bc1
[Styles] Update Generic Add Data wizard styling and layout to match p…
Bargs Apr 21, 2016
5608732
Allow sections with no tabs
Bargs Apr 21, 2016
91a2ae1
Update processor property names that changed in ES
Bargs Apr 26, 2016
ebfca08
Merge pull request #6979 from Bargs/ingest/removeStringDefault
Apr 26, 2016
960424b
Merge pull request #6984 from Bargs/ingest/fbTemplate
Apr 26, 2016
9e18552
Merge pull request #7014 from Bargs/ingest/navigation
Apr 26, 2016
a9048e7
[add data] hides disabled processors
BigFunger Apr 26, 2016
ef39e4f
Merge pull request #7060 from Bargs/fixApiTests
BigFunger Apr 26, 2016
9b4f8d9
[add data] Update processor property names that changed in ES
BigFunger Apr 26, 2016
b2a9a88
[add data] fixed minimum height for the pipeline output when maximized
BigFunger Apr 26, 2016
b2f30f9
Merge branch 'feature/ingest' into add-data-disable-processors
BigFunger Apr 26, 2016
715c4c1
Fix #6971 - handle object fields correctly
Bargs Apr 19, 2016
3dae556
Fix #6622 detect geo point fields correctly
Bargs Apr 19, 2016
5b30304
[Tests] Handling geopoint fields
Bargs Apr 19, 2016
ae36a71
Fix lint errors
Bargs Apr 19, 2016
5731e84
Create utility libs for traversing objects as elasticsearch would
Bargs Apr 26, 2016
72cd3fb
Fix array field handling by using new object traversal utilities
Bargs Apr 26, 2016
422d906
Switch em to px on non font-size properties
Bargs Apr 25, 2016
2f789e2
Merge branch 'master' into feature/ingest
Bargs Apr 26, 2016
df5672b
Merge pull request #7013 from Bargs/ingest/wizardStyleUpdates
Apr 26, 2016
9e09d12
Fix 6748 - Make pipeline creation step skipable
Bargs Apr 19, 2016
35be343
Merge pull request #7066 from BigFunger/add-data-pipeline-output-height
BigFunger Apr 27, 2016
054d4f0
Merge pull request #7064 from BigFunger/add-data-geoip-property-change
BigFunger Apr 27, 2016
93ea5ed
[add data] added error handling when getting processors, and fixed co…
BigFunger Apr 27, 2016
f0e99c3
[add data] added tests for ingest.getProcessors
BigFunger Apr 27, 2016
ff26c18
Merge pull request #7065 from BigFunger/add-data-disable-processors
BigFunger Apr 27, 2016
be72172
[add data] split processor converters and types
BigFunger Apr 28, 2016
31ff932
Merge pull request #6982 from Bargs/ingest/skipPipeline
Apr 28, 2016
0023839
Merge branch 'master' into feature/ingest
Bargs Apr 29, 2016
a16adbe
[Styles] Update the paste screen styles
Bargs Apr 21, 2016
ea63a8a
Move paste step files into their own directory
Bargs Apr 26, 2016
060fc99
[Styles] Update everything on the review page but the table
Bargs Apr 22, 2016
e95f683
[Styles] Final touches on review screen - pagination, table end, nav …
Bargs Apr 22, 2016
302d5fe
[Styles] Update filebeat install screen styles
Bargs Apr 22, 2016
1c333e8
[add data] reorganized front end processor files
BigFunger Apr 29, 2016
c04fbe6
Improved less variables
Bargs Apr 29, 2016
1643607
move common styles up one level so they apply to all wizards
Bargs Apr 29, 2016
aafa611
Move paste samples step styles to their own file
Bargs Apr 29, 2016
3f18f8e
Merge pull request #7033 from Bargs/ingest/installFilebeatStyles
Apr 29, 2016
c349a56
[DocLinks] Create a documentation link service with dynamic version n…
Bargs Apr 20, 2016
c821159
[FilebeatInstall] Remove hardcoded links and use the new documentatio…
Bargs Apr 20, 2016
1926df9
Fix link I missed on the paste step screen
Bargs Apr 29, 2016
40654d1
[API] Add CSV bulk indexing support to Kibana API
Bargs Mar 18, 2016
6ceca8b
[API] Functional tests for _bulk API
Bargs Apr 8, 2016
19be188
[API] Use JSONStream instead of manually stringifying
Bargs Apr 12, 2016
602fff1
[API] lower bulk size
Bargs Apr 12, 2016
81d4865
[API] Add Highland's nil to mocha's list of globals
Bargs Apr 27, 2016
89988b8
Update test for new lower bulk size
Bargs Apr 27, 2016
bfba35f
[API] Accept both multipart/form-data and raw payloads
Bargs Apr 29, 2016
6dc9cc9
Increase the default max payload size for the basePathProxy so it doe…
Bargs Apr 29, 2016
ab5e444
Fix lint issues
Bargs Apr 29, 2016
d50c452
Hapi doesn't parse query string params
Bargs Apr 29, 2016
fdfe7bf
[add data] reorganized all files into processors folder
BigFunger Apr 29, 2016
c0b04ea
Merge branch 'master' into feature/ingest
Bargs May 2, 2016
c36c17b
Merge branch 'feature/ingest' into ingest/reviewGeo
Bargs May 2, 2016
ceb7b4d
Merge branch 'feature/ingest' into ingest/docLinks
Bargs May 3, 2016
a625c2e
Merge pull request #6989 from Bargs/ingest/docLinks
May 3, 2016
68865ae
[add data] fixed styling of textarea controls on processor views
BigFunger May 4, 2016
81ea488
Better date field detection without flaky pipeline introspection
Bargs May 4, 2016
900dc78
Git rid of knownFieldTypes variable and rename fields to sampleFields…
Bargs May 4, 2016
6a9e3f8
Make isGeoPointObject return false instead of undefined when passed a…
Bargs May 4, 2016
d54aa52
Simplify forEachField logic
Bargs May 4, 2016
5f3e629
Default fields with null sample values to type string instead of obje…
Bargs May 4, 2016
777421d
Add tests for detecting date fields and conflicting array values
Bargs May 4, 2016
c44c492
Merge pull request #7130 from BigFunger/add-data-textareas
BigFunger May 5, 2016
09f2784
Merge branch 'feature/ingest' into add-data-split-converters
BigFunger May 6, 2016
3681f9a
[add data] moved converters index file
BigFunger May 6, 2016
1b8adbd
Merge pull request #7084 from BigFunger/add-data-split-converters
BigFunger May 9, 2016
12e78b3
Make type handling in the UI more clear with better variable names
Bargs May 9, 2016
37e2c5a
Merge branch 'master' into feature/ingest
Bargs May 9, 2016
1372cae
Merge pull request #6978 from Bargs/ingest/reviewGeo
May 9, 2016
ee16d41
Create give useful names to confusing byte sums
Bargs May 10, 2016
bc65d95
Change _bulk to _data
Bargs May 10, 2016
417d8a3
only need the parse portion of the csv package
Bargs May 10, 2016
b85952f
Better doc IDs and a descriptive variable name
Bargs May 10, 2016
05b198a
Merge branch 'feature/ingest' into ingest/bulkAPI
Bargs May 10, 2016
08427ee
Rename data dir to fixtures
Bargs May 11, 2016
b34460a
Empty lines at the beginning of a file will no longer cause an error
Bargs May 11, 2016
475913d
Change delimiter query param to csv_delimiter so better namespace it …
Bargs May 11, 2016
5918737
Merge pull request #6844 from Bargs/ingest/bulkAPI
May 11, 2016
385db4e
Remove access to the tail a file wizard
Bargs May 12, 2016
57c391a
[Wizard] Creates a new CSV Add Data Wizard
Bargs Mar 17, 2016
ed5e4e3
Remove pipeline creation step from CSV wizard
Bargs May 10, 2016
dbb1eea
Merge pull request #7190 from Bargs/removeTailFile
May 16, 2016
d6bac79
Merge branch 'feature/ingest' into ingest/uploadUI
Bargs May 17, 2016
e23f54a
[Wizard] Improved index pattern input validation
Bargs May 17, 2016
a32364f
[Wizard] Default index pattern input value on pattern review step is now
Bargs May 19, 2016
e11b270
Refresh index pattern cache after saving or deleting via ingest service
Bargs May 19, 2016
271e78f
Enhance kbnUrl to allow setting app state on target url
Bargs May 19, 2016
c080b3d
[Wizard] Done button now sends you to the correct index pattern on di…
Bargs May 19, 2016
4140db8
[Wizard] code cleanup
Bargs May 20, 2016
f604b12
[Wizard] Ensure row values are ordered correctly
Bargs May 20, 2016
625ca75
[Wizard] Fix test errors caused by async task, refreshing kibana inde…
Bargs May 20, 2016
02f24b1
Merge branch 'master' into feature/ingest
Bargs May 24, 2016
8205f4b
Remove default index name and add a placeholder
Bargs May 25, 2016
526d5d4
Update help text so it doesn't imply that you can add data to existin…
Bargs May 25, 2016
2228e86
Limit the number of errors initially displayed on upload data step wi…
Bargs May 25, 2016
873ff3f
Update id parsing logic since the API changed the ID format
Bargs May 25, 2016
a2f1e17
Increment papaparse error row by 1 so the reported row number matches…
Bargs May 25, 2016
001ff8b
Fail early if CSV contains empty column headers
Bargs May 25, 2016
900a4ee
Extract complex error formatting logic into its own function
Bargs May 25, 2016
3143c06
Added API test so we don't forget that the ID format is a part of the…
Bargs May 25, 2016
f237ec0
Don't allow duplicate headers in CSVs
Bargs May 26, 2016
dc2eeb1
Merge branch 'master' into feature/ingest
Bargs May 26, 2016
d04aea5
[FileUpload] Correctly detect the existence of directive attributes
Bargs May 31, 2016
66880a3
Improve parsing performance
Bargs May 31, 2016
b925554
Truncate columns to 20 because we don't really need more, and perform…
Bargs Jun 1, 2016
94cc728
Merge pull request #6845 from Bargs/ingest/uploadUI
w33ble Jun 1, 2016
24a034e
[API] Add metafields from uiSettings to index patterns created by ing…
Bargs Apr 7, 2016
46654c7
Use implicit return
Bargs Jun 1, 2016
8c56411
Merge pull request #7301 from Bargs/fix/metaFieldIngest
Jun 3, 2016
0a95605
Merge branch 'master' into feature/ingest
Bargs Jun 3, 2016
a8141c2
Merge branch 'master' into feature/ingest
Bargs Jun 3, 2016
2bfb620
Fix error on index pattern deletion caused by missing method context
Bargs Jun 3, 2016
a091514
Merge branch 'master' into feature/ingest
Bargs Jun 10, 2016
11da535
Reset errors and warnings before every parse and debounce parse to av…
Bargs Jun 10, 2016
45e0fa6
Avoid repeating empty column header error message
Bargs Jun 10, 2016
c31f9ca
Merge branch 'master' into feature/ingest
Bargs Jun 13, 2016
5a6adcb
[add data] fixes grok processor converter
BigFunger Jun 14, 2016
4290e40
Merge pull request #7456 from BigFunger/feature-ingest-grok-fix
Jun 14, 2016
0065fba
Merge branch 'master' into feature/ingest
Bargs Jun 16, 2016
c992d0c
Move add data code under management directory
Bargs Jun 16, 2016
b853d89
Merge branch 'master' into feature/ingest
Bargs Jun 16, 2016
83595ae
Undo changes to functional tests for defunct add data landing page
Bargs Jun 16, 2016
ef3c49a
A few cleanup items:
Bargs Jun 17, 2016
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { patternToIngest } from '../../../../../../common/lib/convert_pattern_an
import { filebeat as docLinks } from '../../../../../../../../ui/public/documentation_links/documentation_links';
import './styles/_add_data_install_filebeat_step.less';

modules.get('apps/settings')
modules.get('apps/management')
.directive('installFilebeatStep', function () {
return {
template: template,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import modules from 'ui/modules';
import template from './parse_csv_step.html';
import './styles/_add_data_parse_csv_step.less';

modules.get('apps/settings')
modules.get('apps/management')
.directive('parseCsvStep', function () {
return {
restrict: 'E',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { filebeat as docLinks } from '../../../../../../../../ui/public/document
import _ from 'lodash';
import './styles/_add_data_paste_samples_step.less';

modules.get('apps/settings')
modules.get('apps/management')
.directive('pasteSamplesStep', function () {
return {
template: template,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function findFieldsByType(indexPatternFields, type) {
return _.map(_.filter(indexPatternFields, {type}), 'name');
}

modules.get('apps/settings')
modules.get('apps/management')
.directive('patternReviewStep', function () {
return {
template: template,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function formatIndexError(errorDoc) {
return `Line ${lineNumber}: ${errorType} - ${errorReason}`;
}

modules.get('apps/settings')
modules.get('apps/management')
.directive('uploadDataStep', function () {
return {
template: template,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import modules from 'ui/modules';
import template from 'plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard.html';
import template from 'plugins/kibana/management/sections/indices/filebeat/directives/filebeat_wizard.html';
import IngestProvider from 'ui/ingest';
import 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/pipeline_setup';
import 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/pattern_review_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/paste_samples_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/pipeline_setup';
import 'plugins/kibana/management/sections/indices/add_data_steps/install_filebeat_step';
import '../../styles/_add_data_wizard.less';

// wrapper directive, which sets up the breadcrumb for all filebeat steps
modules.get('apps/settings')
modules.get('apps/management')
.directive('filebeatWizard', function () {
return {
restrict: 'E',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<kbn-management-app section="data">
<filebeat-wizard/>
</kbn-management-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import routes from 'ui/routes';
import template from 'plugins/kibana/management/sections/indices/filebeat/index.html';
import 'plugins/kibana/management/sections/indices/filebeat/directives/filebeat_wizard';


routes.when('/management/data/filebeat', {
template: template
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import management from 'ui/management';
import 'plugins/kibana/management/sections/indices/_create';
import 'plugins/kibana/management/sections/indices/_edit';
import 'plugins/kibana/management/sections/indices/_field_editor';
import 'plugins/kibana/management/sections/indices/upload';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import indexTemplate from 'plugins/kibana/management/sections/indices/index.html';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import modules from 'ui/modules';
import template from 'plugins/kibana/settings/sections/indices/upload/directives/upload_wizard.html';
import template from 'plugins/kibana/management/sections/indices/upload/directives/upload_wizard.html';
import IngestProvider from 'ui/ingest';
import 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/parse_csv_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/upload_data_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/pattern_review_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/parse_csv_step';
import 'plugins/kibana/management/sections/indices/add_data_steps/upload_data_step';
import '../../styles/_add_data_wizard.less';

modules.get('apps/settings')
modules.get('apps/management')
.directive('uploadWizard', function () {
return {
restrict: 'E',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<kbn-management-app section="data">
<upload-wizard />
</kbn-management-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import management from 'ui/management';
import routes from 'ui/routes';
import template from 'plugins/kibana/management/sections/indices/upload/index.html';
import './directives/upload_wizard';

routes.when('/management/data/upload/', {
template: template
});

management.getSection('data').register('upload', {
display: 'Upload CSV',
order: 10,
path: 'data/upload/'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are your thoughts on making the route more specific, like csv? I am wondering if upload might be too generic. What if we allow uploading of data directories, snapshots, etc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, my initial thought was that this wizard might handle additional data types like JSON files in the future, which is why I called it upload. But the more I think about it, we would probably have a totally different link for different data types, so I'll switch it to data/csv instead

});

5 changes: 2 additions & 3 deletions src/plugins/kibana/public/management/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,8 @@ kbn-management-indices {
}
}

.nav-buttons {
float:right;
}
.nav-buttons {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you want to define this style here? Before it was confined to the kbn-management-indices directive. Now it's applied to the entire application. Also, where is this class/style being used?

float:right;
}

.kbn-settings-indices-create {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/ui/public/ingest/ingest.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
import RefreshKibanaIndexProvider from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../../../plugins/kibana/common/lib/case_conversion';
import _ from 'lodash';
import angular from 'angular';
Expand All @@ -7,7 +7,7 @@ import chrome from 'ui/chrome';
export default function IngestProvider($rootScope, $http, config, $q, Private, indexPatterns) {

const ingestAPIPrefix = chrome.addBasePath('/api/kibana/ingest');
const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
const refreshKibanaIndex = Private(RefreshKibanaIndexProvider);

this.save = function (indexPattern, pipeline) {
if (_.isEmpty(indexPattern)) {
Expand Down