From 4de333e06a191341798c5964b828e0c1ae1b4119 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 3 Dec 2018 16:03:52 -0700 Subject: [PATCH 01/11] Updating docs - Configure data sources via config/kibana.yml - Fix typo --- docs/infrastructure/index.asciidoc | 7 +++++++ docs/logs/index.asciidoc | 6 ++++++ docs/logs/logs-ui.asciidoc | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index 1167cfcf646352..3024f91ea966b4 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -20,6 +20,13 @@ Kibana provides step-by-step instructions to help you add your data sources. The {infra-guide}[Infrastructure Monitoring Guide] is good source for more detailed instructions and information. +[float] +== Configure data sources + +By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. +If you configured Metricbeat to export data to a different set of indices you will need to set ` +xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. + -- include::monitor.asciidoc[] diff --git a/docs/logs/index.asciidoc b/docs/logs/index.asciidoc index 1356ff522c22a7..1435c26483fbe1 100644 --- a/docs/logs/index.asciidoc +++ b/docs/logs/index.asciidoc @@ -20,6 +20,12 @@ Kibana provides step-by-step instructions to help you add your data sources. The {infra-guide}[Infrastructure Monitoring Guide] is good source for more detailed information and instructions. +[float] +== Configure data sources + +By default the Logs UI uses the `filebeat-*` index pattern to query the data. +If your logs are located in a different set of indices, you will need to set ` +xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. -- diff --git a/docs/logs/logs-ui.asciidoc b/docs/logs/logs-ui.asciidoc index f7050049b0684a..14d50093c5c971 100644 --- a/docs/logs/logs-ui.asciidoc +++ b/docs/logs/logs-ui.asciidoc @@ -2,7 +2,7 @@ [[logs-ui]] == Using the Logs UI -Customize the Infrastructure UI to focus on the data you want to see and control how you see it. +Customize the Logs UI to focus on the data you want to see and control how you see it. [role="screenshot"] image::logs/images/logs-console.png[Log Console in Kibana] From 20aeb5c1fd4a779df8a4ed5d178d989b82b9d820 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 3 Dec 2018 16:08:36 -0700 Subject: [PATCH 02/11] Adding timestamp override --- docs/infrastructure/index.asciidoc | 2 +- docs/logs/index.asciidoc | 2 +- .../lib/adapters/sources/configuration_sources_adapter.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index 3024f91ea966b4..dd52ebc94ec5c2 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -25,7 +25,7 @@ instructions and information. By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices you will need to set ` -xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. +xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.timestamp`. -- diff --git a/docs/logs/index.asciidoc b/docs/logs/index.asciidoc index 1435c26483fbe1..b8ac1bce9d8029 100644 --- a/docs/logs/index.asciidoc +++ b/docs/logs/index.asciidoc @@ -25,7 +25,7 @@ instructions. By default the Logs UI uses the `filebeat-*` index pattern to query the data. If your logs are located in a different set of indices, you will need to set ` -xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. +xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.timestamp`. -- diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts index 4b8956b5f99858..fbec419e60e1ab 100644 --- a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts +++ b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts @@ -49,10 +49,10 @@ export class InfraConfigurationSourcesAdapter implements InfraSourcesAdapter { } const DEFAULT_FIELDS = { - container: 'docker.container.name', + container: 'docker.container.id', host: 'beat.hostname', message: ['message', '@message'], - pod: 'kubernetes.pod.name', + pod: 'kubernetes.pod.uid', tiebreaker: '_doc', timestamp: '@timestamp', }; From 11e30746cb5b96afc5469748c0a48a6836fab839 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 3 Dec 2018 16:34:22 -0700 Subject: [PATCH 03/11] Documenting all settings --- docs/settings/settings-xkb.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/settings/settings-xkb.asciidoc b/docs/settings/settings-xkb.asciidoc index 979882e31701c6..98e2784bbb0a85 100644 --- a/docs/settings/settings-xkb.asciidoc +++ b/docs/settings/settings-xkb.asciidoc @@ -12,6 +12,8 @@ For more {kib} configuration settings, see <>. include::apm-settings.asciidoc[] include::dev-settings.asciidoc[] include::graph-settings.asciidoc[] +include::infrastructure-ui-settings.asciidoc[] +include::logs-ui-settings.asciidoc[] include::ml-settings.asciidoc[] include::reporting-settings.asciidoc[] include::spaces-settings.asciidoc[] From a5f2774288e4f49c9e8d4c66a6d05139482ce908 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 4 Dec 2018 10:12:29 -0700 Subject: [PATCH 04/11] Removing changes from a different PR --- .../lib/adapters/sources/configuration_sources_adapter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts index fbec419e60e1ab..4b8956b5f99858 100644 --- a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts +++ b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts @@ -49,10 +49,10 @@ export class InfraConfigurationSourcesAdapter implements InfraSourcesAdapter { } const DEFAULT_FIELDS = { - container: 'docker.container.id', + container: 'docker.container.name', host: 'beat.hostname', message: ['message', '@message'], - pod: 'kubernetes.pod.uid', + pod: 'kubernetes.pod.name', tiebreaker: '_doc', timestamp: '@timestamp', }; From 87aae59b8e403ac669d375b4ec1bae1ae777bfde Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 4 Dec 2018 10:13:02 -0700 Subject: [PATCH 05/11] Add settings docs --- .../infrastructure-ui-settings.asciidoc | 26 +++++++++++++++++++ docs/settings/logs-ui-settings.asciidoc | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 docs/settings/infrastructure-ui-settings.asciidoc create mode 100644 docs/settings/logs-ui-settings.asciidoc diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc new file mode 100644 index 00000000000000..d1573939aad90c --- /dev/null +++ b/docs/settings/infrastructure-ui-settings.asciidoc @@ -0,0 +1,26 @@ +[role="xpack"] +[[infrastructure-ui-settings-kb]] +=== Infrastructure UI Settings in Kibana +++++ +Infrastructure UI Settings +++++ + +You do not need to configure any settings to use Infrastructure UI. It is enabled by default. + +[float] +[[general-infra-ui-settings-kb]] +==== General Infrastructure UI Settings + +xpack.infra.enabled:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to +`true`. + +xpack.infra.sources.default.logAlias:: Index pattern for matching indices that contain log data. Defaults to +`filebeat-*`. + +xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to +`metricbeat-*`. + +xpack.infra.sources.default.timestamp:: Timestamp used to for sorting log entries. Defaults to +`@timestamp`. + +xpack.infra.sources.default.tiebreaker:: Field used to break ties between two entries with the same timestamp. diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc new file mode 100644 index 00000000000000..8cbe3377d7e9d9 --- /dev/null +++ b/docs/settings/logs-ui-settings.asciidoc @@ -0,0 +1,26 @@ +[role="xpack"] +[[logs-ui-settings-kb]] +=== Logs UI Settings in Kibana +++++ +Logs UI Settings +++++ + +You do not need to configure any settings to use Logs UI. It is enabled by default. + +[float] +[[general-logs-ui-settings-kb]] +==== General Logs UI Settings + +xpack.infra.enabled:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to +`true`. + +xpack.infra.sources.default.logAlias:: Index pattern for matching indices that contain log data. Defaults to +`filebeat-*`. + +xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to +`metricbeat-*`. + +xpack.infra.sources.default.timestamp:: Timestamp used to for sorting log entries. Defaults to +`@timestamp`. + +xpack.infra.sources.default.tiebreaker:: Field used to break ties between two entries with the same timestamp. \ No newline at end of file From aeada1294cc07d7eb8d64ad89fc9d18ff053101a Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 4 Dec 2018 10:21:25 -0700 Subject: [PATCH 06/11] Adding all the settings --- .../infrastructure-ui-settings.asciidoc | 17 +++++++++++++++-- docs/settings/logs-ui-settings.asciidoc | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc index d1573939aad90c..3bd2a376abbb10 100644 --- a/docs/settings/infrastructure-ui-settings.asciidoc +++ b/docs/settings/infrastructure-ui-settings.asciidoc @@ -20,7 +20,20 @@ xpack.infra.sources.default.logAlias:: Index pattern for matching indices that c xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. -xpack.infra.sources.default.timestamp:: Timestamp used to for sorting log entries. Defaults to +xpack.infra.sources.default.fields.timestamp:: Timestamp used to for sorting log entries. Defaults to `@timestamp`. -xpack.infra.sources.default.tiebreaker:: Field used to break ties between two entries with the same timestamp. +xpack.infra.sources.default.fields.message:: Fields used for the message for Logs UI. Defaults to +`['message', '@message']`. + +xpack.infra.sources.default.fields.tiebreaker:: Field used to break ties between two entries +with the same timestamp. Defaults to `_doc` + +xpack.infra.sources.default.fields.host:: Field used to identify hosts. +Defaults to `beat.hostname` + +xpack.infra.sources.default.fields.container:: Field used to identify Docker containers. +Defaults to `docker.container.name` + +xpack.infra.sources.default.fields.pod:: Field used to identify Kubernetes pods. +Defaults to `kubernetes.pod.name` \ No newline at end of file diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc index 8cbe3377d7e9d9..9729cac69ddd09 100644 --- a/docs/settings/logs-ui-settings.asciidoc +++ b/docs/settings/logs-ui-settings.asciidoc @@ -20,7 +20,20 @@ xpack.infra.sources.default.logAlias:: Index pattern for matching indices that c xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. -xpack.infra.sources.default.timestamp:: Timestamp used to for sorting log entries. Defaults to +xpack.infra.sources.default.fields.timestamp:: Timestamp used to for sorting log entries. Defaults to `@timestamp`. -xpack.infra.sources.default.tiebreaker:: Field used to break ties between two entries with the same timestamp. \ No newline at end of file +xpack.infra.sources.default.fields.message:: Fields used for the message for Logs UI. Defaults to +`['message', '@message']`. + +xpack.infra.sources.default.fields.tiebreaker:: Field used to break ties between two entries +with the same timestamp. Defaults to `_doc` + +xpack.infra.sources.default.fields.host:: Field used to identify hosts. +Defaults to `beat.hostname` + +xpack.infra.sources.default.fields.container:: Field used to identify Docker containers. +Defaults to `docker.container.name` + +xpack.infra.sources.default.fields.pod:: Field used to identify Kubernetes pods. +Defaults to `kubernetes.pod.name` \ No newline at end of file From 10fe1e2248d312c897bf61d1f4015aaca99b444d Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 10 Dec 2018 10:29:44 -0700 Subject: [PATCH 07/11] Updating docs based on feed back from PR --- docs/infrastructure/index.asciidoc | 4 +-- docs/logs/index.asciidoc | 4 +-- .../general-infra-logs-ui-settings.asciidoc | 17 +++++++++++ .../infrastructure-ui-settings.asciidoc | 29 ++----------------- docs/settings/logs-ui-settings.asciidoc | 29 ++----------------- .../components/waffle/lib/size_of_squares.ts | 2 +- 6 files changed, 24 insertions(+), 61 deletions(-) create mode 100644 docs/settings/general-infra-logs-ui-settings.asciidoc diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index dd52ebc94ec5c2..d1bad42796f085 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -23,9 +23,7 @@ instructions and information. [float] == Configure data sources -By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. -If you configured Metricbeat to export data to a different set of indices you will need to set ` -xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.timestamp`. +By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices, you will need to set `xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`.See {infrastructure-ui-settings}[Infrastructure Ui Settings] for a complete list. -- diff --git a/docs/logs/index.asciidoc b/docs/logs/index.asciidoc index b8ac1bce9d8029..42a2f380b4f0a4 100644 --- a/docs/logs/index.asciidoc +++ b/docs/logs/index.asciidoc @@ -23,9 +23,7 @@ instructions. [float] == Configure data sources -By default the Logs UI uses the `filebeat-*` index pattern to query the data. -If your logs are located in a different set of indices, you will need to set ` -xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.timestamp`. +By default the Logs UI uses the `filebeat-*` index pattern to query the data. If your logs are located in a different set of indices, you will need to set `xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`, by default it is set to `@timestamp`. See {logs-ui-settings}[Logs Ui Settings] for a complete list. -- diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc new file mode 100644 index 00000000000000..c87a48bb6d8669 --- /dev/null +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -0,0 +1,17 @@ +`xpack.infra.enabled`:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to `true`. + +`xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*`. + +`xpack.infra.sources.default.metricAlias`:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. + +`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to for sorting log entries. Defaults to `@timestamp`. + +`xpack.infra.sources.default.fields.message`:: Fields used for the message for Logs UI. Defaults to `['message', '@message']`. + +`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc` + +`xpack.infra.sources.default.fields.host`:: Field used to identify hosts. Defaults to `beat.hostname` + +`xpack.infra.sources.default.fields.container`:: Field used to identify Docker containers. Defaults to `docker.container.name` + +`xpack.infra.sources.default.fields.pod`:: Field used to identify Kubernetes pods. Defaults to `kubernetes.pod.name` diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc index 3bd2a376abbb10..bfecabbf101ff0 100644 --- a/docs/settings/infrastructure-ui-settings.asciidoc +++ b/docs/settings/infrastructure-ui-settings.asciidoc @@ -5,35 +5,10 @@ Infrastructure UI Settings ++++ -You do not need to configure any settings to use Infrastructure UI. It is enabled by default. +You do not need to configure any settings to use the Infrastructure UI. It is enabled by default. [float] [[general-infra-ui-settings-kb]] ==== General Infrastructure UI Settings -xpack.infra.enabled:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to -`true`. - -xpack.infra.sources.default.logAlias:: Index pattern for matching indices that contain log data. Defaults to -`filebeat-*`. - -xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to -`metricbeat-*`. - -xpack.infra.sources.default.fields.timestamp:: Timestamp used to for sorting log entries. Defaults to -`@timestamp`. - -xpack.infra.sources.default.fields.message:: Fields used for the message for Logs UI. Defaults to -`['message', '@message']`. - -xpack.infra.sources.default.fields.tiebreaker:: Field used to break ties between two entries -with the same timestamp. Defaults to `_doc` - -xpack.infra.sources.default.fields.host:: Field used to identify hosts. -Defaults to `beat.hostname` - -xpack.infra.sources.default.fields.container:: Field used to identify Docker containers. -Defaults to `docker.container.name` - -xpack.infra.sources.default.fields.pod:: Field used to identify Kubernetes pods. -Defaults to `kubernetes.pod.name` \ No newline at end of file +include::general-infra-logs-ui-settings.asciidoc[] \ No newline at end of file diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc index 9729cac69ddd09..fbe81435a81094 100644 --- a/docs/settings/logs-ui-settings.asciidoc +++ b/docs/settings/logs-ui-settings.asciidoc @@ -5,35 +5,10 @@ Logs UI Settings ++++ -You do not need to configure any settings to use Logs UI. It is enabled by default. +You do not need to configure any settings to use the Logs UI. It is enabled by default. [float] [[general-logs-ui-settings-kb]] ==== General Logs UI Settings -xpack.infra.enabled:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to -`true`. - -xpack.infra.sources.default.logAlias:: Index pattern for matching indices that contain log data. Defaults to -`filebeat-*`. - -xpack.infra.sources.default.metricAlias:: Index pattern for matching indices that contain Metricbeat data. Defaults to -`metricbeat-*`. - -xpack.infra.sources.default.fields.timestamp:: Timestamp used to for sorting log entries. Defaults to -`@timestamp`. - -xpack.infra.sources.default.fields.message:: Fields used for the message for Logs UI. Defaults to -`['message', '@message']`. - -xpack.infra.sources.default.fields.tiebreaker:: Field used to break ties between two entries -with the same timestamp. Defaults to `_doc` - -xpack.infra.sources.default.fields.host:: Field used to identify hosts. -Defaults to `beat.hostname` - -xpack.infra.sources.default.fields.container:: Field used to identify Docker containers. -Defaults to `docker.container.name` - -xpack.infra.sources.default.fields.pod:: Field used to identify Kubernetes pods. -Defaults to `kubernetes.pod.name` \ No newline at end of file +include::general-infra-logs-ui-settings.asciidoc[] diff --git a/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts b/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts index d96a376d505812..e9f9f9ed8b0e94 100644 --- a/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts +++ b/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -export const SCALE_FACTOR = 0.6; +export const SCALE_FACTOR = 0.55; export const MAX_SIZE = Infinity; export const MIN_SIZE = 24; From 63e8eafa21b01eb535ab731ed474938a8ccda52c Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Thu, 13 Dec 2018 16:47:27 -0700 Subject: [PATCH 08/11] Adding periods to lines; changing disabled to present tense --- docs/settings/general-infra-logs-ui-settings.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc index c87a48bb6d8669..24304370113c49 100644 --- a/docs/settings/general-infra-logs-ui-settings.asciidoc +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -1,4 +1,4 @@ -`xpack.infra.enabled`:: Set to `false` to disabled the Logs and Infrastructure UI plugin {kib}. Defaults to `true`. +`xpack.infra.enabled`:: Set to `false` to disable the Logs and Infrastructure UI plugin {kib}. Defaults to `true`. `xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*`. @@ -8,10 +8,10 @@ `xpack.infra.sources.default.fields.message`:: Fields used for the message for Logs UI. Defaults to `['message', '@message']`. -`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc` +`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`. -`xpack.infra.sources.default.fields.host`:: Field used to identify hosts. Defaults to `beat.hostname` +`xpack.infra.sources.default.fields.host`:: Field used to identify hosts. Defaults to `beat.hostname`. -`xpack.infra.sources.default.fields.container`:: Field used to identify Docker containers. Defaults to `docker.container.name` +`xpack.infra.sources.default.fields.container`:: Field used to identify Docker containers. Defaults to `docker.container.name`. -`xpack.infra.sources.default.fields.pod`:: Field used to identify Kubernetes pods. Defaults to `kubernetes.pod.name` +`xpack.infra.sources.default.fields.pod`:: Field used to identify Kubernetes pods. Defaults to `kubernetes.pod.name`. From ea9bc5ef37f75e26df8fa9a5cf43c71b867eaa44 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 18 Dec 2018 10:33:50 -0700 Subject: [PATCH 09/11] Updates to docs per PR --- docs/infrastructure/index.asciidoc | 2 +- docs/logs/index.asciidoc | 2 +- docs/settings/general-infra-logs-ui-settings.asciidoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index d1bad42796f085..96d6049a69f73c 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -23,7 +23,7 @@ instructions and information. [float] == Configure data sources -By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices, you will need to set `xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`.See {infrastructure-ui-settings}[Infrastructure Ui Settings] for a complete list. +By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices, you will need to set `xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`.See <> for a complete list. -- diff --git a/docs/logs/index.asciidoc b/docs/logs/index.asciidoc index 42a2f380b4f0a4..0d6b6324ea45f1 100644 --- a/docs/logs/index.asciidoc +++ b/docs/logs/index.asciidoc @@ -23,7 +23,7 @@ instructions. [float] == Configure data sources -By default the Logs UI uses the `filebeat-*` index pattern to query the data. If your logs are located in a different set of indices, you will need to set `xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`, by default it is set to `@timestamp`. See {logs-ui-settings}[Logs Ui Settings] for a complete list. +By default the Logs UI uses the `filebeat-*` index pattern to query the data. If your logs are located in a different set of indices, you will need to set `xpack.infra.sources.default.logAlias` in `config/kibana.yml` to match your log's index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`, by default it is set to `@timestamp`. See <> for a complete list. -- diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc index 24304370113c49..82ccaa61f83a0b 100644 --- a/docs/settings/general-infra-logs-ui-settings.asciidoc +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -6,7 +6,7 @@ `xpack.infra.sources.default.fields.timestamp`:: Timestamp used to for sorting log entries. Defaults to `@timestamp`. -`xpack.infra.sources.default.fields.message`:: Fields used for the message for Logs UI. Defaults to `['message', '@message']`. +`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`. `xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`. From 3e87323e3f76adb29b4908ac3f9261f98c72f951 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 7 Jan 2019 08:19:09 -0700 Subject: [PATCH 10/11] Updates per PR --- docs/infrastructure/index.asciidoc | 4 ++-- docs/logs/index.asciidoc | 2 +- docs/settings/general-infra-logs-ui-settings.asciidoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc index 96d6049a69f73c..6324df1c96501d 100644 --- a/docs/infrastructure/index.asciidoc +++ b/docs/infrastructure/index.asciidoc @@ -17,13 +17,13 @@ image::infrastructure/images/infra-sysmon.jpg[Infrastructure Overview in Kibana] [float] == Add data sources Kibana provides step-by-step instructions to help you add your data sources. -The {infra-guide}[Infrastructure Monitoring Guide] is good source for more detailed +The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed instructions and information. [float] == Configure data sources -By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices, you will need to set `xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`.See <> for a complete list. +By default the Infrastructure UI uses the `metricbeat-*` index pattern to query the data. If you configured Metricbeat to export data to a different set of indices, you will need to set `xpack.infra.sources.default.metricAlias` in `config/kibana.yml` to match your index pattern. You can also configure the timestamp field by overriding `xpack.infra.sources.default.fields.timestamp`. See <> for a complete list. -- diff --git a/docs/logs/index.asciidoc b/docs/logs/index.asciidoc index 0d6b6324ea45f1..f1ec7b3c5ebe95 100644 --- a/docs/logs/index.asciidoc +++ b/docs/logs/index.asciidoc @@ -17,7 +17,7 @@ image::logs/images/logs-console.png[Log Console in Kibana] == Add data sources Kibana provides step-by-step instructions to help you add your data sources. -The {infra-guide}[Infrastructure Monitoring Guide] is good source for more detailed information and +The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions. [float] diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc index 82ccaa61f83a0b..68f6356af56c80 100644 --- a/docs/settings/general-infra-logs-ui-settings.asciidoc +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -4,7 +4,7 @@ `xpack.infra.sources.default.metricAlias`:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. -`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to for sorting log entries. Defaults to `@timestamp`. +`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sorting log entries. Defaults to `@timestamp`. `xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`. From a5d6cb1fd1ee6ed876887c4d48c1be2360cc866d Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Mon, 7 Jan 2019 10:30:47 -0700 Subject: [PATCH 11/11] Fixes per PR --- docs/settings/general-infra-logs-ui-settings.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc index 68f6356af56c80..7300d451482cf2 100644 --- a/docs/settings/general-infra-logs-ui-settings.asciidoc +++ b/docs/settings/general-infra-logs-ui-settings.asciidoc @@ -4,7 +4,7 @@ `xpack.infra.sources.default.metricAlias`:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. -`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sorting log entries. Defaults to `@timestamp`. +`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sort log entries. Defaults to `@timestamp`. `xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`.