diff --git a/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js b/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js index b941f3b3c67f1..e191cdebe2b8e 100644 --- a/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js @@ -18,7 +18,7 @@ export const FILEBEAT_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{config.kibana.version}-amd64.deb', 'sudo dpkg -i filebeat-{config.kibana.version}-amd64.deb' ], - textPost: 'Looking for the 32 bits packages? See the [Download page](https://www.elastic.co/downloads/beats/filebeat).' + textPost: 'Looking for the 32-bit packages? See the [Download page](https://www.elastic.co/downloads/beats/filebeat).' }, RPM: { title: 'Download and install Filebeat', @@ -28,17 +28,17 @@ export const FILEBEAT_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{config.kibana.version}-x86_64.rpm', 'sudo rpm -vi filebeat-{config.kibana.version}-x86_64.rpm' ], - textPost: 'Looking for the 32 bits packages? See the [Download page](https://www.elastic.co/downloads/beats/filebeat).' + textPost: 'Looking for the 32-bit packages? See the [Download page](https://www.elastic.co/downloads/beats/filebeat).' }, WINDOWS: { title: 'Download and install Filebeat', textPre: 'First time using Filebeat? See the [Getting Started Guide]' + '({config.docs.beats.filebeat}/filebeat-getting-started.html).\n' + - '1. Download the Filebeat Windows zip file from the [downloads](https://www.elastic.co/downloads/beats/filebeat) page.\n' + + '1. Download the Filebeat Windows zip file from the [Download](https://www.elastic.co/downloads/beats/filebeat) page.\n' + '2. Extract the contents of the zip file into `C:\\Program Files`.\n' + '3. Rename the `filebeat-{config.kibana.version}-windows` directory to `Filebeat`.\n' + '4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select' + - ' Run As Administrator). If you are running Windows XP, you may need to download and install PowerShell.\n' + + ' **Run As Administrator**). If you are running Windows XP, you might need to download and install PowerShell.\n' + '5. From the PowerShell prompt, run the following commands to install Filebeat as a Windows service.', commands: [ 'PS > cd C:\\Program Files\\Filebeat', diff --git a/src/core_plugins/kibana/common/tutorials/logstash_instructions.js b/src/core_plugins/kibana/common/tutorials/logstash_instructions.js index 5439e52fab653..b2e90869772ec 100644 --- a/src/core_plugins/kibana/common/tutorials/logstash_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/logstash_instructions.js @@ -7,6 +7,8 @@ export const LOGSTASH_INSTRUCTIONS = { }, { title: 'Download and install Logstash', + textPre: 'First time using Logstash? See the ' + + '[Getting Started Guide]({config.docs.base_url}guide/en/logstash/current/getting-started-with-logstash.html).', commands: [ 'curl -L -O https://artifacts.elastic.co/downloads/logstash/logstash-{config.kibana.version}.tar.gz', 'tar xzvf logstash-{config.kibana.version}.tar.gz' @@ -15,12 +17,15 @@ export const LOGSTASH_INSTRUCTIONS = { ], WINDOWS: [ { - title: 'Download and install the Java runtime environment', + title: 'Download and install the Java Runtime Environment', textPre: 'Follow the installation instructions [here](https://docs.oracle.com/javase/8/docs/technotes/guides/install/windows_jre_install.html).' }, { title: 'Download and install Logstash', - textPre: 'Download Logstash from [here](https://artifacts.elastic.co/downloads/logstash/logstash-{config.kibana.version}.zip) and unzip it.' + textPre: 'First time using Logstash? See the ' + + '[Getting Started Guide]({config.docs.base_url}guide/en/logstash/current/getting-started-with-logstash.html).\n' + + ' 1. [Download](https://artifacts.elastic.co/downloads/logstash/logstash-{config.kibana.version}.zip) the Logstash Windows zip file.\n' + + ' 2. Extract the contents of the zip file.' } ], } diff --git a/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js b/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js index 5bc7761c429d9..032af9b3b0ab3 100644 --- a/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js @@ -18,7 +18,7 @@ export const METRICBEAT_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{config.kibana.version}-amd64.deb', 'sudo dpkg -i metricbeat-{config.kibana.version}-amd64.deb' ], - textPost: 'Looking for the 32 bits packages? See the [Download page](https://www.elastic.co/downloads/beats/metricbeat).' + textPost: 'Looking for the 32-bit packages? See the [Download page](https://www.elastic.co/downloads/beats/metricbeat).' }, RPM: { title: 'Download and install Metricbeat', @@ -28,17 +28,17 @@ export const METRICBEAT_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{config.kibana.version}-x86_64.rpm', 'sudo rpm -vi metricbeat-{config.kibana.version}-x86_64.rpm' ], - textPost: 'Looking for the 32 bits packages? See the [Download page](https://www.elastic.co/downloads/beats/metricbeat).' + textPost: 'Looking for the 32-bit packages? See the [Download page](https://www.elastic.co/downloads/beats/metricbeat).' }, WINDOWS: { title: 'Download and install Metricbeat', textPre: 'First time using Metricbeat? See the [Getting Started Guide]' + '({config.docs.beats.metricbeat}/metricbeat-getting-started.html).\n' + - '1. Download the Metricbeat Windows zip file from the [downloads](https://www.elastic.co/downloads/beats/metricbeat) page.\n' + + '1. Download the Metricbeat Windows zip file from the [Download](https://www.elastic.co/downloads/beats/metricbeat) page.\n' + '2. Extract the contents of the zip file into `C:\\Program Files`.\n' + '3. Rename the `metricbeat-{config.kibana.version}-windows` directory to `Metricbeat`.\n' + '4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select' + - ' Run As Administrator). If you are running Windows XP, you may need to download and install PowerShell.\n' + + ' **Run As Administrator**). If you are running Windows XP, you might need to download and install PowerShell.\n' + '5. From the PowerShell prompt, run the following commands to install Metricbeat as a Windows service.', commands: [ 'PS > cd C:\\Program Files\\Metricbeat', diff --git a/src/core_plugins/kibana/common/tutorials/onprem_cloud_instructions.js b/src/core_plugins/kibana/common/tutorials/onprem_cloud_instructions.js index 19720fb3d0e9b..90bf4ced27f37 100644 --- a/src/core_plugins/kibana/common/tutorials/onprem_cloud_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/onprem_cloud_instructions.js @@ -2,9 +2,9 @@ export const TRYCLOUD_OPTION1 = { title: 'Option 1: Try module in Elastic Cloud', textPre: 'Go to [Elastic Cloud](https://cloud.elastic.co/). Register if you ' + 'don\'t have an account.\n' + - ' * Select **Create Cluster**, leave size slider at 4 GB RAM, and click **Create**.\n' + - ' * Wait for the cluster plan to complete.\n' + - ' * Go to the new Cloud Kibana instance and follow the Kibana Home instructions.' + ' 1. Select **Create Cluster**, leave size slider at 4 GB RAM, and click **Create**.\n' + + ' 2. Wait for the cluster plan to complete.\n' + + ' 3. Go to the new Cloud Kibana instance and follow the Kibana Home instructions.' }; @@ -12,5 +12,5 @@ export const TRYCLOUD_OPTION2 = { title: 'Option 2: Connect local Kibana to a Cloud instance', textPre: 'If you are running this Kibana instance against a hosted Elasticsearch instance,' + ' proceed with manual setup.\n\n' + - 'In **Overview >> Endpoints** note **Elasticsearch** as ``.' + 'In **Overview > Endpoints**, note **Elasticsearch** as ``.' }; diff --git a/src/core_plugins/kibana/public/home/components/tutorial/footer.js b/src/core_plugins/kibana/public/home/components/tutorial/footer.js index 8ed3839b29e7f..b2a49ac37ef33 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/footer.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/footer.js @@ -23,7 +23,7 @@ export function Footer({ overviewDashboard }) {

- {`Once all steps are completed, you're ready to explore your data`} + {`When all steps are complete, you're ready to explore your data.`}

diff --git a/src/core_plugins/kibana/public/home/tutorial_resources/apm/apm_dashboard_transactions.jpg b/src/core_plugins/kibana/public/home/tutorial_resources/apm/apm_dashboard_transactions.jpg new file mode 100644 index 0000000000000..552060b987f2a Binary files /dev/null and b/src/core_plugins/kibana/public/home/tutorial_resources/apm/apm_dashboard_transactions.jpg differ diff --git a/src/core_plugins/kibana/server/tutorials/apache_logs/index.js b/src/core_plugins/kibana/server/tutorials/apache_logs/index.js index 405ef51fce56f..78b82d95b8e06 100644 --- a/src/core_plugins/kibana/server/tutorials/apache_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/apache_logs/index.js @@ -10,8 +10,7 @@ export function apacheLogsSpecProvider() { category: TUTORIAL_CATEGORY.LOGGING, shortDescription: 'Collect and parse access and error logs created by the Apache HTTP server.', longDescription: 'The apache2 Filebeat module parses access and error logs created by the Apache 2 HTTP server.' + - ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-apache2.html)' + - ' about the apache2 module.', + ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-apache2.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js b/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js index 9e8b84bd06a76..6b777e8d7fe9c 100644 --- a/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js @@ -8,10 +8,9 @@ export function apacheMetricsSpecProvider() { id: 'apacheMetrics', name: 'Apache metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches internal metrics from the Apache 2 HTTP server.', + shortDescription: 'Fetch internal metrics from the Apache 2 HTTP server.', longDescription: 'The `apache` Metricbeat module fetches internal metrics from the Apache 2 HTTP server.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-apache.html)' + - ' about the apache module.', + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-apache.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js index 4bd1bd81d6b7d..1e1822233ad06 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js @@ -25,7 +25,7 @@ export const NODE_CLIENT_INSTRUCTIONS = [ `{curlyClose})`, ], textPost: 'See [the documentation]({config.docs.base_url}guide/en/apm/agent/nodejs/1.x/index.html)' + - ' for advanced usage. Babel users, please refer to [the documentation]' + + ' for advanced usage. Babel users, refer to [the documentation]' + '({config.docs.base_url}guide/en/apm/agent/nodejs/1.x/advanced-setup.html#es-modules).' } ]; @@ -109,7 +109,7 @@ export const RAILS_CLIENT_INSTRUCTIONS = [ }, { title: 'Configure the agent', - textPre: 'APM is automatically installed. Configure the agent, by creating the config file `config/elastic_apm.yml`', + textPre: 'Configure the agent by creating the config file `config/elastic_apm.yml`.', commands: [ `# config/elastic_apm.yml`, `server_url: 'http://localhost:8200'`, @@ -130,7 +130,7 @@ export const RACK_CLIENT_INSTRUCTIONS = [ }, { title: 'Configure the agent', - textPre: 'Rack or compatible framework (like Sinatra). Include the middleware in your app and start the agent', + textPre: 'For a Rack or compatible framework such as Sinatra, include the middleware in your app and start the agent.', commands: [ `# config.ru`, `require 'sinatra/base'`, diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js index ea38747daca5c..2fb83cf5db7bc 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js @@ -1,7 +1,7 @@ const EDIT_CONFIG = { title: 'Edit the configuration', - textPre: `If you're using an X-Pack secured version of Elastic Stack, you need to specify` + - `credentials in the apm-server.yml config file.`, + textPre: `If you're using an X-Pack secured version of Elastic Stack, you must specify` + + ' credentials in the `apm-server.yml` config file.', commands: [ 'output.elasticsearch:', ' hosts: [""]', @@ -12,12 +12,12 @@ const EDIT_CONFIG = { const IMPORT_DASHBOARD = { title: 'Import dashboards', - textPre: 'APM Server ships with pre-configured dashboards' + textPre: 'APM Server ships with preconfigured dashboards.' }; const START_SERVER = { title: 'Start APM Server', - textPre: 'The server processes and stores application performance metrics in Elasticsearch' + textPre: 'The server processes and stores application performance metrics in Elasticsearch.' }; export const DOWNLOAD_SERVER = { @@ -47,7 +47,7 @@ export const WINDOWS_SERVER_INSTRUCTIONS = [ 'curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-6.2.0-windows-x86_64.zip', 'sudo dpkg -i apm-server-6.2.0-windows-x86_64.zip' ], - textPost: 'Looking for the 32 bits packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' + textPost: 'Looking for the 32-bit packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' }, { ...IMPORT_DASHBOARD, diff --git a/src/core_plugins/kibana/server/tutorials/apm/index.js b/src/core_plugins/kibana/server/tutorials/apm/index.js index aca9e0374c0b5..a175e5e8a8680 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/index.js +++ b/src/core_plugins/kibana/server/tutorials/apm/index.js @@ -1,8 +1,7 @@ import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { ON_PREM_INSTRUCTIONS } from './on_prem'; -const apmIntro = 'APM (Application Performance Monitoring) automatically collects in-depth' + - ' performance metrics and errors from inside your applications.'; +const apmIntro = 'Collect in-depth performance metrics and errors from inside your applications.'; export function apmSpecProvider() { return { @@ -10,13 +9,10 @@ export function apmSpecProvider() { name: 'APM', category: TUTORIAL_CATEGORY.OTHER, shortDescription: apmIntro, - longDescription: `${apmIntro} APM consists of three components - the Agents, the Server, and the UI:\n` + - '* The Agents are libraries in your application that run inside of your application process.\n' + - '* The Server processes data from agents and stores the application data in Elasticsearch.\n' + - '* The UI is the dedicated APM UI (X-Pack Basic) and preconfigured dashboards.\n\n' + - 'For more information, [please see our documentation]' + - '({config.docs.base_url}guide/en/apm/get-started/{config.docs.version}/index.html).' + - ' To get started, follow the steps below.', + longDescription: 'Application Performance Monitoring (APM) collects in-depth' + + ' performance metrics and errors from inside your application.' + + ' It allows you to monitor the performance of thousands of applications in real time.' + + ' [Learn more]({config.docs.base_url}guide/en/apm/get-started/{config.docs.version}/index.html).', artifacts: { dashboards: [ { @@ -27,5 +23,6 @@ export function apmSpecProvider() { ] }, onPrem: ON_PREM_INSTRUCTIONS, + previewImagePath: '/plugins/kibana/home/tutorial_resources/apm/apm_dashboard_transactions.jpg', }; } diff --git a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js index 4d8d93b462d1f..24b9d22e9a436 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js +++ b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js @@ -41,7 +41,7 @@ export const ON_PREM_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-6.2.0-amd64.deb', 'sudo dpkg -i apm-server-6.2.0-amd64.deb', ], - textPost: 'Looking for the 32 bits packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' + textPost: 'Looking for the 32-bit packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' }, ...UNIX_FAMILY_SERVER_INSTRUCTIONS ] @@ -55,7 +55,7 @@ export const ON_PREM_INSTRUCTIONS = { 'curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-6.2.0-x86_64.rpm', 'sudo dpkg -i apm-server-6.2.0-x86_64.rpm' ], - textPost: 'Looking for the 32 bits packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' + textPost: 'Looking for the 32-bit packages? See the [Download page]({config.docs.base_url}downloads/apm/apm-server).' }, ...UNIX_FAMILY_SERVER_INSTRUCTIONS ] diff --git a/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js b/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js index 932178d0eebc6..7f35443dc5bb8 100644 --- a/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js @@ -8,10 +8,9 @@ export function dockerMetricsSpecProvider() { id: 'dockerMetrics', name: 'Docker metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches metrics about your Docker containers.', + shortDescription: 'Fetch metrics about your Docker containers.', longDescription: 'The `docker` Metricbeat module fetches metrics from the Docker server.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-docker.html)' + - ' about the docker module.', + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-docker.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js b/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js index 4c584835cdbc1..b295b0b39e68a 100644 --- a/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js @@ -8,10 +8,9 @@ export function kubernetesMetricsSpecProvider() { id: 'kubernetesMetrics', name: 'Kubernetes metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches metrics from your Kubernetes installation.', + shortDescription: 'Fetch metrics from your Kubernetes installation.', longDescription: 'The `kubernetes` Metricbeat module fetches metrics from the Kubernetes APIs.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-kubernetes.html)' + - ' about the kubernetes module.', + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-kubernetes.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js b/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js index e87ecb9415e25..1a6a1709790b4 100644 --- a/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js @@ -10,8 +10,7 @@ export function mysqlLogsSpecProvider() { category: TUTORIAL_CATEGORY.LOGGING, shortDescription: 'Collect and parse error and slow logs created by MySQL.', longDescription: 'The `mysql` Filebeat module parses error and slow logs created by MySQL.' + - ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-mysql.html)' + - ' about the `mysql` module.', + ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-mysql.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js b/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js index a8cacd7f60a77..eac6f5a44bead 100644 --- a/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js @@ -8,10 +8,9 @@ export function mysqlMetricsSpecProvider() { id: 'mysqlMetrics', name: 'MySQL metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches internal metrics from MySQL.', + shortDescription: 'Fetch internal metrics from MySQL.', longDescription: 'The `mysql` Metricbeat module fetches internal metrics from the MySQL server.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-mysql.html)' + - ' about the mysql module.', + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-mysql.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js b/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js index f6fbadb9ac2ae..6872e789e4455 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/common_instructions.js @@ -4,8 +4,7 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { OSX: [ { title: 'Edit the configuration', - textPre: 'In the Logstash installation directory, modify `config/logstash.yml` to set the' - + ' configuration parameters for the Netflow module.', + textPre: 'Modify `config/logstash.yml` to set the configuration parameters:', commands: [ 'modules:', ' - name: netflow', @@ -18,8 +17,7 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { WINDOWS: [ { title: 'Edit the configuration', - textPre: 'While in the Logstash install directory, modify `config\\logstash.yml` to set the' - + ' configuration parameters for the Netflow module:', + textPre: 'Modify `config\\logstash.yml` to set the configuration parameters:', commands: [ 'modules:', ' - name: netflow', @@ -34,8 +32,7 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { OSX: [ { title: 'Edit the configuration', - textPre: 'In the Logstash installation directory, modify `config/logstash.yml` to set the' - + ' configuration parameters for the Netflow module.', + textPre: 'Modify `config/logstash.yml` to set the configuration parameters:', commands: [ 'modules:', ' - name: netflow', @@ -49,8 +46,7 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { WINDOWS: [ { title: 'Edit the configuration', - textPre: 'While in the Logstash install directory, modify `config\\logstash.yml` to set the' - + ' configuration parameters for the Netflow module:', + textPre: 'Modify `config\\logstash.yml` to set the configuration parameters:', commands: [ 'modules:', ' - name: netflow', @@ -66,25 +62,23 @@ export const COMMON_NETFLOW_INSTRUCTIONS = { OSX: [ { title: 'Run the Netflow module', - textPre: 'In the Logstash installation directory, run the following command to set up the Netflow module.', + textPre: 'Run:', commands: [ './bin/logstash --modules netflow --setup', ], textPost: 'The `--setup` option creates a `netflow-*` index pattern in Elasticsearch and imports' + - ' Kibana dashboards and visualizations. Omit this option for subsequent runs of the module to avoid' + - ' overwriting existing Kibana dashboards.' + ' Kibana dashboards and visualizations. Omit this option for subsequent runs to avoid overwriting existing dashboards.' } ], WINDOWS: [ { - title: 'Set up and run the Netflow module', - textPre: 'In the Logstash install directory, run the following command to set up the Netflow module.', + title: 'Run the Netflow module', + textPre: 'Run:', commands: [ 'bin\\logstash --modules netflow --setup', ], textPost: 'The `--setup` option creates a `netflow-*` index pattern in Elasticsearch and imports' + - ' Kibana dashboards and visualizations. Omit this option for subsequent runs of the module to avoid' + - ' overwriting existing Kibana dashboards.' + ' Kibana dashboards and visualizations. Omit this option for subsequent runs to avoid overwriting existing dashboards.' } ] } diff --git a/src/core_plugins/kibana/server/tutorials/netflow/index.js b/src/core_plugins/kibana/server/tutorials/netflow/index.js index 324432c1cd4df..014ba839eaa40 100644 --- a/src/core_plugins/kibana/server/tutorials/netflow/index.js +++ b/src/core_plugins/kibana/server/tutorials/netflow/index.js @@ -8,11 +8,11 @@ export function netflowSpecProvider() { id: 'netflow', name: 'Netflow', category: TUTORIAL_CATEGORY.SECURITY, - shortDescription: 'Collect Netflow records sent by a Netflow exporter', - longDescription: 'The Logstash Netflow module simplifies the collection, normalization, and visualization of network flow data. ' + - 'With a single command, the module parses network flow data, indexes the events into Elasticsearch, and installs a suite of Kibana ' + - 'dashboards to get you exploring your data immediately. Logstash modules support Netflow Version 5 and 9. [Learn more]' + - '({config.docs.logstash}/netflow-module.html) about the Netflow module', + shortDescription: 'Collect Netflow records sent by a Netflow exporter.', + longDescription: 'The Logstash Netflow module parses network flow data, ' + + ' indexes the events into Elasticsearch, and installs a suite of Kibana dashboards.' + + ' This module support Netflow Version 5 and 9.' + + ' [Learn more]({config.docs.logstash}/netflow-module.html).', //iconPath: '', TODO completionTimeMinutes: 10, //previewImagePath: 'kibana-apache.png', TODO diff --git a/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js b/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js index f6ab47590c153..8a99683e18c32 100644 --- a/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js @@ -10,8 +10,7 @@ export function nginxLogsSpecProvider() { category: TUTORIAL_CATEGORY.LOGGING, shortDescription: 'Collect and parse access and error logs created by the Nginx HTTP server.', longDescription: 'The `nginx` Filebeat module parses access and error logs created by the Nginx HTTP server.' + - ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-nginx.html)' + - ' about the nginx module.', + ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-nginx.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js b/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js index 860422d892a6b..f1557ae56d3ca 100644 --- a/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js @@ -8,13 +8,12 @@ export function nginxMetricsSpecProvider() { id: 'nginxMetrics', name: 'Nginx metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches internal metrics from the Nginx HTTP server.', + shortDescription: 'Fetch internal metrics from the Nginx HTTP server.', longDescription: 'The `nginx` Metricbeat module fetches internal metrics from the Nginx HTTP server.' + ' The module scrapes the server status data from the web page generated by the' + - ' [ngx_http_stub_status_module](http://nginx.org/en/docs/http/ngx_http_stub_status_module.html)' + - ' module, which needs to be enabled in you Nginx installation.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-nginx.html)' + - ' about the nginx module.', + ' [ngx_http_stub_status_module](http://nginx.org/en/docs/http/ngx_http_stub_status_module.html),' + + ' which must be enabled in your Nginx installation.' + + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-nginx.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/redis_logs/index.js b/src/core_plugins/kibana/server/tutorials/redis_logs/index.js index db4bf8e844572..1e46e4bf09721 100644 --- a/src/core_plugins/kibana/server/tutorials/redis_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/redis_logs/index.js @@ -16,8 +16,7 @@ export function redisLogsSpecProvider() { ' For Redis to record slow logs, make sure the `slowlog-log-slower-than`' + ' option is set.' + ' Note that the `slowlog` fileset is experimental.' + - ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-redis.html)' + - ' about the `redis` module.', + ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-redis.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js b/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js index 897d2584e515b..6a1f116c28ef3 100644 --- a/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js @@ -8,10 +8,9 @@ export function redisMetricsSpecProvider() { id: 'redisMetrics', name: 'Redis metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Fetches internal metrics from Redis.', + shortDescription: 'Fetch internal metrics from Redis.', longDescription: 'The `redis` Metricbeat module fetches internal metrics from the Redis server.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-redis.html)' + - ' about the redis module.', + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-redis.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/system_logs/index.js b/src/core_plugins/kibana/server/tutorials/system_logs/index.js index 40bec08f98401..ce49906b90fbf 100644 --- a/src/core_plugins/kibana/server/tutorials/system_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/system_logs/index.js @@ -11,8 +11,7 @@ export function systemLogsSpecProvider() { shortDescription: 'Collect and parse logs written by the local Syslog server.', longDescription: 'The `system` Filebeat module collects and parses logs created by the system logging service of common ' + ' Unix/Linux based distributions. This module is not available on Windows.' + - ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-system.html)' + - ' about the `system` module.', + ' [Learn more]({config.docs.beats.filebeat}/filebeat-module-system.html).', //iconPath: '', TODO artifacts: { dashboards: [ diff --git a/src/core_plugins/kibana/server/tutorials/system_metrics/index.js b/src/core_plugins/kibana/server/tutorials/system_metrics/index.js index 0ffec8b8b2e66..142596591e080 100644 --- a/src/core_plugins/kibana/server/tutorials/system_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/system_metrics/index.js @@ -8,11 +8,10 @@ export function systemMetricsSpecProvider() { id: 'systemMetrics', name: 'System metrics', category: TUTORIAL_CATEGORY.METRICS, - shortDescription: 'Collects CPU, memory, network, and disk statistics from the host.', + shortDescription: 'Collect CPU, memory, network, and disk statistics from the host.', longDescription: 'The `system` Metricbeat module collects CPU, memory, network, and disk statistics from the host.' + - ' It collects system wide statistics as well as per process and per filesystem statistics.' + - ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-system.html)' + - ' about the system module.', + ' It collects system wide statistics and statistics per process and filesystem.' + + ' [Learn more]({config.docs.beats.metricbeat}/metricbeat-module-system.html).', //iconPath: '', TODO artifacts: { dashboards: [