From a16adbe1dfd9f983263af30e7f8aa3d4ba59e7bf Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Thu, 21 Apr 2016 19:33:33 -0400 Subject: [PATCH 1/8] [Styles] Update the paste screen styles --- .../add_data_steps/paste_samples_step.html | 19 +++-- .../styles/_pipeline_setup.less | 2 +- .../styles/_processor_ui_container.less | 15 ---- .../filebeat/directives/filebeat_wizard.js | 1 + .../indices/styles/_add_data_wizard.less | 73 +++++++++++++++++++ .../kibana/public/settings/styles/main.less | 54 -------------- 6 files changed, 84 insertions(+), 80 deletions(-) create mode 100644 src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html index 382b31765d07d0..25de6ba36f6a50 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html @@ -1,12 +1,11 @@ -
-

Provide some sample logs

- Paste in one or more lines from the file you intend to tail. We'll use these samples in the following steps to help - you build an ingest pipeline and configure a Kibana index pattern. Log lines can be raw strings or - formatted as JSON. If your logs are raw strings but you intend to use - Filebeat's metadata, - you'll want to paste the JSON as it will come out of Filebeat. -
+

Provide some sample logs. +Paste in one or more lines from the file you intend to tail. We'll use these samples in the following steps to help +you build an ingest pipeline and configure a Kibana index pattern. Log lines can be raw strings or +formatted as JSON. If your logs are raw strings but you intend to use +Filebeat's metadata, +you'll want to paste the JSON as it will come out of Filebeat. +

-
- +
+
diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less index 7ecf231325032d..77a07eaec11a4a 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less @@ -67,7 +67,7 @@ pipeline-setup { justify-content: flex-start; align-items: center; - select { + select.form-control { background-color: @settings-filebeat-wizard-processor-select-bg; border: none; width: auto; diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less index 33312e48fa5339..f28f91130db19d 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less @@ -35,19 +35,4 @@ processor-ui-container { } } } - - .form-group { - margin-bottom: 5px; - } - - .form-control { - background-color: #f5fafb; - border-color: #86bbcb; - border-width: 1px; - border-radius: 4px; - } - - label { - font-weight: normal; - } } diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js index e772ce4669f0e7..412348b5bee3ff 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -5,6 +5,7 @@ import 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_s 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 '../../styles/_add_data_wizard.less'; import '../styles/_filebeat_wizard.less'; // wrapper directive, which sets up the breadcrumb for all filebeat steps diff --git a/src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less b/src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less new file mode 100644 index 00000000000000..9b77ac407c4e32 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less @@ -0,0 +1,73 @@ +@import (reference) "~ui/styles/variables"; +@import (reference) "~ui/styles/mixins"; +@import (reference) "~ui/styles/theme"; + +.wizard-container { + padding: 0 10px; + + .form-group { + margin-bottom: 5px; + } + + .form-control { + background-color: #f5fafb; + border-color: @kibanaBlue3; + border-width: 1px; + border-radius: 4px; + } + + label { + font-weight: normal; + } +} + +.wizard-step-headings{ + padding-top: 14px; + + .wizard-step-heading { + font-size: 1.3em; + padding: 6px 18px; + margin: 0 2px; + background-color: @settings-add-data-wizard-step-heading-complete-background; + color: @settings-add-data-wizard-step-heading-complete-color; + + &.active { + cursor: default; + background-color: @settings-add-data-wizard-step-heading-active-background; + color: @settings-add-data-wizard-step-heading-active-color; + } + &.aheadActive { + cursor: default; + background-color: @settings-add-data-wizard-step-heading-incomplete-background; + color: @settings-add-data-wizard-step-heading-incomplete-color; + } + } + + &.complete { + .wizard-step-heading:not(.active) { + cursor: default; + } + } +} + +.wizard-step-title { + padding-bottom: 14px; +} + +.pattern-review { + .time-field-input { + padding-left: 14px; + margin-bottom: 0; + } + + .pattern-input { + width: 300px; + } +} + +.paste-samples { + textarea { + width: 100%; + height: 250px; + } +} diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less index 8b0095a2bddebb..002ea4c2f0852a 100644 --- a/src/plugins/kibana/public/settings/styles/main.less +++ b/src/plugins/kibana/public/settings/styles/main.less @@ -205,57 +205,3 @@ kbn-settings-indices { .time-and-pattern > div {} } -.wizard-container { - padding: 0 10px; -} - -.wizard-step-headings{ - padding-top: 14px; - - .wizard-step-heading { - font-size: 1.3em; - padding: 6px 18px; - margin: 0 2px; - background-color: @settings-add-data-wizard-step-heading-complete-background; - color: @settings-add-data-wizard-step-heading-complete-color; - - &.active { - cursor: default; - background-color: @settings-add-data-wizard-step-heading-active-background; - color: @settings-add-data-wizard-step-heading-active-color; - } - &.aheadActive { - cursor: default; - background-color: @settings-add-data-wizard-step-heading-incomplete-background; - color: @settings-add-data-wizard-step-heading-incomplete-color; - } - } - - &.complete { - .wizard-step-heading:not(.active) { - cursor: default; - } - } -} - -.wizard-step-title { - padding-bottom: 1em; -} - -.pattern-review { - .time-field-input { - padding-left: 1em; - margin-bottom: 0; - } - - .pattern-input { - width: 300px; - } -} - -.paste-samples { - textarea { - width: 100%; - height: 250px; - } -} From ea63a8a2da72ca9bcd4eec70ae43d3e708dacf8c Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 26 Apr 2016 18:09:24 -0400 Subject: [PATCH 2/8] Move paste step files into their own directory --- .../{ => paste_samples_step}/paste_samples_step.html | 0 .../{ => paste_samples_step}/paste_samples_step.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/plugins/kibana/public/settings/sections/indices/add_data_steps/{ => paste_samples_step}/paste_samples_step.html (100%) rename src/plugins/kibana/public/settings/sections/indices/add_data_steps/{ => paste_samples_step}/paste_samples_step.js (89%) diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.html diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.js similarity index 89% rename from src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.js index 1e78ea45559f86..ad85bc6b21ddd3 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.js @@ -1,5 +1,5 @@ import modules from 'ui/modules'; -import template from 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step.html'; +import template from './paste_samples_step.html'; import _ from 'lodash'; modules.get('apps/settings') From 060fc99232a724b334f09efc378be22b9d001e9d Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Apr 2016 12:51:41 -0400 Subject: [PATCH 3/8] [Styles] Update everything on the review page but the table --- .../pattern_review_step.html | 19 ++++++++---------- .../pattern_review_step.js | 3 ++- .../styles/_add_data_pattern_review_step.less | 20 +++++++++++++++++++ .../styles/_processor_ui_container.less | 4 ++++ .../indices/styles/_add_data_wizard.less | 15 -------------- 5 files changed, 34 insertions(+), 27 deletions(-) rename src/plugins/kibana/public/settings/sections/indices/add_data_steps/{ => pattern_review_step}/pattern_review_step.html (61%) rename src/plugins/kibana/public/settings/sections/indices/add_data_steps/{ => pattern_review_step}/pattern_review_step.js (96%) create mode 100644 src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step/styles/_add_data_pattern_review_step.less diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step/pattern_review_step.html similarity index 61% rename from src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step/pattern_review_step.html index 5a8735d7b3ea80..cf0d1d4463a8cb 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step/pattern_review_step.html @@ -1,22 +1,19 @@ -
-

Review the index pattern

- Here we'll define how and where to store your parsed events. We've made some intellient guesses for you, but most +

Review the index pattern. + Here we'll define how and where to store your parsed events. We've made some intelligent guesses for you, but most fields can be changed if we got it wrong! -

+ -
-
- - -
- +
+ + Patterns allow you to define dynamic index names using * as a wildcard. Example: filebeat-* +