From abc4f69a17e3570585660f970ac30ada8bac4067 Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 5 Nov 2020 12:18:08 +0100 Subject: [PATCH 01/16] Make update after rebasing and fixing conflicts in fields.yml --- metricbeat/docs/fields.asciidoc | 3343 +++++++++++++++++---- metricbeat/module/elasticsearch/fields.go | 2 +- 2 files changed, 2786 insertions(+), 559 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 236b476e1ce..c2d105e8a9a 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -36,8 +36,8 @@ grouped in the following categories: * <> * <> * <> +* <> * <> -* <> * <> * <> * <> @@ -1569,8 +1569,7 @@ type: object - -*`aws.billing.metrics.EstimatedCharges.max`*:: +*`aws.billing.EstimatedCharges`*:: + -- Maximum estimated charges for AWS acccount. @@ -1579,6 +1578,166 @@ type: long -- +*`aws.billing.Currency`*:: ++ +-- +Estimated charges currency unit. + +type: keyword + +-- + +*`aws.billing.ServiceName`*:: ++ +-- +Service name for the maximum estimated charges. + +type: keyword + +-- + + +*`aws.billing.AmortizedCost.amount`*:: ++ +-- +Amortized cost amount + +type: double + +-- + +*`aws.billing.AmortizedCost.unit`*:: ++ +-- +Amortized cost unit + +type: keyword + +-- + + +*`aws.billing.BlendedCost.amount`*:: ++ +-- +Blended cost amount + +type: double + +-- + +*`aws.billing.BlendedCost.unit`*:: ++ +-- +Blended cost unit + +type: keyword + +-- + + +*`aws.billing.NormalizedUsageAmount.amount`*:: ++ +-- +Normalized usage amount + +type: double + +-- + +*`aws.billing.NormalizedUsageAmount.unit`*:: ++ +-- +Normalized usage amount unit + +type: keyword + +-- + + +*`aws.billing.UnblendedCost.amount`*:: ++ +-- +Unblended cost amount + +type: double + +-- + +*`aws.billing.UnblendedCost.unit`*:: ++ +-- +Unblended cost unit + +type: keyword + +-- + + +*`aws.billing.UsageQuantity.amount`*:: ++ +-- +Usage quantity amount + +type: double + +-- + +*`aws.billing.UsageQuantity.unit`*:: ++ +-- +Usage quantity unit + +type: keyword + +-- + +*`aws.billing.start_date`*:: ++ +-- +Start date for retrieving AWS costs + +type: keyword + +-- + +*`aws.billing.end_date`*:: ++ +-- +End date for retrieving AWS costs + +type: keyword + +-- + + +*`aws.billing.group_definition.key`*:: ++ +-- +The string that represents a key for a specified group + +type: keyword + +-- + +*`aws.billing.group_definition.type`*:: ++ +-- +The string that represents the type of group + +type: keyword + +-- + +*`aws.billing.group_by.*`*:: ++ +-- +Cost explorer group by key values + + +type: object + +-- + [float] === cloudwatch @@ -2041,7 +2200,7 @@ type: long *`aws.ec2.network.in.packets`*:: + -- -The number of packets received on all network interfaces by the instance. +The total number of packets received on all network interfaces by the instance in collection period. type: long @@ -2054,14 +2213,14 @@ type: long The number of packets per second sent out on all network interfaces by the instance. -type: long +type: scaled_float -- *`aws.ec2.network.out.packets`*:: + -- -The number of packets sent out on all network interfaces by the instance. +The total number of packets sent out on all network interfaces by the instance in collection period. type: long @@ -2074,14 +2233,14 @@ type: long The number of packets per second sent out on all network interfaces by the instance. -type: long +type: scaled_float -- *`aws.ec2.network.in.bytes`*:: + -- -The number of bytes received on all network interfaces by the instance. +The total number of bytes received on all network interfaces by the instance in collection period. type: long @@ -2096,14 +2255,14 @@ format: bytes The number of bytes per second received on all network interfaces by the instance. -type: long +type: scaled_float -- *`aws.ec2.network.out.bytes`*:: + -- -The number of bytes sent out on all network interfaces by the instance. +The total number of bytes sent out on all network interfaces by the instance in collection period. type: long @@ -2118,14 +2277,14 @@ format: bytes The number of bytes per second sent out on all network interfaces by the instance. -type: long +type: scaled_float -- *`aws.ec2.diskio.read.bytes`*:: + -- -Bytes read from all instance store volumes available to the instance. +Total bytes read from all instance store volumes available to the instance in collection period. type: long @@ -2140,14 +2299,14 @@ format: bytes Bytes read per second from all instance store volumes available to the instance. -type: long +type: scaled_float -- *`aws.ec2.diskio.write.bytes`*:: + -- -Bytes written to all instance store volumes available to the instance. +Total bytes written to all instance store volumes available to the instance in collection period. type: long @@ -2162,14 +2321,14 @@ format: bytes Bytes written per second to all instance store volumes available to the instance. -type: long +type: scaled_float -- *`aws.ec2.diskio.read.ops`*:: + -- -Completed read operations from all instance store volumes available to the instance in a specified period of time. +Total completed read operations from all instance store volumes available to the instance in collection period. type: long @@ -2189,7 +2348,7 @@ type: long *`aws.ec2.diskio.write.ops`*:: + -- -Completed write operations to all instance store volumes available to the instance in a specified period of time. +Total completed write operations to all instance store volumes available to the instance in collection period. type: long @@ -4506,6 +4665,16 @@ type: keyword The subscription ID +type: keyword + +-- + +*`azure.application_id`*:: ++ +-- +The application ID + + type: keyword -- @@ -4516,6 +4685,16 @@ type: keyword Azure metric dimensions. +type: object + +-- + +*`azure.metrics.*.*`*:: ++ +-- +Metrics returned. + + type: object -- @@ -4527,17 +4706,44 @@ application insights -*`azure.app_insights.application_id`*:: +*`azure.app_insights.start_date`*:: + -- -The application ID +The start date -type: keyword +type: date -- -*`azure.app_insights.start_date`*:: +*`azure.app_insights.end_date`*:: ++ +-- +The end date + + +type: date + +-- + +*`azure.app_insights.metrics.*.*`*:: ++ +-- +The metrics + + +type: object + +-- + +[float] +=== app_state + +application state + + + +*`azure.app_state.start_date`*:: + -- The start date @@ -4547,7 +4753,7 @@ type: date -- -*`azure.app_insights.end_date`*:: +*`azure.app_state.end_date`*:: + -- The end date @@ -4557,13 +4763,183 @@ type: date -- -*`azure.app_insights.metrics.*.*`*:: +*`azure.app_state.requests_count.sum`*:: + -- -The metrics +Request count -type: object +type: float + +-- + +*`azure.app_state.requests_failed.sum`*:: ++ +-- +Request failed count + + +type: float + +-- + +*`azure.app_state.users_count.unique`*:: ++ +-- +User count + + +type: float + +-- + +*`azure.app_state.sessions_count.unique`*:: ++ +-- +Session count + + +type: float + +-- + +*`azure.app_state.users_authenticated.unique`*:: ++ +-- +Authenticated users count + + +type: float + +-- + +*`azure.app_state.browser_timings_network_duration.avg`*:: ++ +-- +Browser timings network duration + + +type: float + +-- + +*`azure.app_state.browser_timings_send_duration.avg`*:: ++ +-- +Browser timings send duration + + +type: float + +-- + +*`azure.app_state.browser_timings_receive_uration.avg`*:: ++ +-- +Browser timings receive duration + + +type: float + +-- + +*`azure.app_state.browser_timings_processing_duration.avg`*:: ++ +-- +Browser timings processing duration + + +type: float + +-- + +*`azure.app_state.browser_timings_total_duration.avg`*:: ++ +-- +Browser timings total duration + + +type: float + +-- + +*`azure.app_state.exceptions_count.sum`*:: ++ +-- +Exception count + + +type: float + +-- + +*`azure.app_state.exceptions_browser.sum`*:: ++ +-- +Exception count at browser level + + +type: float + +-- + +*`azure.app_state.exceptions_server.sum`*:: ++ +-- +Exception count at server level + + +type: float + +-- + +*`azure.app_state.performance_counters_memory_available_bytes.avg`*:: ++ +-- +Performance counters memory available bytes + + +type: float + +-- + +*`azure.app_state.performance_counters_process_private_bytes.avg`*:: ++ +-- +Performance counters process private bytes + + +type: float + +-- + +*`azure.app_state.performance_counters_process_cpu_percentage_total.avg`*:: ++ +-- +Performance counters process cpu percentage total + + +type: float + +-- + +*`azure.app_state.performance_counters_process_cpu_percentage.avg`*:: ++ +-- +Performance counters process cpu percentage + + +type: float + +-- + +*`azure.app_state.performance_counters_processiobytes_per_second.avg`*:: ++ +-- +Performance counters process IO bytes per second + + +type: float -- @@ -4750,17 +5126,6 @@ type: object monitor - -*`azure.monitor.metrics.*.*`*:: -+ --- -Metrics returned. - - -type: object - --- - *`azure.storage.*.*`*:: + -- @@ -6040,16 +6405,6 @@ Metadata from cloud providers added by the add_cloud_metadata processor. -*`cloud.project.id`*:: -+ --- -Name of the project in Google Cloud. - - -example: project-x - --- - *`cloud.image.id`*:: + -- @@ -6395,6 +6750,80 @@ type: keyword -- + +*`host.cpu.pct`*:: ++ +-- +Percent CPU used. This value is normalized by the number of CPU cores and it ranges from 0 to 1. + +type: scaled_float + +format: percent + +-- + +*`host.network.in.bytes`*:: ++ +-- +The number of bytes received on all network interfaces by the host in a given period of time. + +type: long + +format: bytes + +-- + +*`host.network.out.bytes`*:: ++ +-- +The number of bytes sent out on all network interfaces by the host in a given period of time. + +type: long + +format: bytes + +-- + +*`host.network.in.packets`*:: ++ +-- +The number of packets received on all network interfaces by the host in a given period of time. + +type: long + +-- + +*`host.network.out.packets`*:: ++ +-- +The number of packets sent out on all network interfaces by the host in a given period of time. + +type: long + +-- + +*`host.disk.read.bytes`*:: ++ +-- +The total number of bytes read successfully in a given period of time. + +type: long + +format: bytes + +-- + +*`host.disk.write.bytes`*:: ++ +-- +The total number of bytes write successfully in a given period of time. + +type: long + +format: bytes + +-- + [[exported-fields-consul]] == Consul fields @@ -8942,8 +9371,15 @@ Stats collected from Dropwizard. [[exported-fields-ecs]] == ECS fields -ECS Fields. +This section defines Elastic Common Schema (ECS) fields—a common set of fields +to be used when storing event data in {es}. + +This is an exhaustive list, and fields listed here are not necessarily used by {beatname_uc}. +The goal of ECS is to enable and encourage users of {es} to normalize their event data, +so that they can better analyze, visualize, and correlate the data represented in their events. + +See the {ecs-ref}[ECS reference] for more information. *`@timestamp`*:: + @@ -9005,6 +9441,18 @@ The agent fields contain the data about the software entity, if any, that collec Examples include Beats. Agents may also run on observers. ECS agent.* fields shall be populated with details of the agent running on the host or observer where the event happened or the measurement was taken. +*`agent.build.original`*:: ++ +-- +Extended build information for the agent. +This field is intended to contain any build information that a data source may provide, no specific formatting is required. + +type: keyword + +example: metricbeat version 7.6.0 (amd64), libbeat 7.6.0 [6a23e8f8f30f5001ba344e4e54d8d9cb82cb107c built 2020-02-05 23:10:10 +0000 UTC] + +-- + *`agent.ephemeral_id`*:: + -- @@ -9046,7 +9494,7 @@ example: foo + -- Type of the agent. -The agent type stays always the same and should be given by the agent used. In case of Filebeat the agent would always be Filebeat also if two Filebeat instances are run on the same machine. +The agent type always stays the same and should be given by the agent used. In case of Filebeat the agent would always be Filebeat also if two Filebeat instances are run on the same machine. type: keyword @@ -9262,8 +9710,7 @@ example: Quebec *`client.ip`*:: + -- -IP address of the client. -Can be one or multiple IPv4 or IPv6 addresses. +IP address of the client (IPv4 or IPv6). type: ip @@ -9326,19 +9773,19 @@ format: string + -- The highest registered client domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- *`client.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -9425,7 +9872,7 @@ type: keyword *`client.user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -9449,6 +9896,17 @@ type: text -- +*`client.user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === cloud @@ -9467,6 +9925,18 @@ example: 666777888999 -- +*`cloud.account.name`*:: ++ +-- +The cloud account name or alias used to identify different entities in a multi-tenant environment. +Examples: AWS account name, Google Cloud ORG display name. + +type: keyword + +example: elastic-dev + +-- + *`cloud.availability_zone`*:: + -- @@ -9509,6 +9979,30 @@ example: t2.medium -- +*`cloud.project.id`*:: ++ +-- +The cloud project identifier. +Examples: Google Cloud Project id, Azure Project id. + +type: keyword + +example: my-project + +-- + +*`cloud.project.name`*:: ++ +-- +The cloud project name. +Examples: Google Cloud Project name, Azure Project name. + +type: keyword + +example: my project + +-- + *`cloud.provider`*:: + -- @@ -9819,8 +10313,7 @@ example: Quebec *`destination.ip`*:: + -- -IP address of the destination. -Can be one or multiple IPv4 or IPv6 addresses. +IP address of the destination (IPv4 or IPv6). type: ip @@ -9883,19 +10376,19 @@ format: string + -- The highest registered destination domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- *`destination.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -9982,7 +10475,7 @@ type: keyword *`destination.user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -10006,6 +10499,17 @@ type: text -- +*`destination.user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === dll @@ -10134,6 +10638,17 @@ example: C:\Windows\System32\kernel32.dll -- +*`dll.pe.architecture`*:: ++ +-- +CPU architecture target for the file. + +type: keyword + +example: x64 + +-- + *`dll.pe.company`*:: + -- @@ -10167,6 +10682,18 @@ example: 6.3.9600.17415 -- +*`dll.pe.imphash`*:: ++ +-- +A hash of the imports in a PE file. An imphash -- or import hash -- can be used to fingerprint binaries even after recompilation or other code-level transformations have occurred, which would change more traditional hash values. +Learn more at https://www.fireeye.com/blog/threat-research/2014/01/tracking-malware-import-hashing.html. + +type: keyword + +example: 0c6803c4e922103c4dca5963aad36ddf + +-- + *`dll.pe.original_file_name`*:: + -- @@ -10238,7 +10765,7 @@ If a chain of CNAME is being resolved, each answer's `name` should be the one th type: keyword -example: www.google.com +example: www.example.com -- @@ -10317,7 +10844,7 @@ If the name field contains non-printable characters (below 32 or above 126), tho type: keyword -example: www.google.com +example: www.example.com -- @@ -10325,12 +10852,12 @@ example: www.google.com + -- The highest registered domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- @@ -10349,7 +10876,7 @@ example: www *`dns.question.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -10466,6 +10993,8 @@ The stack trace of this error in plain text. type: keyword +Field is not indexed. + -- *`error.stack_trace.text`*:: @@ -10648,6 +11177,8 @@ type: keyword example: Sep 19 08:26:10 host CEF:0|Security| threatmanager|1.0|100| worm successfully stopped|10|src=10.0.0.1 dst=2.1.2.2spt=1232 +Field is not indexed. + -- *`event.outcome`*:: @@ -10677,6 +11208,18 @@ example: kernel -- +*`event.reason`*:: ++ +-- +Reason why this event happened, according to the source. +This describes the why of a particular action or outcome captured in the event. Where `event.action` captures the action from the event, `event.reason` describes why that action was taken. For example, a web proxy with an `event.action` which denied the request may also populate `event.reason` with the reason why (e.g. `blocked site`). + +type: keyword + +example: Terminated an unexpected process + +-- + *`event.reference`*:: + -- @@ -10685,7 +11228,7 @@ This URL links to a static definition of the this event. Alert events, indicated type: keyword -example: https://system.vendor.com/event/#0001234 +example: https://system.example.com/event/#0001234 -- @@ -10769,11 +11312,11 @@ type: keyword + -- URL linking to an external system to continue investigation of this event. -This URL links to another system where in-depth investigation of the specific occurence of this event can take place. Alert events, indicated by `event.kind:alert`, are a common use case for this field. +This URL links to another system where in-depth investigation of the specific occurrence of this event can take place. Alert events, indicated by `event.kind:alert`, are a common use case for this field. type: keyword -example: https://mysystem.mydomain.com/alert/5271dedb-f5b0-4218-87f0-4ac4870a38fe +example: https://mysystem.example.com/alert/5271dedb-f5b0-4218-87f0-4ac4870a38fe -- @@ -11067,6 +11610,17 @@ type: text -- +*`file.pe.architecture`*:: ++ +-- +CPU architecture target for the file. + +type: keyword + +example: x64 + +-- + *`file.pe.company`*:: + -- @@ -11100,6 +11654,18 @@ example: 6.3.9600.17415 -- +*`file.pe.imphash`*:: ++ +-- +A hash of the imports in a PE file. An imphash -- or import hash -- can be used to fingerprint binaries even after recompilation or other code-level transformations have occurred, which would change more traditional hash values. +Learn more at https://www.fireeye.com/blog/threat-research/2014/01/tracking-malware-import-hashing.html. + +type: keyword + +example: 0c6803c4e922103c4dca5963aad36ddf + +-- + *`file.pe.original_file_name`*:: + -- @@ -11172,6 +11738,270 @@ example: 1001 -- +*`file.x509.alternative_names`*:: ++ +-- +List of subject alternative names (SAN). Name types vary by certificate authority and certificate type but commonly contain IP addresses, DNS names (and wildcards), and email addresses. + +type: keyword + +example: *.elastic.co + +-- + +*`file.x509.issuer.common_name`*:: ++ +-- +List of common name (CN) of issuing certificate authority. + +type: keyword + +example: Example SHA2 High Assurance Server CA + +-- + +*`file.x509.issuer.country`*:: ++ +-- +List of country (C) codes + +type: keyword + +example: US + +-- + +*`file.x509.issuer.distinguished_name`*:: ++ +-- +Distinguished name (DN) of issuing certificate authority. + +type: keyword + +example: C=US, O=Example Inc, OU=www.example.com, CN=Example SHA2 High Assurance Server CA + +-- + +*`file.x509.issuer.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: Mountain View + +-- + +*`file.x509.issuer.organization`*:: ++ +-- +List of organizations (O) of issuing certificate authority. + +type: keyword + +example: Example Inc + +-- + +*`file.x509.issuer.organizational_unit`*:: ++ +-- +List of organizational units (OU) of issuing certificate authority. + +type: keyword + +example: www.example.com + +-- + +*`file.x509.issuer.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`file.x509.not_after`*:: ++ +-- +Time at which the certificate is no longer considered valid. + +type: date + +example: 2020-07-16 03:15:39+00:00 + +-- + +*`file.x509.not_before`*:: ++ +-- +Time at which the certificate is first considered valid. + +type: date + +example: 2019-08-16 01:40:25+00:00 + +-- + +*`file.x509.public_key_algorithm`*:: ++ +-- +Algorithm used to generate the public key. + +type: keyword + +example: RSA + +-- + +*`file.x509.public_key_curve`*:: ++ +-- +The curve used by the elliptic curve public key algorithm. This is algorithm specific. + +type: keyword + +example: nistp521 + +-- + +*`file.x509.public_key_exponent`*:: ++ +-- +Exponent used to derive the public key. This is algorithm specific. + +type: long + +example: 65537 + +Field is not indexed. + +-- + +*`file.x509.public_key_size`*:: ++ +-- +The size of the public key space in bits. + +type: long + +example: 2048 + +-- + +*`file.x509.serial_number`*:: ++ +-- +Unique serial number issued by the certificate authority. For consistency, if this value is alphanumeric, it should be formatted without colons and uppercase characters. + +type: keyword + +example: 55FBB9C7DEBF09809D12CCAA + +-- + +*`file.x509.signature_algorithm`*:: ++ +-- +Identifier for certificate signature algorithm. We recommend using names found in Go Lang Crypto library. See https://github.com/golang/go/blob/go1.14/src/crypto/x509/x509.go#L337-L353. + +type: keyword + +example: SHA256-RSA + +-- + +*`file.x509.subject.common_name`*:: ++ +-- +List of common names (CN) of subject. + +type: keyword + +example: shared.global.example.net + +-- + +*`file.x509.subject.country`*:: ++ +-- +List of country (C) code + +type: keyword + +example: US + +-- + +*`file.x509.subject.distinguished_name`*:: ++ +-- +Distinguished name (DN) of the certificate subject entity. + +type: keyword + +example: C=US, ST=California, L=San Francisco, O=Example, Inc., CN=shared.global.example.net + +-- + +*`file.x509.subject.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: San Francisco + +-- + +*`file.x509.subject.organization`*:: ++ +-- +List of organizations (O) of subject. + +type: keyword + +example: Example, Inc. + +-- + +*`file.x509.subject.organizational_unit`*:: ++ +-- +List of organizational units (OU) of subject. + +type: keyword + +-- + +*`file.x509.subject.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`file.x509.version_number`*:: ++ +-- +Version of x509 format. + +type: keyword + +example: 3 + +-- + [float] === geo @@ -11694,7 +12524,7 @@ type: keyword *`host.user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -11718,6 +12548,17 @@ type: text -- +*`host.user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === http @@ -11772,11 +12613,13 @@ format: bytes + -- HTTP request method. -The field value must be normalized to lowercase for querying. See the documentation section "Implementing ECS". +Prior to ECS 1.6.0 the following guidance was provided: +"The field value must be normalized to lowercase for querying." +As of ECS 1.6.0, the guidance is deprecated because the original case of the method may be useful in anomaly detection. Original case will be mandated in ECS 2.0.0 type: keyword -example: get, post, put +example: GET, POST, PUT, PoST -- @@ -11906,6 +12749,18 @@ The log.* fields are typically populated with details about the logging mechanis The details specific to your event source are typically not logged under `log.*`, but rather in `event.*` or in other ECS fields. +*`log.file.path`*:: ++ +-- +Full path to the log file this event came from, including the file name. It should include the drive letter, when appropriate. +If the event wasn't read from a log file, do not populate this field. + +type: keyword + +example: /var/log/fun-times.log + +-- + *`log.level`*:: + -- @@ -11944,7 +12799,8 @@ example: 42 *`log.origin.file.name`*:: + -- -The name of the file containing the source code which originated the log event. Note that this is not the name of the log file. +The name of the file containing the source code which originated the log event. +Note that this field is not meant to capture the log file. The correct field to capture the log file is `log.file.path`. type: keyword @@ -11974,6 +12830,8 @@ type: keyword example: Sep 19 08:26:10 localhost My log +Field is not indexed. + -- *`log.syslog`*:: @@ -12942,6 +13800,17 @@ example: 1.12.9 These fields contain Windows Portable Executable (PE) metadata. +*`pe.architecture`*:: ++ +-- +CPU architecture target for the file. + +type: keyword + +example: x64 + +-- + *`pe.company`*:: + -- @@ -12975,6 +13844,18 @@ example: 6.3.9600.17415 -- +*`pe.imphash`*:: ++ +-- +A hash of the imports in a PE file. An imphash -- or import hash -- can be used to fingerprint binaries even after recompilation or other code-level transformations have occurred, which would change more traditional hash values. +Learn more at https://www.fireeye.com/blog/threat-research/2014/01/tracking-malware-import-hashing.html. + +type: keyword + +example: 0c6803c4e922103c4dca5963aad36ddf + +-- + *`pe.original_file_name`*:: + -- @@ -13206,12 +14087,12 @@ type: text *`process.parent.args`*:: + -- -Array of process arguments. +Array of process arguments, starting with the absolute path to the executable. May be filtered to protect sensitive information. type: keyword -example: ['ssh', '-l', 'user', '10.0.0.16'] +example: ['/usr/bin/ssh', '-l', 'user', '10.0.0.16'] -- @@ -13402,6 +14283,84 @@ type: text -- +*`process.parent.pe.architecture`*:: ++ +-- +CPU architecture target for the file. + +type: keyword + +example: x64 + +-- + +*`process.parent.pe.company`*:: ++ +-- +Internal company name of the file, provided at compile-time. + +type: keyword + +example: Microsoft Corporation + +-- + +*`process.parent.pe.description`*:: ++ +-- +Internal description of the file, provided at compile-time. + +type: keyword + +example: Paint + +-- + +*`process.parent.pe.file_version`*:: ++ +-- +Internal version of the file, provided at compile-time. + +type: keyword + +example: 6.3.9600.17415 + +-- + +*`process.parent.pe.imphash`*:: ++ +-- +A hash of the imports in a PE file. An imphash -- or import hash -- can be used to fingerprint binaries even after recompilation or other code-level transformations have occurred, which would change more traditional hash values. +Learn more at https://www.fireeye.com/blog/threat-research/2014/01/tracking-malware-import-hashing.html. + +type: keyword + +example: 0c6803c4e922103c4dca5963aad36ddf + +-- + +*`process.parent.pe.original_file_name`*:: ++ +-- +Internal name of the file, provided at compile-time. + +type: keyword + +example: MSPAINT.EXE + +-- + +*`process.parent.pe.product`*:: ++ +-- +Internal product name of the file, provided at compile-time. + +type: keyword + +example: Microsoft® Windows® Operating System + +-- + *`process.parent.pgid`*:: + -- @@ -13520,6 +14479,17 @@ type: text -- +*`process.pe.architecture`*:: ++ +-- +CPU architecture target for the file. + +type: keyword + +example: x64 + +-- + *`process.pe.company`*:: + -- @@ -13553,6 +14523,18 @@ example: 6.3.9600.17415 -- +*`process.pe.imphash`*:: ++ +-- +A hash of the imports in a PE file. An imphash -- or import hash -- can be used to fingerprint binaries even after recompilation or other code-level transformations have occurred, which would change more traditional hash values. +Learn more at https://www.fireeye.com/blog/threat-research/2014/01/tracking-malware-import-hashing.html. + +type: keyword + +example: 0c6803c4e922103c4dca5963aad36ddf + +-- + *`process.pe.original_file_name`*:: + -- @@ -13795,6 +14777,15 @@ type: keyword -- +*`related.hosts`*:: ++ +-- +All hostnames or other host identifiers seen on your event. Example identifiers include FQDNs, domain names, workstation names, or aliases. + +type: keyword + +-- + *`related.ip`*:: + -- @@ -14093,8 +15084,7 @@ example: Quebec *`server.ip`*:: + -- -IP address of the server. -Can be one or multiple IPv4 or IPv6 addresses. +IP address of the server (IPv4 or IPv6). type: ip @@ -14157,19 +15147,19 @@ format: string + -- The highest registered server domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- *`server.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -14256,7 +15246,7 @@ type: keyword *`server.user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -14280,6 +15270,17 @@ type: text -- +*`server.user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === service @@ -14533,8 +15534,7 @@ example: Quebec *`source.ip`*:: + -- -IP address of the source. -Can be one or multiple IPv4 or IPv6 addresses. +IP address of the source (IPv4 or IPv6). type: ip @@ -14597,19 +15597,19 @@ format: string + -- The highest registered source domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- *`source.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -14696,7 +15696,7 @@ type: keyword *`source.user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -14720,10 +15720,21 @@ type: text -- +*`source.user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === threat -Fields to classify events and alerts according to a threat taxonomy such as the Mitre ATT&CK framework. +Fields to classify events and alerts according to a threat taxonomy such as the MITRE ATT&CK® framework. These fields are for users to classify alerts from all of their sources (e.g. IDS, NGFW, etc.) within a common taxonomy. The threat.tactic.* are meant to capture the high level category of the threat (e.g. "impact"). The threat.technique.* fields are meant to capture which kind of approach is used by this detected threat, to accomplish the goal (e.g. "endpoint denial of service"). @@ -14741,7 +15752,7 @@ example: MITRE ATT&CK *`threat.tactic.id`*:: + -- -The id of tactic used by this threat. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/tactics/TA0040/ ) +The id of tactic used by this threat. You can use a MITRE ATT&CK® tactic, for example. (ex. https://attack.mitre.org/tactics/TA0040/ ) type: keyword @@ -14752,7 +15763,7 @@ example: TA0040 *`threat.tactic.name`*:: + -- -Name of the type of tactic used by this threat. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/tactics/TA0040/ ) +Name of the type of tactic used by this threat. You can use a MITRE ATT&CK® tactic, for example. (ex. https://attack.mitre.org/tactics/TA0040/) type: keyword @@ -14763,7 +15774,7 @@ example: impact *`threat.tactic.reference`*:: + -- -The reference url of tactic used by this threat. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/tactics/TA0040/ ) +The reference url of tactic used by this threat. You can use a MITRE ATT&CK® tactic, for example. (ex. https://attack.mitre.org/tactics/TA0040/ ) type: keyword @@ -14774,7 +15785,7 @@ example: https://attack.mitre.org/tactics/TA0040/ *`threat.technique.id`*:: + -- -The id of technique used by this tactic. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/techniques/T1499/ ) +The id of technique used by this threat. You can use a MITRE ATT&CK® technique, for example. (ex. https://attack.mitre.org/techniques/T1499/) type: keyword @@ -14785,11 +15796,11 @@ example: T1499 *`threat.technique.name`*:: + -- -The name of technique used by this tactic. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/techniques/T1499/ ) +The name of technique used by this threat. You can use a MITRE ATT&CK® technique, for example. (ex. https://attack.mitre.org/techniques/T1499/) type: keyword -example: endpoint denial of service +example: Endpoint Denial of Service -- @@ -14803,7 +15814,7 @@ type: text *`threat.technique.reference`*:: + -- -The reference url of technique used by this tactic. You can use the Mitre ATT&CK Matrix Tactic categorization, for example. (ex. https://attack.mitre.org/techniques/T1499/ ) +The reference url of technique used by this threat. You can use a MITRE ATT&CK® technique, for example. (ex. https://attack.mitre.org/techniques/T1499/ ) type: keyword @@ -14890,7 +15901,7 @@ Distinguished name of subject of the issuer of the x.509 certificate presented b type: keyword -example: CN=MyDomain Root CA, OU=Infrastructure Team, DC=mydomain, DC=com +example: CN=Example Root CA, OU=Infrastructure Team, DC=example, DC=com -- @@ -14930,7 +15941,7 @@ example: 1970-01-01T00:00:00.000Z *`tls.client.server_name`*:: + -- -Also called an SNI, this tells the server which hostname to which the client is attempting to connect. When this value is available, it should get copied to `destination.domain`. +Also called an SNI, this tells the server which hostname to which the client is attempting to connect to. When this value is available, it should get copied to `destination.domain`. type: keyword @@ -14945,7 +15956,7 @@ Distinguished name of subject of the x.509 certificate presented by the client. type: keyword -example: CN=myclient, OU=Documentation Team, DC=mydomain, DC=com +example: CN=myclient, OU=Documentation Team, DC=example, DC=com -- @@ -14960,6 +15971,270 @@ example: ['TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384', 'TLS_ECDHE_ECDSA_WITH_AES_256 -- +*`tls.client.x509.alternative_names`*:: ++ +-- +List of subject alternative names (SAN). Name types vary by certificate authority and certificate type but commonly contain IP addresses, DNS names (and wildcards), and email addresses. + +type: keyword + +example: *.elastic.co + +-- + +*`tls.client.x509.issuer.common_name`*:: ++ +-- +List of common name (CN) of issuing certificate authority. + +type: keyword + +example: Example SHA2 High Assurance Server CA + +-- + +*`tls.client.x509.issuer.country`*:: ++ +-- +List of country (C) codes + +type: keyword + +example: US + +-- + +*`tls.client.x509.issuer.distinguished_name`*:: ++ +-- +Distinguished name (DN) of issuing certificate authority. + +type: keyword + +example: C=US, O=Example Inc, OU=www.example.com, CN=Example SHA2 High Assurance Server CA + +-- + +*`tls.client.x509.issuer.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: Mountain View + +-- + +*`tls.client.x509.issuer.organization`*:: ++ +-- +List of organizations (O) of issuing certificate authority. + +type: keyword + +example: Example Inc + +-- + +*`tls.client.x509.issuer.organizational_unit`*:: ++ +-- +List of organizational units (OU) of issuing certificate authority. + +type: keyword + +example: www.example.com + +-- + +*`tls.client.x509.issuer.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`tls.client.x509.not_after`*:: ++ +-- +Time at which the certificate is no longer considered valid. + +type: date + +example: 2020-07-16 03:15:39+00:00 + +-- + +*`tls.client.x509.not_before`*:: ++ +-- +Time at which the certificate is first considered valid. + +type: date + +example: 2019-08-16 01:40:25+00:00 + +-- + +*`tls.client.x509.public_key_algorithm`*:: ++ +-- +Algorithm used to generate the public key. + +type: keyword + +example: RSA + +-- + +*`tls.client.x509.public_key_curve`*:: ++ +-- +The curve used by the elliptic curve public key algorithm. This is algorithm specific. + +type: keyword + +example: nistp521 + +-- + +*`tls.client.x509.public_key_exponent`*:: ++ +-- +Exponent used to derive the public key. This is algorithm specific. + +type: long + +example: 65537 + +Field is not indexed. + +-- + +*`tls.client.x509.public_key_size`*:: ++ +-- +The size of the public key space in bits. + +type: long + +example: 2048 + +-- + +*`tls.client.x509.serial_number`*:: ++ +-- +Unique serial number issued by the certificate authority. For consistency, if this value is alphanumeric, it should be formatted without colons and uppercase characters. + +type: keyword + +example: 55FBB9C7DEBF09809D12CCAA + +-- + +*`tls.client.x509.signature_algorithm`*:: ++ +-- +Identifier for certificate signature algorithm. We recommend using names found in Go Lang Crypto library. See https://github.com/golang/go/blob/go1.14/src/crypto/x509/x509.go#L337-L353. + +type: keyword + +example: SHA256-RSA + +-- + +*`tls.client.x509.subject.common_name`*:: ++ +-- +List of common names (CN) of subject. + +type: keyword + +example: shared.global.example.net + +-- + +*`tls.client.x509.subject.country`*:: ++ +-- +List of country (C) code + +type: keyword + +example: US + +-- + +*`tls.client.x509.subject.distinguished_name`*:: ++ +-- +Distinguished name (DN) of the certificate subject entity. + +type: keyword + +example: C=US, ST=California, L=San Francisco, O=Example, Inc., CN=shared.global.example.net + +-- + +*`tls.client.x509.subject.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: San Francisco + +-- + +*`tls.client.x509.subject.organization`*:: ++ +-- +List of organizations (O) of subject. + +type: keyword + +example: Example, Inc. + +-- + +*`tls.client.x509.subject.organizational_unit`*:: ++ +-- +List of organizational units (OU) of subject. + +type: keyword + +-- + +*`tls.client.x509.subject.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`tls.client.x509.version_number`*:: ++ +-- +Version of x509 format. + +type: keyword + +example: 3 + +-- + *`tls.curve`*:: + -- @@ -15062,7 +16337,7 @@ Subject of the issuer of the x.509 certificate presented by the server. type: keyword -example: CN=MyDomain Root CA, OU=Infrastructure Team, DC=mydomain, DC=com +example: CN=Example Root CA, OU=Infrastructure Team, DC=example, DC=com -- @@ -15106,7 +16381,271 @@ Subject of the x.509 certificate presented by the server. type: keyword -example: CN=www.mydomain.com, OU=Infrastructure Team, DC=mydomain, DC=com +example: CN=www.example.com, OU=Infrastructure Team, DC=example, DC=com + +-- + +*`tls.server.x509.alternative_names`*:: ++ +-- +List of subject alternative names (SAN). Name types vary by certificate authority and certificate type but commonly contain IP addresses, DNS names (and wildcards), and email addresses. + +type: keyword + +example: *.elastic.co + +-- + +*`tls.server.x509.issuer.common_name`*:: ++ +-- +List of common name (CN) of issuing certificate authority. + +type: keyword + +example: Example SHA2 High Assurance Server CA + +-- + +*`tls.server.x509.issuer.country`*:: ++ +-- +List of country (C) codes + +type: keyword + +example: US + +-- + +*`tls.server.x509.issuer.distinguished_name`*:: ++ +-- +Distinguished name (DN) of issuing certificate authority. + +type: keyword + +example: C=US, O=Example Inc, OU=www.example.com, CN=Example SHA2 High Assurance Server CA + +-- + +*`tls.server.x509.issuer.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: Mountain View + +-- + +*`tls.server.x509.issuer.organization`*:: ++ +-- +List of organizations (O) of issuing certificate authority. + +type: keyword + +example: Example Inc + +-- + +*`tls.server.x509.issuer.organizational_unit`*:: ++ +-- +List of organizational units (OU) of issuing certificate authority. + +type: keyword + +example: www.example.com + +-- + +*`tls.server.x509.issuer.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`tls.server.x509.not_after`*:: ++ +-- +Time at which the certificate is no longer considered valid. + +type: date + +example: 2020-07-16 03:15:39+00:00 + +-- + +*`tls.server.x509.not_before`*:: ++ +-- +Time at which the certificate is first considered valid. + +type: date + +example: 2019-08-16 01:40:25+00:00 + +-- + +*`tls.server.x509.public_key_algorithm`*:: ++ +-- +Algorithm used to generate the public key. + +type: keyword + +example: RSA + +-- + +*`tls.server.x509.public_key_curve`*:: ++ +-- +The curve used by the elliptic curve public key algorithm. This is algorithm specific. + +type: keyword + +example: nistp521 + +-- + +*`tls.server.x509.public_key_exponent`*:: ++ +-- +Exponent used to derive the public key. This is algorithm specific. + +type: long + +example: 65537 + +Field is not indexed. + +-- + +*`tls.server.x509.public_key_size`*:: ++ +-- +The size of the public key space in bits. + +type: long + +example: 2048 + +-- + +*`tls.server.x509.serial_number`*:: ++ +-- +Unique serial number issued by the certificate authority. For consistency, if this value is alphanumeric, it should be formatted without colons and uppercase characters. + +type: keyword + +example: 55FBB9C7DEBF09809D12CCAA + +-- + +*`tls.server.x509.signature_algorithm`*:: ++ +-- +Identifier for certificate signature algorithm. We recommend using names found in Go Lang Crypto library. See https://github.com/golang/go/blob/go1.14/src/crypto/x509/x509.go#L337-L353. + +type: keyword + +example: SHA256-RSA + +-- + +*`tls.server.x509.subject.common_name`*:: ++ +-- +List of common names (CN) of subject. + +type: keyword + +example: shared.global.example.net + +-- + +*`tls.server.x509.subject.country`*:: ++ +-- +List of country (C) code + +type: keyword + +example: US + +-- + +*`tls.server.x509.subject.distinguished_name`*:: ++ +-- +Distinguished name (DN) of the certificate subject entity. + +type: keyword + +example: C=US, ST=California, L=San Francisco, O=Example, Inc., CN=shared.global.example.net + +-- + +*`tls.server.x509.subject.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: San Francisco + +-- + +*`tls.server.x509.subject.organization`*:: ++ +-- +List of organizations (O) of subject. + +type: keyword + +example: Example, Inc. + +-- + +*`tls.server.x509.subject.organizational_unit`*:: ++ +-- +List of organizational units (OU) of subject. + +type: keyword + +-- + +*`tls.server.x509.subject.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`tls.server.x509.version_number`*:: ++ +-- +Version of x509 format. + +type: keyword + +example: 3 -- @@ -15138,6 +16677,18 @@ example: tls Distributed tracing makes it possible to analyze performance throughout a microservice architecture all in one view. This is accomplished by tracing all of the requests - from the initial web request in the front-end service - to queries made through multiple back-end services. +*`tracing.span.id`*:: ++ +-- +Unique identifier of the span within the scope of its trace. +A span represents an operation within a transaction, such as a request to another service, or a database query. + +type: keyword + +example: 3ff9a8981b7ccd5a + +-- + *`tracing.trace.id`*:: + -- @@ -15153,7 +16704,7 @@ example: 4bf92f3577b34da6a3ce929d0e0e4736 *`tracing.transaction.id`*:: + -- -Unique identifier of the transaction. +Unique identifier of the transaction within the scope of its trace. A transaction is the highest level of work measured within a service, such as a request to a server. type: keyword @@ -15286,12 +16837,12 @@ type: keyword + -- The highest registered url domain, stripped of the subdomain. -For example, the registered domain for "foo.google.com" is "google.com". +For example, the registered domain for "foo.example.com" is "example.com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last two labels will not work well for TLDs such as "co.uk". type: keyword -example: google.com +example: example.com -- @@ -15310,7 +16861,7 @@ example: https *`url.top_level_domain`*:: + -- -The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for google.com is "com". +The effective top level domain (eTLD), also known as the domain suffix, is the last part of the domain name. For example, the top level domain for example.com is "com". This value can be determined precisely with a list like the public suffix list (http://publicsuffix.org). Trying to approximate this by simply taking the last label will not work well for effective TLDs such as "co.uk". type: keyword @@ -15413,7 +16964,7 @@ type: keyword *`user.id`*:: + -- -Unique identifiers of the user. +Unique identifier of the user. type: keyword @@ -15437,6 +16988,17 @@ type: text -- +*`user.roles`*:: ++ +-- +Array of user roles at the time of the event. + +type: keyword + +example: ["kibana_admin", "reporting_user"] + +-- + [float] === user_agent @@ -15765,6 +17327,276 @@ example: Critical -- +[float] +=== x509 + +This implements the common core fields for x509 certificates. This information is likely logged with TLS sessions, digital signatures found in executable binaries, S/MIME information in email bodies, or analysis of files on disk. When only a single certificate is logged in an event, it should be nested under `file`. When hashes of the DER-encoded certificate are available, the `hash` data set should be populated as well (e.g. `file.hash.sha256`). For events that contain certificate information for both sides of the connection, the x509 object could be nested under the respective side of the connection information (e.g. `tls.server.x509`). + + +*`x509.alternative_names`*:: ++ +-- +List of subject alternative names (SAN). Name types vary by certificate authority and certificate type but commonly contain IP addresses, DNS names (and wildcards), and email addresses. + +type: keyword + +example: *.elastic.co + +-- + +*`x509.issuer.common_name`*:: ++ +-- +List of common name (CN) of issuing certificate authority. + +type: keyword + +example: Example SHA2 High Assurance Server CA + +-- + +*`x509.issuer.country`*:: ++ +-- +List of country (C) codes + +type: keyword + +example: US + +-- + +*`x509.issuer.distinguished_name`*:: ++ +-- +Distinguished name (DN) of issuing certificate authority. + +type: keyword + +example: C=US, O=Example Inc, OU=www.example.com, CN=Example SHA2 High Assurance Server CA + +-- + +*`x509.issuer.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: Mountain View + +-- + +*`x509.issuer.organization`*:: ++ +-- +List of organizations (O) of issuing certificate authority. + +type: keyword + +example: Example Inc + +-- + +*`x509.issuer.organizational_unit`*:: ++ +-- +List of organizational units (OU) of issuing certificate authority. + +type: keyword + +example: www.example.com + +-- + +*`x509.issuer.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`x509.not_after`*:: ++ +-- +Time at which the certificate is no longer considered valid. + +type: date + +example: 2020-07-16 03:15:39+00:00 + +-- + +*`x509.not_before`*:: ++ +-- +Time at which the certificate is first considered valid. + +type: date + +example: 2019-08-16 01:40:25+00:00 + +-- + +*`x509.public_key_algorithm`*:: ++ +-- +Algorithm used to generate the public key. + +type: keyword + +example: RSA + +-- + +*`x509.public_key_curve`*:: ++ +-- +The curve used by the elliptic curve public key algorithm. This is algorithm specific. + +type: keyword + +example: nistp521 + +-- + +*`x509.public_key_exponent`*:: ++ +-- +Exponent used to derive the public key. This is algorithm specific. + +type: long + +example: 65537 + +Field is not indexed. + +-- + +*`x509.public_key_size`*:: ++ +-- +The size of the public key space in bits. + +type: long + +example: 2048 + +-- + +*`x509.serial_number`*:: ++ +-- +Unique serial number issued by the certificate authority. For consistency, if this value is alphanumeric, it should be formatted without colons and uppercase characters. + +type: keyword + +example: 55FBB9C7DEBF09809D12CCAA + +-- + +*`x509.signature_algorithm`*:: ++ +-- +Identifier for certificate signature algorithm. We recommend using names found in Go Lang Crypto library. See https://github.com/golang/go/blob/go1.14/src/crypto/x509/x509.go#L337-L353. + +type: keyword + +example: SHA256-RSA + +-- + +*`x509.subject.common_name`*:: ++ +-- +List of common names (CN) of subject. + +type: keyword + +example: shared.global.example.net + +-- + +*`x509.subject.country`*:: ++ +-- +List of country (C) code + +type: keyword + +example: US + +-- + +*`x509.subject.distinguished_name`*:: ++ +-- +Distinguished name (DN) of the certificate subject entity. + +type: keyword + +example: C=US, ST=California, L=San Francisco, O=Example, Inc., CN=shared.global.example.net + +-- + +*`x509.subject.locality`*:: ++ +-- +List of locality names (L) + +type: keyword + +example: San Francisco + +-- + +*`x509.subject.organization`*:: ++ +-- +List of organizations (O) of subject. + +type: keyword + +example: Example, Inc. + +-- + +*`x509.subject.organizational_unit`*:: ++ +-- +List of organizational units (OU) of subject. + +type: keyword + +-- + +*`x509.subject.state_or_province`*:: ++ +-- +List of state or province names (ST, S, or P) + +type: keyword + +example: California + +-- + +*`x509.version_number`*:: ++ +-- +Version of x509 format. + +type: keyword + +example: 3 + +-- + [[exported-fields-elasticsearch]] == Elasticsearch fields @@ -17052,16 +18884,10 @@ type: boolean [float] === node.stats -node_stats +Statistics about each node in a Elasticsearch cluster -[float] -=== indices - -Node indices stats - - *`elasticsearch.node.stats.indices.docs.count`*:: + @@ -17293,18 +19119,6 @@ format: percent -- -[float] -=== jvm.mem.pools - -JVM memory pool stats - - - -[float] -=== old - -Old memory pool stats. - *`elasticsearch.node.stats.jvm.mem.pools.old.max.bytes`*:: @@ -17312,6 +19126,7 @@ Old memory pool stats. -- Max bytes. + type: long format: bytes @@ -17323,6 +19138,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -17334,6 +19150,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -17345,24 +19162,20 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== young - -Young memory pool stats. - - *`elasticsearch.node.stats.jvm.mem.pools.young.max.bytes`*:: + -- Max bytes. + type: long format: bytes @@ -17374,6 +19187,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -17385,6 +19199,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -17396,24 +19211,20 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== survivor - -Survivor memory pool stats. - - *`elasticsearch.node.stats.jvm.mem.pools.survivor.max.bytes`*:: + -- Max bytes. + type: long format: bytes @@ -17425,6 +19236,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -17436,6 +19248,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -17447,31 +19260,18 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== jvm.gc.collectors - -GC collector stats. - - - -[float] -=== old.collection - -Old collection gc. - *`elasticsearch.node.stats.jvm.gc.collectors.old.collection.count`*:: + -- - - type: long -- @@ -17479,24 +19279,14 @@ type: long *`elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms`*:: + -- - - type: long -- -[float] -=== young.collection - -Young collection gc. - - *`elasticsearch.node.stats.jvm.gc.collectors.young.collection.count`*:: + -- - - type: long -- @@ -17504,8 +19294,6 @@ type: long *`elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms`*:: + -- - - type: long -- @@ -18980,345 +20768,76 @@ type: integer -- -[[exported-fields-golang]] -== Golang fields - -Golang module - - - -[float] -=== golang - - - +[[exported-fields-gcp]] +== Google Cloud Platform fields -[float] -=== expvar +GCP module -expvar -*`golang.expvar.cmdline`*:: +*`gcp.labels`*:: + -- -The cmdline of this Go program start with. +GCP monitoring metrics labels -type: keyword +type: object -- -[float] -=== heap - -The Go program heap information exposed by expvar. - - - -*`golang.heap.cmdline`*:: +*`gcp.metrics.*.*.*.*`*:: + -- -The cmdline of this Go program start with. +Metrics that returned from Google Cloud API query. -type: keyword +type: object -- [float] -=== gc - -Garbage collector summary. - - - -[float] -=== total_pause - -Total GC pause duration over lifetime of process. +=== billing +Google Cloud Billing metrics -*`golang.heap.gc.total_pause.ns`*:: +*`gcp.billing.cost_type`*:: + -- -Duration in Ns. - +Cost types include regular, tax, adjustment, and rounding_error. -type: long +type: keyword -- -*`golang.heap.gc.total_count`*:: +*`gcp.billing.invoice_month`*:: + -- -Total number of GC was happened. - +Billing report month. -type: long +type: keyword -- -*`golang.heap.gc.next_gc_limit`*:: +*`gcp.billing.project_id`*:: + -- -Next collection will happen when HeapAlloc > this amount. +Project ID of the billing report belongs to. - -type: long - -format: bytes +type: keyword -- -*`golang.heap.gc.cpu_fraction`*:: +*`gcp.billing.total`*:: + -- -Fraction of CPU time used by GC. - +Total billing amount. type: float -- -[float] -=== pause - -Last GC pause durations during the monitoring period. - - - -*`golang.heap.gc.pause.count`*:: -+ --- -Count of GC pause duration during this collect period. - - -type: long - --- - -[float] -=== sum - -Total GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.sum.ns`*:: -+ --- -Duration in Ns. - - -type: long - --- - -[float] -=== max - -Max GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.max.ns`*:: -+ --- -Duration in Ns. - - -type: long - --- - -[float] -=== avg - -Average GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.avg.ns`*:: -+ --- -Duration in Ns. - - -type: long - --- - -[float] -=== system - -Heap summary,which bytes was obtained from system. - - - -*`golang.heap.system.total`*:: -+ --- -Total bytes obtained from system (sum of XxxSys below). - - -type: long - -format: bytes - --- - -*`golang.heap.system.obtained`*:: -+ --- -Via HeapSys, bytes obtained from system. heap_sys = heap_idle + heap_inuse. - - -type: long - -format: bytes - --- - -*`golang.heap.system.stack`*:: -+ --- -Bytes used by stack allocator, and these bytes was obtained from system. - - -type: long - -format: bytes - --- - -*`golang.heap.system.released`*:: -+ --- -Bytes released to the OS. - - -type: long - -format: bytes - --- - -[float] -=== allocations - -Heap allocations summary. - - - -*`golang.heap.allocations.mallocs`*:: -+ --- -Number of mallocs. - - -type: long - --- - -*`golang.heap.allocations.frees`*:: -+ --- -Number of frees. - - -type: long - --- - -*`golang.heap.allocations.objects`*:: -+ --- -Total number of allocated objects. - - -type: long - --- - -*`golang.heap.allocations.total`*:: -+ --- -Bytes allocated (even if freed) throughout the lifetime. - - -type: long - -format: bytes - --- - -*`golang.heap.allocations.allocated`*:: -+ --- -Bytes allocated and not yet freed (same as Alloc above). - - -type: long - -format: bytes - --- - -*`golang.heap.allocations.idle`*:: -+ --- -Bytes in idle spans. - - -type: long - -format: bytes - --- - -*`golang.heap.allocations.active`*:: -+ --- -Bytes in non-idle span. - - -type: long - -format: bytes - --- - -[[exported-fields-googlecloud]] -== Google Cloud Platform fields - -GCP module - - - - -*`googlecloud.labels`*:: -+ --- -Google cloud monitoring metrics labels - - -type: object - --- - -*`googlecloud.metrics.*.*.*.*`*:: -+ --- -Metrics that returned from Google Cloud API query. - - -type: object - --- - [float] === compute @@ -19327,7 +20846,7 @@ Google Cloud Compute metrics -*`googlecloud.compute.instance.firewall.dropped_bytes_count.value`*:: +*`gcp.compute.instance.firewall.dropped_bytes_count.value`*:: + -- Incoming bytes dropped by the firewall @@ -19336,7 +20855,7 @@ type: long -- -*`googlecloud.compute.instance.firewall.dropped_packets_count.value`*:: +*`gcp.compute.instance.firewall.dropped_packets_count.value`*:: + -- Incoming packets dropped by the firewall @@ -19346,7 +20865,7 @@ type: long -- -*`googlecloud.compute.instance.cpu.reserved_cores.value`*:: +*`gcp.compute.instance.cpu.reserved_cores.value`*:: + -- Number of cores reserved on the host of the instance @@ -19355,7 +20874,7 @@ type: double -- -*`googlecloud.compute.instance.cpu.utilization.value`*:: +*`gcp.compute.instance.cpu.utilization.value`*:: + -- The fraction of the allocated CPU that is currently in use on the instance @@ -19364,7 +20883,7 @@ type: double -- -*`googlecloud.compute.instance.cpu.usage_time.value`*:: +*`gcp.compute.instance.cpu.usage_time.value`*:: + -- Usage for all cores in seconds @@ -19374,7 +20893,7 @@ type: double -- -*`googlecloud.compute.instance.disk.read_bytes_count.value`*:: +*`gcp.compute.instance.disk.read_bytes_count.value`*:: + -- Count of bytes read from disk @@ -19383,7 +20902,7 @@ type: long -- -*`googlecloud.compute.instance.disk.read_ops_count.value`*:: +*`gcp.compute.instance.disk.read_ops_count.value`*:: + -- Count of disk read IO operations @@ -19392,7 +20911,7 @@ type: long -- -*`googlecloud.compute.instance.disk.write_bytes_count.value`*:: +*`gcp.compute.instance.disk.write_bytes_count.value`*:: + -- Count of bytes written to disk @@ -19401,7 +20920,7 @@ type: long -- -*`googlecloud.compute.instance.disk.write_ops_count.value`*:: +*`gcp.compute.instance.disk.write_ops_count.value`*:: + -- Count of disk write IO operations @@ -19410,7 +20929,7 @@ type: long -- -*`googlecloud.compute.instance.uptime.value`*:: +*`gcp.compute.instance.uptime.value`*:: + -- How long the VM has been running, in seconds @@ -19420,7 +20939,7 @@ type: long -- -*`googlecloud.compute.instance.network.received_bytes_count.value`*:: +*`gcp.compute.instance.network.received_bytes_count.value`*:: + -- Count of bytes received from the network @@ -19429,7 +20948,7 @@ type: long -- -*`googlecloud.compute.instance.network.received_packets_count.value`*:: +*`gcp.compute.instance.network.received_packets_count.value`*:: + -- Count of packets received from the network @@ -19438,7 +20957,7 @@ type: long -- -*`googlecloud.compute.instance.network.sent_bytes_count.value`*:: +*`gcp.compute.instance.network.sent_bytes_count.value`*:: + -- Count of bytes sent over the network @@ -19447,7 +20966,7 @@ type: long -- -*`googlecloud.compute.instance.network.sent_packets_count.value`*:: +*`gcp.compute.instance.network.sent_packets_count.value`*:: + -- Count of packets sent over the network @@ -19457,7 +20976,7 @@ type: long -- -*`googlecloud.compute.instance.memory.balloon.ram_size.value`*:: +*`gcp.compute.instance.memory.balloon.ram_size.value`*:: + -- The total amount of memory in the VM. This metric is only available for VMs that belong to the e2 family. @@ -19466,7 +20985,7 @@ type: long -- -*`googlecloud.compute.instance.memory.balloon.ram_used.value`*:: +*`gcp.compute.instance.memory.balloon.ram_used.value`*:: + -- Memory currently used in the VM. This metric is only available for VMs that belong to the e2 family. @@ -19475,7 +20994,7 @@ type: long -- -*`googlecloud.compute.instance.memory.balloon.swap_in_bytes_count.value`*:: +*`gcp.compute.instance.memory.balloon.swap_in_bytes_count.value`*:: + -- The amount of memory read into the guest from its own swap space. This metric is only available for VMs that belong to the e2 family. @@ -19484,7 +21003,7 @@ type: long -- -*`googlecloud.compute.instance.memory.balloon.swap_out_bytes_count.value`*:: +*`gcp.compute.instance.memory.balloon.swap_out_bytes_count.value`*:: + -- The amount of memory written from the guest to its own swap space. This metric is only available for VMs that belong to the e2 family. @@ -19505,7 +21024,7 @@ Google Cloud Load Balancing metrics Google Cloud Load Balancing metrics -*`googlecloud.loadbalancing.https.backend_request_bytes_count.value`*:: +*`gcp.loadbalancing.https.backend_request_bytes_count.value`*:: + -- The number of bytes sent as requests from HTTP/S load balancer to backends. @@ -19514,7 +21033,7 @@ type: long -- -*`googlecloud.loadbalancing.https.backend_request_count.value`*:: +*`gcp.loadbalancing.https.backend_request_count.value`*:: + -- The number of requests served by backends of HTTP/S load balancer. @@ -19523,7 +21042,7 @@ type: long -- -*`googlecloud.loadbalancing.https.request_bytes_count.value`*:: +*`gcp.loadbalancing.https.request_bytes_count.value`*:: + -- The number of bytes sent as requests from clients to HTTP/S load balancer. @@ -19532,7 +21051,7 @@ type: long -- -*`googlecloud.loadbalancing.https.request_count.value`*:: +*`gcp.loadbalancing.https.request_count.value`*:: + -- The number of requests served by HTTP/S load balancer. @@ -19541,7 +21060,7 @@ type: long -- -*`googlecloud.loadbalancing.https.response_bytes_count.value`*:: +*`gcp.loadbalancing.https.response_bytes_count.value`*:: + -- The number of bytes sent as responses from HTTP/S load balancer to clients. @@ -19556,7 +21075,7 @@ type: long Google Cloud Load Balancing metrics -*`googlecloud.loadbalancing.l3.internal.egress_bytes_count.value`*:: +*`gcp.loadbalancing.l3.internal.egress_bytes_count.value`*:: + -- The number of bytes sent from ILB backend to client (for TCP flows it's counting bytes on application stream only). @@ -19565,7 +21084,7 @@ type: long -- -*`googlecloud.loadbalancing.l3.internal.egress_packets_count.value`*:: +*`gcp.loadbalancing.l3.internal.egress_packets_count.value`*:: + -- The number of packets sent from ILB backend to client of the flow. @@ -19574,7 +21093,7 @@ type: long -- -*`googlecloud.loadbalancing.l3.internal.ingress_bytes_count.value`*:: +*`gcp.loadbalancing.l3.internal.ingress_bytes_count.value`*:: + -- The number of bytes sent from client to ILB backend (for TCP flows it's counting bytes on application stream only). @@ -19583,7 +21102,7 @@ type: long -- -*`googlecloud.loadbalancing.l3.internal.ingress_packets_count.value`*:: +*`gcp.loadbalancing.l3.internal.ingress_packets_count.value`*:: + -- The number of packets sent from client to ILB backend. @@ -19598,7 +21117,7 @@ type: long Google Cloud Load Balancing metrics -*`googlecloud.loadbalancing.tcp_ssl_proxy.closed_connections.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.closed_connections.value`*:: + -- Number of connections that were terminated over TCP/SSL proxy. @@ -19607,7 +21126,7 @@ type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value`*:: + -- Number of bytes sent from VM to client using proxy. @@ -19616,7 +21135,7 @@ type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value`*:: + -- Number of bytes sent from client to VM using proxy. @@ -19625,7 +21144,7 @@ type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.new_connections.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.new_connections.value`*:: + -- Number of connections that were created over TCP/SSL proxy. @@ -19634,7 +21153,7 @@ type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.open_connections.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.open_connections.value`*:: + -- Current number of outstanding connections through the TCP/SSL proxy. @@ -19655,7 +21174,7 @@ Google Cloud PubSub metrics Suscription related metrics -*`googlecloud.pubsub.subscription.ack_message_count.value`*:: +*`gcp.pubsub.subscription.ack_message_count.value`*:: + -- Cumulative count of messages acknowledged by Acknowledge requests, grouped by delivery type. @@ -19664,7 +21183,7 @@ type: long -- -*`googlecloud.pubsub.subscription.backlog_bytes.value`*:: +*`gcp.pubsub.subscription.backlog_bytes.value`*:: + -- Total byte size of the unacknowledged messages (a.k.a. backlog messages) in a subscription. @@ -19673,7 +21192,7 @@ type: long -- -*`googlecloud.pubsub.subscription.num_outstanding_messages.value`*:: +*`gcp.pubsub.subscription.num_outstanding_messages.value`*:: + -- Number of messages delivered to a subscription's push endpoint, but not yet acknowledged. @@ -19682,7 +21201,7 @@ type: long -- -*`googlecloud.pubsub.subscription.num_undelivered_messages.value`*:: +*`gcp.pubsub.subscription.num_undelivered_messages.value`*:: + -- Number of unacknowledged messages (a.k.a. backlog messages) in a subscription. @@ -19691,7 +21210,7 @@ type: long -- -*`googlecloud.pubsub.subscription.oldest_unacked_message_age.value`*:: +*`gcp.pubsub.subscription.oldest_unacked_message_age.value`*:: + -- Age (in seconds) of the oldest unacknowledged message (a.k.a. backlog message) in a subscription. @@ -19700,7 +21219,7 @@ type: long -- -*`googlecloud.pubsub.subscription.pull_ack_message_operation_count.value`*:: +*`gcp.pubsub.subscription.pull_ack_message_operation_count.value`*:: + -- Cumulative count of acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. @@ -19709,7 +21228,7 @@ type: long -- -*`googlecloud.pubsub.subscription.pull_ack_request_count.value`*:: +*`gcp.pubsub.subscription.pull_ack_request_count.value`*:: + -- Cumulative count of acknowledge requests, grouped by result. @@ -19718,7 +21237,7 @@ type: long -- -*`googlecloud.pubsub.subscription.pull_message_operation_count.value`*:: +*`gcp.pubsub.subscription.pull_message_operation_count.value`*:: + -- Cumulative count of pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. @@ -19727,7 +21246,7 @@ type: long -- -*`googlecloud.pubsub.subscription.pull_request_count.value`*:: +*`gcp.pubsub.subscription.pull_request_count.value`*:: + -- Cumulative count of pull requests, grouped by result. @@ -19736,7 +21255,7 @@ type: long -- -*`googlecloud.pubsub.subscription.push_request_count.value`*:: +*`gcp.pubsub.subscription.push_request_count.value`*:: + -- Cumulative count of push attempts, grouped by result. Unlike pulls, the push server implementation does not batch user messages. So each request only contains one user message. The push server retries on errors, so a given user message can appear multiple times. @@ -19745,7 +21264,7 @@ type: long -- -*`googlecloud.pubsub.subscription.push_request_latencies.value`*:: +*`gcp.pubsub.subscription.push_request_latencies.value`*:: + -- Distribution of push request latencies (in microseconds), grouped by result. @@ -19754,7 +21273,7 @@ type: long -- -*`googlecloud.pubsub.subscription.sent_message_count.value`*:: +*`gcp.pubsub.subscription.sent_message_count.value`*:: + -- Cumulative count of messages sent by Cloud Pub/Sub to subscriber clients, grouped by delivery type. @@ -19763,7 +21282,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_ack_message_operation_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_ack_message_operation_count.value`*:: + -- Cumulative count of StreamingPull acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. @@ -19772,7 +21291,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_ack_request_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_ack_request_count.value`*:: + -- Cumulative count of streaming pull requests with non-empty acknowledge ids, grouped by result. @@ -19781,7 +21300,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_message_operation_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_message_operation_count.value`*:: + -- Cumulative count of streaming pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count @@ -19790,7 +21309,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_response_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_response_count.value`*:: + -- Cumulative count of streaming pull responses, grouped by result. @@ -19799,7 +21318,7 @@ type: long -- -*`googlecloud.pubsub.subscription.dead_letter_message_count.value`*:: +*`gcp.pubsub.subscription.dead_letter_message_count.value`*:: + -- Cumulative count of messages published to dead letter topic, grouped by result. @@ -19808,7 +21327,7 @@ type: long -- -*`googlecloud.pubsub.subscription.mod_ack_deadline_message_count.value`*:: +*`gcp.pubsub.subscription.mod_ack_deadline_message_count.value`*:: + -- Cumulative count of messages whose deadline was updated by ModifyAckDeadline requests, grouped by delivery type. @@ -19817,7 +21336,7 @@ type: long -- -*`googlecloud.pubsub.subscription.mod_ack_deadline_message_operation_count.value`*:: +*`gcp.pubsub.subscription.mod_ack_deadline_message_operation_count.value`*:: + -- Cumulative count of ModifyAckDeadline message operations, grouped by result. @@ -19826,7 +21345,7 @@ type: long -- -*`googlecloud.pubsub.subscription.mod_ack_deadline_request_count.value`*:: +*`gcp.pubsub.subscription.mod_ack_deadline_request_count.value`*:: + -- Cumulative count of ModifyAckDeadline requests, grouped by result. @@ -19835,7 +21354,7 @@ type: long -- -*`googlecloud.pubsub.subscription.oldest_retained_acked_message_age.value`*:: +*`gcp.pubsub.subscription.oldest_retained_acked_message_age.value`*:: + -- Age (in seconds) of the oldest acknowledged message retained in a subscription. @@ -19844,7 +21363,7 @@ type: long -- -*`googlecloud.pubsub.subscription.oldest_retained_acked_message_age_by_region.value`*:: +*`gcp.pubsub.subscription.oldest_retained_acked_message_age_by_region.value`*:: + -- Age (in seconds) of the oldest acknowledged message retained in a subscription, broken down by Cloud region. @@ -19853,7 +21372,7 @@ type: long -- -*`googlecloud.pubsub.subscription.oldest_unacked_message_age_by_region.value`*:: +*`gcp.pubsub.subscription.oldest_unacked_message_age_by_region.value`*:: + -- Age (in seconds) of the oldest unacknowledged message in a subscription, broken down by Cloud region. @@ -19862,7 +21381,7 @@ type: long -- -*`googlecloud.pubsub.subscription.retained_acked_bytes.value`*:: +*`gcp.pubsub.subscription.retained_acked_bytes.value`*:: + -- Total byte size of the acknowledged messages retained in a subscription. @@ -19871,7 +21390,7 @@ type: long -- -*`googlecloud.pubsub.subscription.retained_acked_bytes_by_region.value`*:: +*`gcp.pubsub.subscription.retained_acked_bytes_by_region.value`*:: + -- Total byte size of the acknowledged messages retained in a subscription, broken down by Cloud region. @@ -19880,7 +21399,7 @@ type: long -- -*`googlecloud.pubsub.subscription.seek_request_count.value`*:: +*`gcp.pubsub.subscription.seek_request_count.value`*:: + -- Cumulative count of seek attempts, grouped by result. @@ -19889,7 +21408,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_mod_ack_deadline_message_operation_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_mod_ack_deadline_message_operation_count.value`*:: + -- Cumulative count of StreamingPull ModifyAckDeadline operations, grouped by result. @@ -19898,7 +21417,7 @@ type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_mod_ack_deadline_request_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_mod_ack_deadline_request_count.value`*:: + -- Cumulative count of streaming pull requests with non-empty ModifyAckDeadline fields, grouped by result. @@ -19907,7 +21426,7 @@ type: long -- -*`googlecloud.pubsub.subscription.byte_cost.value`*:: +*`gcp.pubsub.subscription.byte_cost.value`*:: + -- Cumulative cost of operations, measured in bytes. This is used to measure quota utilization. @@ -19916,7 +21435,7 @@ type: long -- -*`googlecloud.pubsub.subscription.config_updates_count.value`*:: +*`gcp.pubsub.subscription.config_updates_count.value`*:: + -- Cumulative count of configuration changes for each subscription, grouped by operation type and result. @@ -19925,7 +21444,7 @@ type: long -- -*`googlecloud.pubsub.subscription.unacked_bytes_by_region.value`*:: +*`gcp.pubsub.subscription.unacked_bytes_by_region.value`*:: + -- Total byte size of the unacknowledged messages in a subscription, broken down by Cloud region. @@ -19940,7 +21459,7 @@ type: long Topic related metrics -*`googlecloud.pubsub.topic.streaming_pull_response_count.value`*:: +*`gcp.pubsub.topic.streaming_pull_response_count.value`*:: + -- Cumulative count of streaming pull responses, grouped by result. @@ -19949,7 +21468,7 @@ type: long -- -*`googlecloud.pubsub.topic.send_message_operation_count.value`*:: +*`gcp.pubsub.topic.send_message_operation_count.value`*:: + -- Cumulative count of publish message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. @@ -19958,7 +21477,7 @@ type: long -- -*`googlecloud.pubsub.topic.send_request_count.value`*:: +*`gcp.pubsub.topic.send_request_count.value`*:: + -- Cumulative count of publish requests, grouped by result. @@ -19967,7 +21486,7 @@ type: long -- -*`googlecloud.pubsub.topic.oldest_retained_acked_message_age_by_region.value`*:: +*`gcp.pubsub.topic.oldest_retained_acked_message_age_by_region.value`*:: + -- Age (in seconds) of the oldest acknowledged message retained in a topic, broken down by Cloud region. @@ -19976,7 +21495,7 @@ type: long -- -*`googlecloud.pubsub.topic.oldest_unacked_message_age_by_region.value`*:: +*`gcp.pubsub.topic.oldest_unacked_message_age_by_region.value`*:: + -- Age (in seconds) of the oldest unacknowledged message in a topic, broken down by Cloud region. @@ -19985,7 +21504,7 @@ type: long -- -*`googlecloud.pubsub.topic.retained_acked_bytes_by_region.value`*:: +*`gcp.pubsub.topic.retained_acked_bytes_by_region.value`*:: + -- Total byte size of the acknowledged messages retained in a topic, broken down by Cloud region. @@ -19994,7 +21513,7 @@ type: long -- -*`googlecloud.pubsub.topic.byte_cost.value`*:: +*`gcp.pubsub.topic.byte_cost.value`*:: + -- Cost of operations, measured in bytes. This is used to measure utilization for quotas. @@ -20003,7 +21522,7 @@ type: long -- -*`googlecloud.pubsub.topic.config_updates_count.value`*:: +*`gcp.pubsub.topic.config_updates_count.value`*:: + -- Cumulative count of configuration changes, grouped by operation type and result. @@ -20012,7 +21531,7 @@ type: long -- -*`googlecloud.pubsub.topic.message_sizes.value`*:: +*`gcp.pubsub.topic.message_sizes.value`*:: + -- Distribution of publish message sizes (in bytes) @@ -20021,7 +21540,7 @@ type: long -- -*`googlecloud.pubsub.topic.unacked_bytes_by_region.value`*:: +*`gcp.pubsub.topic.unacked_bytes_by_region.value`*:: + -- Total byte size of the unacknowledged messages in a topic, broken down by Cloud region. @@ -20036,7 +21555,7 @@ type: long Snapshot related metrics -*`googlecloud.pubsub.snapshot.oldest_message_age.value`*:: +*`gcp.pubsub.snapshot.oldest_message_age.value`*:: + -- Age (in seconds) of the oldest message retained in a snapshot. @@ -20045,7 +21564,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.oldest_message_age_by_region.value`*:: +*`gcp.pubsub.snapshot.oldest_message_age_by_region.value`*:: + -- Age (in seconds) of the oldest message retained in a snapshot, broken down by Cloud region. @@ -20054,7 +21573,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.backlog_bytes.value`*:: +*`gcp.pubsub.snapshot.backlog_bytes.value`*:: + -- Total byte size of the messages retained in a snapshot. @@ -20063,7 +21582,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.backlog_bytes_by_region.value`*:: +*`gcp.pubsub.snapshot.backlog_bytes_by_region.value`*:: + -- Total byte size of the messages retained in a snapshot, broken down by Cloud region. @@ -20072,7 +21591,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.num_messages.value`*:: +*`gcp.pubsub.snapshot.num_messages.value`*:: + -- Number of messages retained in a snapshot. @@ -20081,7 +21600,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.num_messages_by_region.value`*:: +*`gcp.pubsub.snapshot.num_messages_by_region.value`*:: + -- Number of messages retained in a snapshot, broken down by Cloud region. @@ -20090,7 +21609,7 @@ type: long -- -*`googlecloud.pubsub.snapshot.config_updates_count.value`*:: +*`gcp.pubsub.snapshot.config_updates_count.value`*:: + -- Cumulative count of configuration changes, grouped by operation type and result. @@ -20106,7 +21625,7 @@ Google Cloud Storage metrics -*`googlecloud.storage.api.request_count.value`*:: +*`gcp.storage.api.request_count.value`*:: + -- Delta count of API calls, grouped by the API method name and response code. @@ -20116,7 +21635,7 @@ type: long -- -*`googlecloud.storage.authz.acl_based_object_access_count.value`*:: +*`gcp.storage.authz.acl_based_object_access_count.value`*:: + -- Delta count of requests that result in an object being granted access solely due to object ACLs. @@ -20125,7 +21644,7 @@ type: long -- -*`googlecloud.storage.authz.acl_operations_count.value`*:: +*`gcp.storage.authz.acl_operations_count.value`*:: + -- Usage of ACL operations broken down by type. @@ -20134,7 +21653,7 @@ type: long -- -*`googlecloud.storage.authz.object_specific_acl_mutation_count.value`*:: +*`gcp.storage.authz.object_specific_acl_mutation_count.value`*:: + -- Delta count of changes made to object specific ACLs. @@ -20144,7 +21663,7 @@ type: long -- -*`googlecloud.storage.network.received_bytes_count.value`*:: +*`gcp.storage.network.received_bytes_count.value`*:: + -- Delta count of bytes received over the network, grouped by the API method name and response code. @@ -20153,7 +21672,7 @@ type: long -- -*`googlecloud.storage.network.sent_bytes_count.value`*:: +*`gcp.storage.network.sent_bytes_count.value`*:: + -- Delta count of bytes sent over the network, grouped by the API method name and response code. @@ -20163,7 +21682,7 @@ type: long -- -*`googlecloud.storage.storage.object_count.value`*:: +*`gcp.storage.storage.object_count.value`*:: + -- Total number of objects per bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. @@ -20172,7 +21691,7 @@ type: long -- -*`googlecloud.storage.storage.total_byte_seconds.value`*:: +*`gcp.storage.storage.total_byte_seconds.value`*:: + -- Delta count of bytes received over the network, grouped by the API method name and response code. @@ -20181,7 +21700,7 @@ type: long -- -*`googlecloud.storage.storage.total_bytes.value`*:: +*`gcp.storage.storage.total_bytes.value`*:: + -- Total size of all objects in the bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. @@ -20190,6 +21709,317 @@ type: long -- +[[exported-fields-golang]] +== Golang fields + +Golang module + + + +[float] +=== golang + + + + +[float] +=== expvar + +expvar + + + +*`golang.expvar.cmdline`*:: ++ +-- +The cmdline of this Go program start with. + + +type: keyword + +-- + +[float] +=== heap + +The Go program heap information exposed by expvar. + + + +*`golang.heap.cmdline`*:: ++ +-- +The cmdline of this Go program start with. + + +type: keyword + +-- + +[float] +=== gc + +Garbage collector summary. + + + +[float] +=== total_pause + +Total GC pause duration over lifetime of process. + + + +*`golang.heap.gc.total_pause.ns`*:: ++ +-- +Duration in Ns. + + +type: long + +-- + +*`golang.heap.gc.total_count`*:: ++ +-- +Total number of GC was happened. + + +type: long + +-- + +*`golang.heap.gc.next_gc_limit`*:: ++ +-- +Next collection will happen when HeapAlloc > this amount. + + +type: long + +format: bytes + +-- + +*`golang.heap.gc.cpu_fraction`*:: ++ +-- +Fraction of CPU time used by GC. + + +type: float + +-- + +[float] +=== pause + +Last GC pause durations during the monitoring period. + + + +*`golang.heap.gc.pause.count`*:: ++ +-- +Count of GC pause duration during this collect period. + + +type: long + +-- + +[float] +=== sum + +Total GC pause duration during this collect period. + + + +*`golang.heap.gc.pause.sum.ns`*:: ++ +-- +Duration in Ns. + + +type: long + +-- + +[float] +=== max + +Max GC pause duration during this collect period. + + + +*`golang.heap.gc.pause.max.ns`*:: ++ +-- +Duration in Ns. + + +type: long + +-- + +[float] +=== avg + +Average GC pause duration during this collect period. + + + +*`golang.heap.gc.pause.avg.ns`*:: ++ +-- +Duration in Ns. + + +type: long + +-- + +[float] +=== system + +Heap summary,which bytes was obtained from system. + + + +*`golang.heap.system.total`*:: ++ +-- +Total bytes obtained from system (sum of XxxSys below). + + +type: long + +format: bytes + +-- + +*`golang.heap.system.obtained`*:: ++ +-- +Via HeapSys, bytes obtained from system. heap_sys = heap_idle + heap_inuse. + + +type: long + +format: bytes + +-- + +*`golang.heap.system.stack`*:: ++ +-- +Bytes used by stack allocator, and these bytes was obtained from system. + + +type: long + +format: bytes + +-- + +*`golang.heap.system.released`*:: ++ +-- +Bytes released to the OS. + + +type: long + +format: bytes + +-- + +[float] +=== allocations + +Heap allocations summary. + + + +*`golang.heap.allocations.mallocs`*:: ++ +-- +Number of mallocs. + + +type: long + +-- + +*`golang.heap.allocations.frees`*:: ++ +-- +Number of frees. + + +type: long + +-- + +*`golang.heap.allocations.objects`*:: ++ +-- +Total number of allocated objects. + + +type: long + +-- + +*`golang.heap.allocations.total`*:: ++ +-- +Bytes allocated (even if freed) throughout the lifetime. + + +type: long + +format: bytes + +-- + +*`golang.heap.allocations.allocated`*:: ++ +-- +Bytes allocated and not yet freed (same as Alloc above). + + +type: long + +format: bytes + +-- + +*`golang.heap.allocations.idle`*:: ++ +-- +Bytes in idle spans. + + +type: long + +format: bytes + +-- + +*`golang.heap.allocations.active`*:: ++ +-- +Bytes in non-idle span. + + +type: long + +format: bytes + +-- + [[exported-fields-graphite]] == Graphite fields @@ -23963,16 +25793,6 @@ type: long -- -*`kafka.partition.partition.isr`*:: -+ --- -List of isr ids. - - -type: keyword - --- - *`kafka.partition.partition.replica`*:: + -- @@ -27223,6 +29043,67 @@ type: double -- Deadline seconds after schedule for considering failed +type: long + +-- + +[float] +=== daemonset + +Kubernetes DaemonSet metrics + + + +*`kubernetes.daemonset.name`*:: ++ +-- +type: keyword + +-- + +[float] +=== replicas + +Kubernetes DaemonSet replica metrics + + + +*`kubernetes.daemonset.replicas.available`*:: ++ +-- +The number of available replicas per DaemonSet + + +type: long + +-- + +*`kubernetes.daemonset.replicas.desired`*:: ++ +-- +The desired number of replicas per DaemonSet + + +type: long + +-- + +*`kubernetes.daemonset.replicas.ready`*:: ++ +-- +The number of ready replicas per DaemonSet + + +type: long + +-- + +*`kubernetes.daemonset.replicas.unavailable`*:: ++ +-- +The number of unavailable replicas per DaemonSet + + type: long -- @@ -27691,7 +29572,7 @@ type: keyword -- Internal IP for the service. -type: ip +type: keyword -- @@ -28199,6 +30080,7 @@ linux module [float] === linux +linux system metrics @@ -28296,6 +30178,147 @@ type: long -- +[float] +=== iostat + +iostat + + + +*`linux.iostat.read.request.merges_per_sec`*:: ++ +-- +The number of read requests merged per second that were queued to the device. + + +type: float + +-- + +*`linux.iostat.write.request.merges_per_sec`*:: ++ +-- +The number of write requests merged per second that were queued to the device. + + +type: float + +-- + +*`linux.iostat.read.request.per_sec`*:: ++ +-- +The number of read requests that were issued to the device per second + + +type: float + +-- + +*`linux.iostat.write.request.per_sec`*:: ++ +-- +The number of write requests that were issued to the device per second + + +type: float + +-- + +*`linux.iostat.read.per_sec.bytes`*:: ++ +-- +The number of Bytes read from the device per second. + + +type: float + +format: bytes + +-- + +*`linux.iostat.read.await`*:: ++ +-- +The average time spent for read requests issued to the device to be served. + + +type: float + +-- + +*`linux.iostat.write.per_sec.bytes`*:: ++ +-- +The number of Bytes write from the device per second. + + +type: float + +format: bytes + +-- + +*`linux.iostat.write.await`*:: ++ +-- +The average time spent for write requests issued to the device to be served. + + +type: float + +-- + +*`linux.iostat.request.avg_size`*:: ++ +-- +The average size (in bytes) of the requests that were issued to the device. + + +type: float + +-- + +*`linux.iostat.queue.avg_size`*:: ++ +-- +The average queue length of the requests that were issued to the device. + + +type: float + +-- + +*`linux.iostat.await`*:: ++ +-- +The average time spent for requests issued to the device to be served. + + +type: float + +-- + +*`linux.iostat.service_time`*:: ++ +-- +The average service time (in milliseconds) for I/O requests that were issued to the device. + + +type: float + +-- + +*`linux.iostat.busy`*:: ++ +-- +Percentage of CPU time during which I/O requests were issued to the device (bandwidth utilization for the device). Device saturation occurs when this value is close to 100%. + + +type: float + +-- + [float] === ksm @@ -28370,6 +30393,186 @@ type: long -- +[float] +=== memory + +Linux memory data + + + +[float] +=== page_stats + +memory page statistics + + +*`linux.memory.page_stats.pgscan_kswapd.pages`*:: ++ +-- +pages scanned by kswapd + +type: long + +format: number + +-- + +*`linux.memory.page_stats.pgscan_direct.pages`*:: ++ +-- +pages scanned directly + +type: long + +format: number + +-- + +*`linux.memory.page_stats.pgfree.pages`*:: ++ +-- +pages freed by the system + +type: long + +format: number + +-- + +*`linux.memory.page_stats.pgsteal_kswapd.pages`*:: ++ +-- +number of pages reclaimed by kswapd + +type: long + +format: number + +-- + +*`linux.memory.page_stats.pgsteal_direct.pages`*:: ++ +-- +number of pages reclaimed directly + +type: long + +format: number + +-- + +*`linux.memory.page_stats.direct_efficiency.pct`*:: ++ +-- +direct reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. + +type: scaled_float + +format: percent + +-- + +*`linux.memory.page_stats.kswapd_efficiency.pct`*:: ++ +-- +kswapd reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. + +type: scaled_float + +format: percent + +-- + +[float] +=== hugepages + +This group contains statistics related to huge pages usage on the system. + + +*`linux.memory.hugepages.total`*:: ++ +-- +Number of huge pages in the pool. + + +type: long + +format: number + +-- + +*`linux.memory.hugepages.used.bytes`*:: ++ +-- +Memory used in allocated huge pages. + + +type: long + +format: bytes + +-- + +*`linux.memory.hugepages.used.pct`*:: ++ +-- +Percentage of huge pages used. + + +type: long + +format: percent + +-- + +*`linux.memory.hugepages.free`*:: ++ +-- +Number of available huge pages in the pool. + + +type: long + +format: number + +-- + +*`linux.memory.hugepages.reserved`*:: ++ +-- +Number of reserved but not allocated huge pages in the pool. + + +type: long + +format: number + +-- + +*`linux.memory.hugepages.surplus`*:: ++ +-- +Number of overcommited huge pages. + + +type: long + +format: number + +-- + +*`linux.memory.hugepages.default_size`*:: ++ +-- +Default size for huge pages. + + +type: long + +format: bytes + +-- + [float] === pageinfo @@ -35352,7 +37555,7 @@ type: keyword *`php_fpm.process.last_request_cpu`*:: + -- -The max amount of memory the last request consumed (it is always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated) +The CPU percentage the last request consumed. It's always 0 if the process is not in Idle state because CPU calculation is done when the request processing has terminated type: long @@ -35362,7 +37565,7 @@ type: long *`php_fpm.process.last_request_memory`*:: + -- -The content length of the request (only with POST) (of the current request) +The max amount of memory the last request consumed. It's always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated type: integer @@ -39741,7 +41944,7 @@ type: long *`system.fsstat.total_files`*:: + -- -Total number of files. +Total number of files. Not on Windows. type: long @@ -40603,7 +42806,7 @@ format: bytes *`system.process.memory.rss.bytes`*:: + -- -The Resident Set Size. The amount of memory the process occupied in main memory (RAM). On Windows this represents the current working set size, in bytes. +The Resident Set Size. The amount of memory the process occupied in main memory (RAM). On Windows this represents the current working set size, in bytes. Not available on Windows. type: long @@ -40615,7 +42818,31 @@ format: bytes *`system.process.memory.rss.pct`*:: + -- -The percentage of memory the process occupied in main memory (RAM). +The percentage of memory the process occupied in main memory (RAM). Not available on Windows. + + +type: scaled_float + +format: percent + +-- + +*`system.process.memory.wss.bytes`*:: ++ +-- +The Working Set Size. The amount of memory the process occupied in main memory (RAM). Windows only. + + +type: long + +format: bytes + +-- + +*`system.process.memory.wss.pct`*:: ++ +-- +The percentage of memory the process occupied in main memory (RAM). Windows only. type: scaled_float @@ -40627,7 +42854,7 @@ format: percent *`system.process.memory.share`*:: + -- -The shared memory the process uses. +The shared memory the process uses. Not available on Windows. type: long diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index b289382e5a7..39e239c8e8f 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 58e2a7dd6786fe585c62ae46e368e00e9571eb67 Mon Sep 17 00:00:00 2001 From: Mario Castro Date: Tue, 10 Nov 2020 12:02:35 +0100 Subject: [PATCH 02/16] Make elasticsearch/index_summary metricset work for Stack Monitoring without xpack.enabled flag (#20615) --- metricbeat/docs/fields.asciidoc | 260 ++++++++++++++++++ .../module/elasticsearch/_meta/fields.yml | 36 +++ .../module/elasticsearch/elasticsearch.go | 10 - .../elasticsearch_integration_test.go | 2 +- metricbeat/module/elasticsearch/fields.go | 2 +- .../index_summary/_meta/data-xpack.json | 60 ---- .../index_summary/_meta/data.json | 154 ++++++++--- .../index_summary/_meta/fields.yml | 96 +++++++ .../elasticsearch/index_summary/data.go | 111 +++++--- .../elasticsearch/index_summary/data_xpack.go | 100 ------- .../index_summary/index_summary.go | 15 +- 11 files changed, 588 insertions(+), 258 deletions(-) delete mode 100644 metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json delete mode 100644 metricbeat/module/elasticsearch/index_summary/data_xpack.go diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c2d105e8a9a..3b3dd32dc39 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -18134,6 +18134,58 @@ alias to: elasticsearch.node.stats.thread_pool.write.rejected.count -- + + + + +*`indices_stats._all.primaries.indexing.index_total`*:: ++ +-- +type: alias + +alias to: elasticsearch.index.summary.primaries.indexing.index.count + +-- + +*`indices_stats._all.primaries.indexing.index_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.index.summary.primaries.indexing.index.time.ms + +-- + + + +*`indices_stats._all.total.search.query_total`*:: ++ +-- +type: alias + +alias to: elasticsearch.index.summary.total.search.query.count + +-- + +*`indices_stats._all.total.search.query_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.index.summary.total.search.query.time.ms + +-- + + +*`indices_stats._all.total.indexing.index_total`*:: ++ +-- +type: alias + +alias to: elasticsearch.index.summary.total.indexing.index.count + +-- + [float] === elasticsearch @@ -18688,6 +18740,110 @@ format: bytes -- +*`elasticsearch.index.summary.primaries.indexing.index.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.indexing.index.time.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.indexing.is_throttled`*:: ++ +-- +TODO + +type: boolean + +-- + +*`elasticsearch.index.summary.primaries.indexing.throttle_time.ms`*:: ++ +-- +TODO + +type: long + +-- + + + +*`elasticsearch.index.summary.primaries.search.query.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.search.query.time.ms`*:: ++ +-- +TODO + +type: long + +-- + + +*`elasticsearch.index.summary.primaries.bulk.operations.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.bulk.size.bytes`*:: ++ +-- +TODO + +type: long + +-- + + +*`elasticsearch.index.summary.primaries.bulk.time.count.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.bulk.time.avg.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.primaries.bulk.time.avg.bytes`*:: ++ +-- +TODO + +type: long + +-- + + *`elasticsearch.index.summary.total.docs.count`*:: + -- @@ -18742,6 +18898,110 @@ format: bytes -- + +*`elasticsearch.index.summary.total.indexing.index.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.indexing.index.time.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.indexing.is_throttled`*:: ++ +-- +TODO + +type: boolean + +-- + +*`elasticsearch.index.summary.total.indexing.throttle_time.ms`*:: ++ +-- +TODO + +type: long + +-- + + + +*`elasticsearch.index.summary.total.search.query.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.search.query.time.ms`*:: ++ +-- +TODO + +type: long + +-- + + +*`elasticsearch.index.summary.total.bulk.operations.count`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.bulk.size.bytes`*:: ++ +-- +TODO + +type: long + +-- + + +*`elasticsearch.index.summary.total.bulk.time.count.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.bulk.time.avg.ms`*:: ++ +-- +TODO + +type: long + +-- + +*`elasticsearch.index.summary.total.bulk.time.avg.bytes`*:: ++ +-- +TODO + +type: long + +-- + [float] === ml.job diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 1ae2a10ed7a..07b33ad5773 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -276,6 +276,42 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.write.rejected.count type: alias + - name: indices_stats + type: group + fields: + - name: _all + type: group + fields: + - name: primaries + type: group + fields: + - name: indexing + type: group + fields: + - name: index_total + type: alias + path: elasticsearch.index.summary.primaries.indexing.index.count + - name: index_time_in_millis + type: alias + path: elasticsearch.index.summary.primaries.indexing.index.time.ms + - name: total + type: group + fields: + - name: search + type: group + fields: + - name: query_total + type: alias + path: elasticsearch.index.summary.total.search.query.count + - name: query_time_in_millis + type: alias + path: elasticsearch.index.summary.total.search.query.time.ms + - name: indexing + type: group + fields: + - name: index_total + type: alias + path: elasticsearch.index.summary.total.indexing.index.count - name: elasticsearch type: group description: > diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index c97cfa65b23..23b24eafa99 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -29,8 +29,6 @@ import ( "github.com/pkg/errors" "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/beats/v7/metricbeat/helper" "github.com/elastic/beats/v7/metricbeat/helper/elastic" @@ -119,14 +117,6 @@ type licenseWrapper struct { License License `json:"license"` } -var BulkStatsDict = c.Dict("bulk", s.Schema{ - "total_operations": c.Int("total_operations"), - "total_time_in_millis": c.Int("total_time_in_millis"), - "total_size_in_bytes": c.Int("total_size_in_bytes"), - "avg_time_in_millis": c.Int("avg_time_in_millis"), - "avg_size_in_bytes": c.Int("avg_size_in_bytes"), -}, c.DictOptional) - // GetClusterID fetches cluster id for given nodeID. func GetClusterID(http *helper.HTTP, uri string, nodeID string) (string, error) { // Check if cluster id already cached. If yes, return it. diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index 2838b141d34..4ee5c953150 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -131,7 +131,7 @@ func TestXPackEnabled(t *testing.T) { "cluster_stats": []string{"cluster_stats"}, "enrich": []string{"enrich_coordinator_stats"}, "index_recovery": []string{"index_recovery"}, - "index_summary": []string{"indices_stats"}, + "index_summary": []string{}, // no longer indexed into .monitoring-es-* "ml_job": []string{"job_stats"}, "node_stats": []string{}, // no longer indexed into .monitoring-es-* } diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 39e239c8e8f..ebdfa00c478 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } diff --git a/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json b/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json deleted file mode 100644 index ad68a4b786e..00000000000 --- a/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "_index": ".monitoring-es-6-2018.05.15", - "_type": "doc", - "_id": "CGdxY2MBLoB8ROglGWFD", - "_score": 1, - "_source": { - "cluster_uuid": "SFQoPJkbSc2-n_so4ZbUwA", - "timestamp": "2018-05-15T10:55:46.476Z", - "interval_ms": 10000, - "type": "indices_stats", - "source_node": { - "uuid": "YYSPA7QWSQyBQSYgIdOAKw", - "host": "127.0.0.1", - "transport_address": "127.0.0.1:9300", - "ip": "127.0.0.1", - "name": "YYSPA7Q", - "timestamp": "2018-05-15T10:55:46.360Z" - }, - "indices_stats": { - "_all": { - "primaries": { - "docs": { - "count": 509 - }, - "store": { - "size_in_bytes": 1377439 - }, - "indexing": { - "index_total": 531, - "index_time_in_millis": 5220, - "is_throttled": false, - "throttle_time_in_millis": 0 - }, - "search": { - "query_total": 908, - "query_time_in_millis": 10160 - } - }, - "total": { - "docs": { - "count": 509 - }, - "store": { - "size_in_bytes": 1377439 - }, - "indexing": { - "index_total": 531, - "index_time_in_millis": 5220, - "is_throttled": false, - "throttle_time_in_millis": 0 - }, - "search": { - "query_total": 908, - "query_time_in_millis": 10160 - } - } - } - } - } -} diff --git a/metricbeat/module/elasticsearch/index_summary/_meta/data.json b/metricbeat/module/elasticsearch/index_summary/_meta/data.json index 686b38e54cf..3dadbd5b61b 100644 --- a/metricbeat/module/elasticsearch/index_summary/_meta/data.json +++ b/metricbeat/module/elasticsearch/index_summary/_meta/data.json @@ -1,61 +1,153 @@ { - "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { - "hostname": "host.example.com", - "name": "host.example.com" + "@timestamp": "2020-08-26T20:27:04.201Z", + "@metadata": { + "beat": "metricbeat", + "type": "_doc", + "version": "8.0.0" + }, + "event": { + "dataset": "elasticsearch.index.summary", + "module": "elasticsearch", + "duration": 143822781 + }, + "metricset": { + "name": "index_summary", + "period": 10000 }, "elasticsearch": { - "cluster": { - "id": "UziYVLPkTTmCzccc6102Bg", - "name": "elasticsearch" - }, "index": { "summary": { - "primaries": { - "docs": { - "count": 231, - "deleted": 56 + "total": { + "store": { + "size": { + "bytes": 12088959 + } }, "segments": { - "count": 16, "memory": { - "bytes": 105245 + "bytes": 111208 + }, + "count": 18 + }, + "indexing": { + "is_throttled": false, + "throttle_time": { + "ms": 0 + }, + "index": { + "count": 0, + "time": { + "ms": 0 + } } }, - "store": { + "bulk": { + "time": { + "count": { + "ms": 0 + }, + "avg": { + "ms": 0, + "bytes": 0 + } + }, "size": { - "bytes": 444882 + "bytes": 0 + }, + "operations": { + "count": 0 + } + }, + "search": { + "query": { + "count": 0, + "time": { + "ms": 0 + } } + }, + "docs": { + "count": 1297, + "deleted": 418 } }, - "total": { + "primaries": { "docs": { - "count": 231, - "deleted": 56 + "count": 1297, + "deleted": 418 + }, + "store": { + "size": { + "bytes": 12088959 + } }, "segments": { - "count": 16, "memory": { - "bytes": 105245 + "bytes": 111208 + }, + "count": 18 + }, + "indexing": { + "index": { + "time": { + "ms": 0 + }, + "count": 0 + }, + "is_throttled": false, + "throttle_time": { + "ms": 0 } }, - "store": { + "bulk": { + "time": { + "avg": { + "bytes": 0, + "ms": 0 + }, + "count": { + "ms": 0 + } + }, "size": { - "bytes": 444882 + "bytes": 0 + }, + "operations": { + "count": 0 + } + }, + "search": { + "query": { + "time": { + "ms": 0 + }, + "count": 0 } } } } + }, + "cluster": { + "name": "docker-cluster", + "id": "giRKn5pZQ0afY0YrRiXdxQ" } }, - "metricset": { - "host": "127.0.0.1:9200", - "module": "elasticsearch", - "name": "index_summary", - "namespace": "elasticsearch.index.summary", - "rtt": 115 + "ecs": { + "version": "1.5.0" + }, + "host": { + "name": "mcastro" + }, + "agent": { + "name": "mcastro", + "type": "metricbeat", + "version": "8.0.0", + "ephemeral_id": "7cca1b46-be04-4e3b-aa72-048c9e91fa6e", + "id": "803dfdba-e638-4590-a2de-80cb1cebe78d" }, "service": { - "name": "elasticsearch" + "type": "elasticsearch", + "name": "elasticsearch", + "address": "localhost:9200" } -} \ No newline at end of file +} diff --git a/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml b/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml index 17df1df7aeb..07a4bee3de5 100644 --- a/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml @@ -29,6 +29,54 @@ format: bytes description: > Total number of memory used by the segments in bytes. + - name: indexing + type: group + fields: + - name: index.count + description: TODO + type: long + - name: index.time.ms + description: TODO + type: long + - name: is_throttled + type: boolean + description: TODO + - name: throttle_time.ms + type: long + description: TODO + - name: search + type: group + fields: + - name: query + type: group + fields: + - name: count + type: long + description: TODO + - name: time.ms + type: long + description: TODO + - name: bulk + type: group + fields: + - name: operations.count + type: long + description: TODO + - name: size.bytes + type: long + description: TODO + - name: time + type: group + fields: + - name: count.ms + type: long + description: TODO + - name: avg.ms + type: long + description: TODO + - name: avg.bytes + type: long + description: TODO - name: total type: group fields: @@ -54,3 +102,51 @@ format: bytes description: > Total number of memory used by the segments in bytes. + - name: indexing + type: group + fields: + - name: index.count + description: TODO + type: long + - name: index.time.ms + description: TODO + type: long + - name: is_throttled + type: boolean + description: TODO + - name: throttle_time.ms + type: long + description: TODO + - name: search + type: group + fields: + - name: query + type: group + fields: + - name: count + type: long + description: TODO + - name: time.ms + type: long + description: TODO + - name: bulk + type: group + fields: + - name: operations.count + type: long + description: TODO + - name: size.bytes + type: long + description: TODO + - name: time + type: group + fields: + - name: count.ms + type: long + description: TODO + - name: avg.ms + type: long + description: TODO + - name: avg.bytes + type: long + description: TODO diff --git a/metricbeat/module/elasticsearch/index_summary/data.go b/metricbeat/module/elasticsearch/index_summary/data.go index fe75162bf73..17d228b8f80 100644 --- a/metricbeat/module/elasticsearch/index_summary/data.go +++ b/metricbeat/module/elasticsearch/index_summary/data.go @@ -31,52 +31,73 @@ import ( var ( schema = s.Schema{ - "primaries": c.Dict("primaries", s.Schema{ - "docs": c.Dict("docs", s.Schema{ - "count": c.Int("count"), - "deleted": c.Int("deleted"), - }), - "store": c.Dict("store", s.Schema{ - "size": s.Object{ - "bytes": c.Int("size_in_bytes"), - }, - }), - "segments": c.Dict("segments", s.Schema{ - "count": c.Int("count"), - "memory": s.Object{ - "bytes": c.Int("memory_in_bytes"), - }, - }), - }), - "total": c.Dict("total", s.Schema{ - "docs": c.Dict("docs", s.Schema{ - "count": c.Int("count"), - "deleted": c.Int("deleted"), - }), - "store": c.Dict("store", s.Schema{ - "size": s.Object{ - "bytes": c.Int("size_in_bytes"), - }, - }), - "segments": c.Dict("segments", s.Schema{ - "count": c.Int("count"), - "memory": s.Object{ - "bytes": c.Int("memory_in_bytes"), - }, - }), - }), + "primaries": c.Dict("primaries", indexSummaryDict), + "total": c.Dict("total", indexSummaryDict), } ) -func eventMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) error { - var event mb.Event - event.RootFields = common.MapStr{} - event.RootFields.Put("service.name", elasticsearch.ModuleName) +var indexSummaryDict = s.Schema{ + "docs": c.Dict("docs", s.Schema{ + "count": c.Int("count"), + "deleted": c.Int("deleted"), + }), + "store": c.Dict("store", s.Schema{ + "size": s.Object{ + "bytes": c.Int("size_in_bytes"), + }, + }), + "segments": c.Dict("segments", s.Schema{ + "count": c.Int("count"), + "memory": s.Object{ + "bytes": c.Int("memory_in_bytes"), + }, + }), + "indexing": indexingDict, + "bulk": bulkStatsDict, + "search": searchDict, +} - event.ModuleFields = common.MapStr{} - event.ModuleFields.Put("cluster.name", info.ClusterName) - event.ModuleFields.Put("cluster.id", info.ClusterID) +var indexingDict = c.Dict("indexing", s.Schema{ + "index": s.Object{ + "count": c.Int("index_total"), + "time": s.Object{ + "ms": c.Int("index_time_in_millis"), + }, + }, + "is_throttled": c.Bool("is_throttled"), + "throttle_time": s.Object{ + "ms": c.Int("throttle_time_in_millis"), + }, +}) + +var searchDict = c.Dict("search", s.Schema{ + "query": s.Object{ + "count": c.Int("query_total"), + "time": s.Object{ + "ms": c.Int("query_time_in_millis"), + }, + }, +}) + +var bulkStatsDict = c.Dict("bulk", s.Schema{ + "operations": s.Object{ + "count": c.Int("total_operations"), + }, + "time": s.Object{ + "count": s.Object{ + "ms": c.Int("total_time_in_millis"), + }, + "avg": s.Object{ + "ms": c.Int("avg_time_in_millis"), + "bytes": c.Int("avg_size_in_bytes"), + }, + }, + "size": s.Object{ + "bytes": c.Int("total_size_in_bytes"), + }, +}, c.DictOptional) +func eventMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) error { var all struct { Data map[string]interface{} `json:"_all"` } @@ -91,6 +112,14 @@ func eventMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) erro return errors.Wrap(err, "failure applying stats schema") } + var event mb.Event + event.RootFields = common.MapStr{} + event.RootFields.Put("service.name", elasticsearch.ModuleName) + + event.ModuleFields = common.MapStr{} + event.ModuleFields.Put("cluster.name", info.ClusterName) + event.ModuleFields.Put("cluster.id", info.ClusterID) + event.MetricSetFields = fields r.Event(event) diff --git a/metricbeat/module/elasticsearch/index_summary/data_xpack.go b/metricbeat/module/elasticsearch/index_summary/data_xpack.go deleted file mode 100644 index 4e35744133d..00000000000 --- a/metricbeat/module/elasticsearch/index_summary/data_xpack.go +++ /dev/null @@ -1,100 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package index_summary - -import ( - "encoding/json" - "fmt" - "time" - - "github.com/pkg/errors" - - "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" -) - -var ( - xpackSchema = s.Schema{ - "primaries": c.Dict("primaries", indexStatsSchema), - "total": c.Dict("total", indexStatsSchema), - } - - indexStatsSchema = s.Schema{ - "docs": c.Dict("docs", s.Schema{ - "count": c.Int("count"), - }), - "store": c.Dict("store", s.Schema{ - "size_in_bytes": c.Int("size_in_bytes"), - }), - "indexing": c.Dict("indexing", s.Schema{ - "index_total": c.Int("index_total"), - "index_time_in_millis": c.Int("index_time_in_millis"), - "is_throttled": c.Bool("is_throttled"), - "throttle_time_in_millis": c.Int("throttle_time_in_millis"), - }), - "bulk": elasticsearch.BulkStatsDict, - "search": c.Dict("search", s.Schema{ - "query_total": c.Int("query_total"), - "query_time_in_millis": c.Int("query_time_in_millis"), - }), - } -) - -func eventMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { - var all struct { - Data map[string]interface{} `json:"_all"` - } - - err := json.Unmarshal(content, &all) - if err != nil { - return errors.Wrap(err, "failure parsing Elasticsearch Stats API response") - } - - p := all.Data["primaries"] - primaries, ok := p.(map[string]interface{}) - if !ok { - return fmt.Errorf("primaries is not a map") - } - - if len(primaries) == 0 { - // There is no data in the cluster, hence no metrics to parse or report - return nil - } - - fields, err := xpackSchema.Apply(all.Data) - if err != nil { - return errors.Wrap(err, "failure applying stats schema") - } - - event := mb.Event{} - event.RootFields = common.MapStr{} - event.RootFields.Put("indices_stats._all", fields) - event.RootFields.Put("cluster_uuid", info.ClusterID) - event.RootFields.Put("timestamp", common.Time(time.Now())) - event.RootFields.Put("interval_ms", m.Module().Config().Period/time.Millisecond) - event.RootFields.Put("type", "indices_stats") - - event.Index = elastic.MakeXPackMonitoringIndexName(elastic.Elasticsearch) - - r.Event(event) - return nil -} diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go index dc3dbdd7207..c163bef237a 100644 --- a/metricbeat/module/elasticsearch/index_summary/index_summary.go +++ b/metricbeat/module/elasticsearch/index_summary/index_summary.go @@ -80,18 +80,5 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return errors.Wrap(err, "failed to get info from Elasticsearch") } - if m.XPack { - err = eventMappingXPack(r, m, *info, content) - if err != nil { - // Since this is an x-pack code path, we log the error but don't - // return it. Otherwise it would get reported into `metricbeat-*` - // indices. - m.Logger().Error(err) - return nil - } - } else { - return eventMapping(r, *info, content) - } - - return nil + return eventMapping(r, *info, content) } From dbaefcd4d0c1fcda044707424947cdd07b5265df Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 4 Nov 2020 23:33:06 +0100 Subject: [PATCH 03/16] Force push new atomic commit. 1 shard == 1 event --- .../index_recovery/_meta/data.json | 137 ++++++++++++++---- .../elasticsearch/index_recovery/data.go | 51 +++++++ .../index_recovery/data_xpack.go | 84 ----------- .../index_recovery/index_recovery.go | 19 +-- 4 files changed, 159 insertions(+), 132 deletions(-) delete mode 100644 metricbeat/module/elasticsearch/index_recovery/data_xpack.go diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json index a22b96172e1..bdc9aeab8f7 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json @@ -1,38 +1,113 @@ { - "@timestamp": "2017-10-12T08:05:34.853Z", + "@timestamp": "2020-11-04T22:28:11.901Z", + "@metadata": { + "beat": "metricbeat", + "type": "_doc", + "version": "8.0.0" + }, "agent": { - "hostname": "host.example.com", - "name": "host.example.com" + "ephemeral_id": "c50b2c97-8d98-4201-8bc9-a77abab6d0e3", + "id": "abfbaa55-b79d-4ae5-b412-fd35b933c6d3", + "name": "privacys-MBP", + "type": "metricbeat", + "version": "8.0.0" }, - "elasticsearch": { - "cluster": { - "id": "3LbUkLkURz--FR-YO0wLNA", - "name": "es1" - }, - "index": { - "name": ".monitoring-es-6-2018.11.20", - "recovery": { - "id": 0, - "primary": true, - "source": {}, - "stage": "DONE", - "target": { - "host": "127.0.0.1", - "id": "FMRmkE3HTU6xxxoFK-06Ww", - "name": "es1_1" - }, - "type": "EMPTY_STORE" - } - } + "ecs": { + "version": "1.5.0" }, - "metricset": { - "host": "127.0.0.1:9200", - "module": "elasticsearch", - "name": "index_recovery", - "namespace": "elasticsearch.index.recovery", - "rtt": 115 + "host": { + "name": "privacys-MBP" }, "service": { - "name": "elasticsearch" + "name": "elasticsearch", + "address": "localhost:9200", + "type": "elasticsearch" + }, + "event": { + "dataset": "elasticsearch.index.recovery", + "module": "elasticsearch", + "duration": 13551341 + }, + "metricset": { + "name": "index_recovery", + "period": 10000 + }, + "elasticsearch": { + "cluster": { + "name": "docker-cluster", + "id": "xpHqTdNHR42BOj6-SponHw" + }, + "index": { + "recovery": { + "total_time": { + "ms": 153 + }, + "primary": true, + "translog": { + "count": 0, + "pct": "100.0%", + "total_on_start": 0, + "total_time": { + "ms": 68 + }, + "recovered": 0 + }, + "source": {}, + "stop_time": { + "ms": 1604526809526 + }, + "start_time": { + "ms": 1604526809372 + }, + "stage": "DONE", + "id": 0, + "index": { + "size": { + "recovered": { + "bytes": 0 + }, + "pct": "0.0%", + "total": { + "bytes": 0 + }, + "reused": { + "bytes": 0 + } + }, + "files": { + "pct": "0.0%", + "count": 0, + "reused": 0, + "recovered": 0 + }, + "total_time": { + "ms": 75 + }, + "throttle_time": { + "source": { + "ms": 0 + }, + "target": { + "ms": 0 + } + } + }, + "verify_index": { + "check_index_time": { + "ms": 0 + }, + "total_time": { + "ms": 0 + } + }, + "type": "EMPTY_STORE", + "target": { + "host": "127.0.0.1", + "name": "a2627996e0b2", + "id": "SRIb1RkRRV2s08DGkteVMQ" + } + }, + "name": ".kibana_1" + } } -} \ No newline at end of file +} \ No newline at end of file diff --git a/metricbeat/module/elasticsearch/index_recovery/data.go b/metricbeat/module/elasticsearch/index_recovery/data.go index 1aaa731bba1..154fbdb7330 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data.go +++ b/metricbeat/module/elasticsearch/index_recovery/data.go @@ -52,6 +52,57 @@ var ( "host": c.Str("host", s.Optional), "name": c.Str("name", s.Optional), }), + + "start_time": s.Object{ + "ms": c.Int("start_time_in_millis"), + }, + "stop_time": s.Object{ + "ms": c.Int("stop_time_in_millis"), + }, + "total_time": s.Object{ + "ms": c.Int("total_time_in_millis"), + }, + + "index": c.Dict("index", s.Schema{ + "size": c.Dict("size", s.Schema{ + "total": s.Object{"bytes": c.Int("total_in_bytes")}, + "reused": s.Object{"bytes": c.Int("reused_in_bytes")}, + "recovered": s.Object{"bytes": c.Int("recovered_in_bytes")}, + "pct": c.Str("percent"), + }), + "files": c.Dict("files", s.Schema{ + "count": c.Int("total"), + "reused": c.Int("reused"), + "recovered": c.Int("recovered"), + "pct": c.Str("percent"), + }), + "total_time": s.Object{ + "ms": c.Int("total_time_in_millis"), + }, + "throttle_time": s.Object{ + "source": s.Object{ + "ms": c.Int("source_throttle_time_in_millis"), + }, + "target": s.Object{ + "ms": c.Int("target_throttle_time_in_millis"), + }, + }, + }), + + "translog": c.Dict("translog", s.Schema{ + "recovered": c.Int("recovered"), + "count": c.Int("total"), + "pct": c.Str("percent"), + "total_on_start": c.Int("total_on_start"), + "total_time": s.Object{ + "ms": c.Int("total_time_in_millis"), + }, + }), + + "verify_index": c.Dict("verify_index", s.Schema{ + "check_index_time": s.Object{"ms": c.Int("check_index_time_in_millis")}, + "total_time": s.Object{"ms": c.Int("total_time_in_millis")}, + }), } ) diff --git a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go b/metricbeat/module/elasticsearch/index_recovery/data_xpack.go deleted file mode 100644 index e8bbc3dcad5..00000000000 --- a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go +++ /dev/null @@ -1,84 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package index_recovery - -import ( - "encoding/json" - "fmt" - "time" - - "github.com/pkg/errors" - - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" -) - -func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { - var data map[string]interface{} - err := json.Unmarshal(content, &data) - if err != nil { - return errors.Wrap(err, "failure parsing Elasticsearch Recovery API response") - } - - var results []map[string]interface{} - for indexName, indexData := range data { - indexData, ok := indexData.(map[string]interface{}) - if !ok { - return fmt.Errorf("%v is not a map", indexName) - } - - shards, ok := indexData["shards"] - if !ok { - return elastic.MakeErrorForMissingField(indexName+".shards", elastic.Elasticsearch) - } - - shardsArr, ok := shards.([]interface{}) - if !ok { - return fmt.Errorf("%v.shards is not an array", indexName) - } - - for shardIdx, shard := range shardsArr { - shard, ok := shard.(map[string]interface{}) - if !ok { - return fmt.Errorf("%v.shards[%v] is not a map", indexName, shardIdx) - } - - shard["index_name"] = indexName - results = append(results, shard) - } - } - - indexRecovery := common.MapStr{} - indexRecovery["shards"] = results - - event := mb.Event{} - event.RootFields = common.MapStr{ - "cluster_uuid": info.ClusterID, - "timestamp": common.Time(time.Now()), - "interval_ms": m.Module().Config().Period / time.Millisecond, - "type": "index_recovery", - "index_recovery": indexRecovery, - } - - event.Index = elastic.MakeXPackMonitoringIndexName(elastic.Elasticsearch) - r.Event(event) - - return nil -} diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go index e30463e3848..c37f8fd30ab 100644 --- a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go +++ b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go @@ -42,17 +42,15 @@ type MetricSet struct { func New(base mb.BaseMetricSet) (mb.MetricSet, error) { config := struct { ActiveOnly bool `config:"index_recovery.active_only"` - XPack bool `config:"xpack.enabled"` }{ ActiveOnly: true, - XPack: false, } if err := base.Module().UnpackConfig(&config); err != nil { return nil, err } localRecoveryPath := recoveryPath - if !config.XPack && config.ActiveOnly { + if config.ActiveOnly { localRecoveryPath = localRecoveryPath + "?active_only=true" } @@ -83,18 +81,5 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return err } - if m.MetricSet.XPack { - err = eventsMappingXPack(r, m, *info, content) - if err != nil { - // Since this is an x-pack code path, we log the error but don't - // return it. Otherwise it would get reported into `metricbeat-*` - // indices. - m.Logger().Error(err) - return nil - } - } else { - return eventsMapping(r, *info, content) - } - - return nil + return eventsMapping(r, *info, content) } From aa574dd58bcb8f2d1e501cbaf319e5b7ad298e24 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 6 Nov 2020 17:38:51 +0100 Subject: [PATCH 04/16] Fix test that was failing --- .../elasticsearch/elasticsearch_integration_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index 4ee5c953150..5113ac65b79 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -261,10 +261,11 @@ func getConfig(metricset string, host string) map[string]interface{} { func getXPackConfig(host string) map[string]interface{} { return map[string]interface{}{ - "module": elasticsearch.ModuleName, - "metricsets": xpackMetricSets, - "hosts": []string{host}, - "xpack.enabled": true, + "module": elasticsearch.ModuleName, + "metricsets": xpackMetricSets, + "hosts": []string{host}, + "xpack.enabled": true, + "index_recovery.active_only": false, } } From f9e65e222ae223b4804ffc813f7995d9d9581125 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 10 Nov 2020 17:50:32 +0100 Subject: [PATCH 05/16] Add missing field --- metricbeat/docs/fields.asciidoc | 7 +++++++ .../module/elasticsearch/index_recovery/_meta/fields.yml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 3b3dd32dc39..5b7eb387e4b 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -18677,6 +18677,13 @@ type: keyword -- +*`elasticsearch.index.recovery.translog.total_time.ms`*:: ++ +-- +type: long + +-- + [float] === index.summary diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml index e61a341e272..7831d19298c 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml @@ -46,3 +46,5 @@ type: keyword description: > Source node name. + - name: translog.total_time.ms + type: long From 5f8560d6dc2cbabc600fabdac55a76316b002c95 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 10 Nov 2020 17:51:46 +0100 Subject: [PATCH 06/16] Rebase and `make update` --- metricbeat/module/elasticsearch/fields.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index ebdfa00c478..8cf638432d0 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 6c00189bb00b6ea3ceda897231f9833ffe77e193 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 10 Nov 2020 17:54:48 +0100 Subject: [PATCH 07/16] Add comment to test --- .../module/elasticsearch/elasticsearch_integration_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index 5113ac65b79..897ded64c66 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -265,6 +265,8 @@ func getXPackConfig(host string) map[string]interface{} { "metricsets": xpackMetricSets, "hosts": []string{host}, "xpack.enabled": true, + // index_recovery.active_only is part of the config of the index_recovery Metricset and it is required during the + // test of that particular metricset to get some data from the ES node (instead of an empty JSON if set to true) "index_recovery.active_only": false, } } From 1f268999274f39e63663e0d19396a67817a1a77d Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 11 Nov 2020 21:44:37 +0100 Subject: [PATCH 08/16] Add missing fields to mapping --- metricbeat/docs/fields.asciidoc | 124 ++++++++++++++++++ metricbeat/module/elasticsearch/fields.go | 2 +- .../index_recovery/_meta/data.json | 5 +- .../index_recovery/_meta/fields.yml | 51 ++++++- .../elasticsearch/index_recovery/data.go | 3 - 5 files changed, 176 insertions(+), 9 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 5b7eb387e4b..f3ac989cdd6 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -18577,6 +18577,13 @@ index +*`elasticsearch.index.recovery.total_time.ms`*:: ++ +-- +type: long + +-- + *`elasticsearch.index.recovery.id`*:: + -- @@ -18677,6 +18684,87 @@ type: keyword -- +*`elasticsearch.index.recovery.stop_time.ms`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.start_time.ms`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.index.recovery.index.total_time.ms`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.throttle_time.source.ms`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.throttle_time.target.ms`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.index.recovery.index.files.count`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.files.reused`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.files.recovered`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.index.recovery.index.size.recovered.bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.size.total.bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.index.size.reused.bytes`*:: ++ +-- +type: long + +-- + + *`elasticsearch.index.recovery.translog.total_time.ms`*:: + -- @@ -18684,6 +18772,42 @@ type: long -- +*`elasticsearch.index.recovery.translog.count`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.translog.total_on_start`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.translog.recovered`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.index.recovery.verify_index.check_index_time.ms`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.recovery.verify_index.total_time.ms`*:: ++ +-- +type: long + +-- + [float] === index.summary diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 8cf638432d0..15033fa0525 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "eJzsXV9v4zYSf8+nGOSpBXYF3Gsergf0z10KdFtc03s5HFRaGtvcSKJDUt6kn/5A6o8lmaQoiUqchfNQdOP4N78ZDsnhcEh+hEd8uQPMiJA0EUh4sr8BkFRmeAe3P3Z/f3sDkKJIOD1Iyoo7+PsNAEDvbyBnaZnhDQDHDInAO9iRGwCBUtJiJ+7gv7dCZLcf4HYv5eH2f+qzPeMyTlixpbs72JJMqO9vKWapuNMiPkJBcrwDSXMUkuQH/VsA+XLAOyAZJaL+zYHI/R3c/qP9y9seQJKVQiKPy5KmIxg9k0T1F6P6aw2eYCVPMC5Yij24HWdlQ7KrSPe7HQ5mHjYuSlrU+W4DqP47H7D9dgvHUoyFJFJMVm0rznh0v2b6aq+ZmSRZ7xMbig2pi0aOhGZkk2FMi3jzIlGc/anDLNoA0VZEosxzwl+iFi6yYZkNfyJEWc+syzU02cuN6ELtIrMDcqI6u0lPP7s12kaaZXRCjBJWFtKCa7PhkCBHksbhWSrY0FS/cCpxBa4adwnZ1i+LlCa4rOvSIsVnWuyC+bYGjNVwrrpvTrOMzui/tWpRQy86wUb5lD5soGbpfDMZ6Sa1taAPK7nnTMoMw9ushzzNbO3EoFo7JZIE848cc8ZfYkH/WjK+N7q2/KIKd/YY/1Qif4kTkuzxQlXtMFyqLMenEoW8aHV7HJcq3MbJYTStmiJUf60/OYHOH+FqjGUjXJ/PrPHtZPddjkXAyMlGxFu1is+iATtlSXwkWYkirl1+ube3xE7gc30eesP3M6bxhspYoFyBbQ8/BOFqUtUREl+Bbxc+BN3wDAOQKhjP13BNjRuC4IHRQq7BsAIOQVFIxjGNq+FoBaY9/BCEJfI8PmIiGV+Dbxc+FN21eAYheEQuKCvinBxWoNlBn0O2Ifn5mC9a/O2SgBNzllXusU5eI0udC2Qb9hi+QQXVLq4VOYy39+djHu2S6GSTiGVpdMJ3rvjBI0VhoT0akYbibwxQfck3xF9YeZZ36GNceqtqDd51u55pMKtlO+FQsAFlj2rkJc8Lhl2lbo55pKCinDwvmhA0n1JgGoqQwgrE6IA8wTnronNCh8R3WdTbdujtjPjsgbgx2bKkZnIog/lhxkgakyNyshumStzALvCugL8N+0zzM9J2TETJoYxqfrvIijPWaxMT+wWRwKEkicOLltiqFGSHcUEKNjMbr4ymCUQ1zUhDRtbsvk9HPHe3MNomWxE/lUySOKcJD6JylGxFpDGjco7K0FsjEfeuRYjpuyjzDfKYbWPMyKEe7ChLF8yCfYOo30UD7KDz+EkDvccdN1l5W0A7T4MBdlANdPjRQju733zyHe7WzjhGvJ+WWadPskJylsUu3/Y2QL3088H07ZQZzal0hShzCGpQa6wyhV41gAemVw3hU+m12SjOEhSXE3DMDuZqRXS3mh7Gyb3emj8wli0yxabMHoPZ4qnE0hR1jViio0uk+EQaZ1HSn+NnTKRx0J5KpoGavauyw+G33tTCO5QXY2DFZbF99S7BJVlYE7oYG1dsFls5/J7sUjOfNj4vws71p4sNrbe7LsnOVQHUpZi5YjPZyoMirJmFlzHJlk23B05zwulZ5LOwgOu8IswN6gI+A7cWKIDXwsTUttWY1JR8tkYZVGs5VkUTy9dWZ2qqA1mn3NY4DrshXbDgXY4CgWxYlah0q1Y82tmzhGdFjrZKn6+oH1ZaW/tgQ2Z4mMGsouEkg31cbcr/jSX2j/jyhfHutGHErn76pyVqXC0lsko15LkDyKSpXaKafYz59QVyNaZRauf4hLmtTE3TBaDDOdtGdoSw+vnEUoT7H4xyBs0fQlK/5bvCcqKawihuw1iGpJgm7l6A3KM2tv6fCl//+zszgYwlj/2AYjmFBhSwIJsMU2BFS+u7c39M+KhjOGR+z5kQHxuH53jIaKKL5GF4AKN/Wqn5cflchiS1NM/sMMk6Npv9a0T75ucTyRHYtmZskXTyuudY4FNcMCuZjBlnEQ8mv5Bnmpc5CHwqsUiwTmYrcu35hcYharZiTwZ6t8WILMvYl/fVBA3nkUbQSkeVcVZohk+t1ZWhtTD4QuWeVpZ3czsdNNGFjxKHY0BYhidxFS9M4ZumI2P6LdBCMs26NW2lz5az3O1HMNySELRIMFZzVqzP/zjKpudr9kBz/AC0gFx8AC2xz16Jhy3KZI9nSljp7zK2IVmc7DF51EWLKxD/p5YBJxmg64pVd+2b3hlUjOfFXcN5PZAvH7wVwtmG5YKpvMusFPDNjiMWH+AFlWE+AMf0W/Mkr6Y9/7W2R0AhNAeq467IawB018I73GbUaR5UvN4Z47Wyyvcbj7AwMUY+y6icBpQK/CNmdEc3GXqTMpxaCkVJQY/wsJ/RgyUec1/BXbDP1Ap7NJAefM6HbNfidpTN73ousVtn/gmTxfPIwE6V9g4zjef41qBVyXoZp3d2QtBdyLzExX7RwFAKNcMy3hF5NnVhwWkvmTV5zvpRIwSYsqr8tqB/mVegBlOMzRYn36kW6PUROd1KKuioJBrJcMyZxLj5RrAQPCk5N29WL3XM7yvk7oqjlEKSIqXFrtantYC977iP2gcJeO20AJ8xKSWmdeCol/JCEi7Lg7mdmi/EVRNjfWZ8dQ+SeyLrztMURDAuYE+O6KeEbU02uf8NAaZ3vLBJn3vFx5H1CZuMT1kydjgx3FifsqTU51Ggu5C09yVNLsUMzXtuwelVkibT1Ger9MA7Ul5tobplPCfyDmxf9lZFUWgW7ZqzUkCjOsj7nVANZ+WKWCt2nJjXeaW1TXvin3eCg81LlSCpqRrMbR6vIo4JO2KvZPANBi5LVnz6OF9FwY1SvRR+V56CDzdQDoQqJLPYOsQ0Sp6VpX7gJQIdxK5m2UKel/Ev0PnfjbYa1+BmXdmS8B3KKOTex4OGrKZkaytXYvdMmKvGFgtWyEDSlKMQ8E3CyiyFDcL9b+0vGdd/pPhY0io1ybBTd5dkfwI3+4a+Gyxo+/yuId3tU4sN2z5dwSHapyYZtn26JB0BFieFyNiuioQtF2QYRsr+CF9vSb/tAB++WOcaL17jxWu8uF68ONRq/aIc58mdnr4Pv/7wq+XvnEYdCrRfObSGyPEDUK5IcBqrztmGsYvQPFTwkfpaRXVODcIcm/c5P+awFUzwnf6+rs8Z9MWCHcdVIEgzTbrfcZHPdaU6Z7EV5Kn2eh1ffBWvGEomx92byXW1YiDR1xzm6vSuMek1Jh3lf41JrzHpNSa9xqTXmDSEvGtM+l5j0tNBhugz29wMcSfkavNuOBtsJ25WlvuPgj6VCHkGn9nGvgsgieWQ7iyhP7NNBWmWlhJJquvw2msjMI05Joynxmvy5u5E/taAVzWTeDwP0EycaHEkGU3jlEgMyudh3z3DUCksdC09IJV75EAgp0LQYqcIYeUlwNTv9b91oUy1h1IwCRuEA+ECU8Pe0plbex2bcigw+P50t66vHQ3nZvpEVI1qbtX+FaV2tT2E/fyfX+C+2DK/itcxrcc09yDUkDIaoMugXm7oW/Zo4bhKZ+2Fx7+QHEAx6K01lA7jy4yuEuOXKa6sQ06e56tQsOLtm+ITKz4GaI5Gl7dskVYV/1Y57YhWdxatcHRx24CDwsZUn+GpjGYcmZcfd/m9LTsHsmGlBCTJvt78L4CYj/Uui1Mmni64qNQdPitjqYm2SY5dbtrugpJd7y3N1WQQJ2S0lmY/Z2U3tVAPcrYnkSDIEn2kyUZVh9Gme837JZaktgxXVSzJWoTLu/WSXsY3lOCduYLrPaj3psv619mEcGqfx5VG4Iaj/Soq+z9H5KH8+KTSHWUnvCwUWPaUV4ICi/Z6YyewTL9XcwILnfQATmDZUx6zWUH0a8uc8NjMQsmdpE/7rECwtclKK9wGXq1bVxlCX6sXG2/8nSTEdPPwsEkPjGXh1pvmZ30ChBsOX4EwdvdaZUB1h45tSdGlfEDyeDGcf0Py6Es6viRja+K5n8WdD7C8NvE/qrSZc+VpezDp2l/emvO1v7w2cZ/+Ikp+pEdmv5Hr2mXejvO1y7w2cVuX6YZ4vdfhQoZ5nTfmVumOATKDS3KBw3f0vgYdjU6yDecV50cyxzHBz91/ohmCeBESc4cYH5tXKbpL6MJtC3BcWE4XmBA5EpqRTfb2rNoEHouHm7l9Gkt64fil2SHqCz1LNcGv6O6U6CdptA509YzCcuzWAAEvqVrpfT7fpxedM4fx9cUw/CY9cTg6dZitOM50jG1PxvjrhB6MYVBXOYrkou5Dvytw6lOCnvrAoMB5ylt/M0X4vsjnAd/fBlzfjTwe1AOP+r8+6vgreOBraJ+5rruKGHvfLoDgYUWW+RU5qxCfHLL5iTlYNLavdlbC/TyR0xZ9oNGXhUawGpzzV9++UkXd17p/VaquW6xwWbqaniH7SlS9GQI1d+YeUN8LGksiuqPU5MrSP02Af+p5jtBCAIH6A1AfdJG6qZ459aUCuYwZt72cMf0Exr2GhHPI0wREGafSfD/cnBMoBri2/+kbqIySFtxoFcFPjAM+k/yQKYVK+TEnh8Ow1q4Xa9EirtzY52orLy4PNNfljP0H+1rNB88rTHbJ+tUG7TyLfGy16wDlngqg1SM6HlcDGl/vCHPOSDNx30oY8vDXg65mJRJ9ZHPMWEKkGlR0FXwR9gq+7gNG9cMlRDRC6xczopv/BwAA//8xpG7b" + return "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" } diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json index bdc9aeab8f7..f3bcf2d6e33 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json @@ -45,7 +45,6 @@ "primary": true, "translog": { "count": 0, - "pct": "100.0%", "total_on_start": 0, "total_time": { "ms": 68 @@ -66,7 +65,6 @@ "recovered": { "bytes": 0 }, - "pct": "0.0%", "total": { "bytes": 0 }, @@ -75,7 +73,6 @@ } }, "files": { - "pct": "0.0%", "count": 0, "reused": 0, "recovered": 0 @@ -110,4 +107,4 @@ "name": ".kibana_1" } } -} \ No newline at end of file +} diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml index 7831d19298c..3af4da7fd92 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml @@ -4,6 +4,8 @@ index release: ga fields: + - name: total_time.ms + type: long - name: id type: long description: > @@ -46,5 +48,52 @@ type: keyword description: > Source node name. - - name: translog.total_time.ms + - name: stop_time.ms + type: long + - name: start_time.ms type: long + - name: index + type: group + fields: + - name: total_time.ms + type: long + - name: throttle_time.source.ms + type: long + - name: throttle_time.target.ms + type: long + - name: files + type: group + fields: + - name: count + type: long + - name: reused + type: long + - name: recovered + type: long + - name: size + type: group + fields: + - name: recovered.bytes + type: long + - name: total.bytes + type: long + - name: reused.bytes + type: long + - name: translog + type: group + fields: + - name: total_time.ms + type: long + - name: count + type: long + - name: total_on_start + type: long + - name: recovered + type: long + - name: verify_index + type: group + fields: + - name: check_index_time.ms + type: long + - name: total_time.ms + type: long diff --git a/metricbeat/module/elasticsearch/index_recovery/data.go b/metricbeat/module/elasticsearch/index_recovery/data.go index 154fbdb7330..fb376ce7c29 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data.go +++ b/metricbeat/module/elasticsearch/index_recovery/data.go @@ -68,13 +68,11 @@ var ( "total": s.Object{"bytes": c.Int("total_in_bytes")}, "reused": s.Object{"bytes": c.Int("reused_in_bytes")}, "recovered": s.Object{"bytes": c.Int("recovered_in_bytes")}, - "pct": c.Str("percent"), }), "files": c.Dict("files", s.Schema{ "count": c.Int("total"), "reused": c.Int("reused"), "recovered": c.Int("recovered"), - "pct": c.Str("percent"), }), "total_time": s.Object{ "ms": c.Int("total_time_in_millis"), @@ -92,7 +90,6 @@ var ( "translog": c.Dict("translog", s.Schema{ "recovered": c.Int("recovered"), "count": c.Int("total"), - "pct": c.Str("percent"), "total_on_start": c.Int("total_on_start"), "total_time": s.Object{ "ms": c.Int("total_time_in_millis"), From 083ecf8db62c54bb072cd61d79a1c67cdd3f9039 Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 19 Nov 2020 11:28:19 +0100 Subject: [PATCH 09/16] Rebase and update fields --- metricbeat/docs/fields.asciidoc | 104 ---------------------- metricbeat/module/elasticsearch/fields.go | 2 +- 2 files changed, 1 insertion(+), 105 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 90f1efc73e0..ca1840f1060 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -19127,110 +19127,6 @@ type: long -*`elasticsearch.index.summary.total.search.query.count`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.search.query.time.ms`*:: -+ --- -TODO - -type: long - --- - - -*`elasticsearch.index.summary.total.bulk.operations.count`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.bulk.size.bytes`*:: -+ --- -TODO - -type: long - --- - - -*`elasticsearch.index.summary.total.bulk.time.count.ms`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.bulk.time.avg.ms`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.bulk.time.avg.bytes`*:: -+ --- -TODO - -type: long - --- - - -*`elasticsearch.index.summary.total.indexing.index.count`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.indexing.index.time.ms`*:: -+ --- -TODO - -type: long - --- - -*`elasticsearch.index.summary.total.indexing.is_throttled`*:: -+ --- -TODO - -type: boolean - --- - -*`elasticsearch.index.summary.total.indexing.throttle_time.ms`*:: -+ --- -TODO - -type: long - --- - - - *`elasticsearch.index.summary.total.search.query.count`*:: + -- diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 15033fa0525..495bb3d0081 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From bb16dc236e82a24efb3c34dcdc97a455b0c58ca6 Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 19 Nov 2020 22:30:28 +0100 Subject: [PATCH 10/16] Skip broken test --- .../module/elasticsearch/elasticsearch_integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index b80f2f34257..76f2e45c524 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -130,7 +130,7 @@ func TestXPackEnabled(t *testing.T) { "ccr": []string{"ccr_stats", "ccr_auto_follow_stats"}, "cluster_stats": []string{"cluster_stats"}, "enrich": []string{}, // no longer indexed into .monitoring-es-* - "index_recovery": []string{"index_recovery"}, + "index_recovery": []string{}, // no longer indexed into .monitoring-es-* "index_summary": []string{}, // no longer indexed into .monitoring-es-* "ml_job": []string{"job_stats"}, "node_stats": []string{}, // no longer indexed into .monitoring-es-* From 384faa4859bf42550bfe42ebbad0f09e22fa2a22 Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 19 Nov 2020 23:21:42 +0100 Subject: [PATCH 11/16] Create TestData test --- .../index_recovery/_meta/data.json | 188 +++++------ .../_meta/test/recovery.710.json | 296 ++++++++++++++++++ .../index_recovery/_meta/test/root.710.json | 17 + .../elasticsearch/index_recovery/data_test.go | 54 ++++ 4 files changed, 452 insertions(+), 103 deletions(-) create mode 100644 metricbeat/module/elasticsearch/index_recovery/_meta/test/recovery.710.json create mode 100644 metricbeat/module/elasticsearch/index_recovery/_meta/test/root.710.json diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json index f3bcf2d6e33..0b68b587b87 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json @@ -1,110 +1,92 @@ { - "@timestamp": "2020-11-04T22:28:11.901Z", - "@metadata": { - "beat": "metricbeat", - "type": "_doc", - "version": "8.0.0" - }, - "agent": { - "ephemeral_id": "c50b2c97-8d98-4201-8bc9-a77abab6d0e3", - "id": "abfbaa55-b79d-4ae5-b412-fd35b933c6d3", - "name": "privacys-MBP", - "type": "metricbeat", - "version": "8.0.0" - }, - "ecs": { - "version": "1.5.0" - }, - "host": { - "name": "privacys-MBP" - }, - "service": { - "name": "elasticsearch", - "address": "localhost:9200", - "type": "elasticsearch" + "@timestamp": "2017-10-12T08:05:34.853Z", + "elasticsearch": { + "cluster": { + "id": "RAwvZ-UnSTiUYHJ6fGjxmg", + "name": "docker-cluster" + }, + "index": { + "name": "metricbeat-8.0.0-2020.11.19-000001", + "recovery": { + "id": 0, + "index": { + "files": { + "count": 0, + "recovered": 0, + "reused": 0 + }, + "size": { + "recovered": { + "bytes": 0 + }, + "reused": { + "bytes": 0 + }, + "total": { + "bytes": 0 + } + }, + "throttle_time": { + "source": { + "ms": 0 + }, + "target": { + "ms": 0 + } + }, + "total_time": { + "ms": 48 + } + }, + "primary": true, + "source": {}, + "stage": "DONE", + "start_time": { + "ms": 1605821233207 + }, + "stop_time": { + "ms": 1605821233384 + }, + "target": { + "host": "127.0.0.1", + "id": "Fkj12lAFQOex0DwK0HMwHw", + "name": "082618b4bb36" + }, + "total_time": { + "ms": 176 + }, + "translog": { + "count": 0, + "recovered": 0, + "total_on_start": 0, + "total_time": { + "ms": 116 + } + }, + "type": "EMPTY_STORE", + "verify_index": { + "check_index_time": { + "ms": 0 + }, + "total_time": { + "ms": 0 + } + } + } + } }, "event": { - "dataset": "elasticsearch.index.recovery", - "module": "elasticsearch", - "duration": 13551341 + "dataset": "elasticsearch.index.recovery", + "duration": 115000, + "module": "elasticsearch" }, "metricset": { - "name": "index_recovery", - "period": 10000 + "name": "index_recovery", + "period": 10000 }, - "elasticsearch": { - "cluster": { - "name": "docker-cluster", - "id": "xpHqTdNHR42BOj6-SponHw" - }, - "index": { - "recovery": { - "total_time": { - "ms": 153 - }, - "primary": true, - "translog": { - "count": 0, - "total_on_start": 0, - "total_time": { - "ms": 68 - }, - "recovered": 0 - }, - "source": {}, - "stop_time": { - "ms": 1604526809526 - }, - "start_time": { - "ms": 1604526809372 - }, - "stage": "DONE", - "id": 0, - "index": { - "size": { - "recovered": { - "bytes": 0 - }, - "total": { - "bytes": 0 - }, - "reused": { - "bytes": 0 - } - }, - "files": { - "count": 0, - "reused": 0, - "recovered": 0 - }, - "total_time": { - "ms": 75 - }, - "throttle_time": { - "source": { - "ms": 0 - }, - "target": { - "ms": 0 - } - } - }, - "verify_index": { - "check_index_time": { - "ms": 0 - }, - "total_time": { - "ms": 0 - } - }, - "type": "EMPTY_STORE", - "target": { - "host": "127.0.0.1", - "name": "a2627996e0b2", - "id": "SRIb1RkRRV2s08DGkteVMQ" - } - }, - "name": ".kibana_1" - } + "service": { + "address": "localhost:9200", + "name": "elasticsearch", + "type": "elasticsearch" } -} +} \ No newline at end of file diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/test/recovery.710.json b/metricbeat/module/elasticsearch/index_recovery/_meta/test/recovery.710.json new file mode 100644 index 00000000000..27727cfeedf --- /dev/null +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/test/recovery.710.json @@ -0,0 +1,296 @@ +{ + ".kibana-event-log-8.0.0-000001": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605819056123, + "stop_time_in_millis": 1605819058696, + "total_time_in_millis": 2573, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 1600, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 951 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + }, + "metricbeat-8.0.0-2020.11.19-000001": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605821233207, + "stop_time_in_millis": 1605821233384, + "total_time_in_millis": 176, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 48, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 116 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + }, + ".apm-custom-link": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605819052622, + "stop_time_in_millis": 1605819052858, + "total_time_in_millis": 235, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 129, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 96 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + }, + ".kibana_task_manager_1": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605819048103, + "stop_time_in_millis": 1605819048832, + "total_time_in_millis": 729, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 282, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 336 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + }, + ".apm-agent-configuration": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605819052947, + "stop_time_in_millis": 1605819053072, + "total_time_in_millis": 125, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 70, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 40 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + }, + ".kibana_1": { + "shards": [ + { + "id": 0, + "type": "EMPTY_STORE", + "stage": "DONE", + "primary": true, + "start_time_in_millis": 1605819048514, + "stop_time_in_millis": 1605819048834, + "total_time_in_millis": 319, + "source": {}, + "target": { + "id": "Fkj12lAFQOex0DwK0HMwHw", + "host": "127.0.0.1", + "transport_address": "127.0.0.1:9300", + "ip": "127.0.0.1", + "name": "082618b4bb36" + }, + "index": { + "size": { + "total_in_bytes": 0, + "reused_in_bytes": 0, + "recovered_in_bytes": 0, + "percent": "0.0%" + }, + "files": { + "total": 0, + "reused": 0, + "recovered": 0, + "percent": "0.0%" + }, + "total_time_in_millis": 59, + "source_throttle_time_in_millis": 0, + "target_throttle_time_in_millis": 0 + }, + "translog": { + "recovered": 0, + "total": 0, + "percent": "100.0%", + "total_on_start": 0, + "total_time_in_millis": 234 + }, + "verify_index": { + "check_index_time_in_millis": 0, + "total_time_in_millis": 0 + } + } + ] + } +} diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/test/root.710.json b/metricbeat/module/elasticsearch/index_recovery/_meta/test/root.710.json new file mode 100644 index 00000000000..e83ec9204b4 --- /dev/null +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/test/root.710.json @@ -0,0 +1,17 @@ +{ + "name": "a14cf47ef7f2", + "cluster_name": "docker-cluster", + "cluster_uuid": "8l_zoGznQRmtoX9iSC-goA", + "version": { + "number": "7.10.0", + "build_flavor": "default", + "build_type": "docker", + "build_hash": "43884496262f71aa3f33b34ac2f2271959dbf12a", + "build_date": "2020-10-28T09:54:14.068503Z", + "build_snapshot": true, + "lucene_version": "8.7.0", + "minimum_wire_compatibility_version": "7.11.0", + "minimum_index_compatibility_version": "7.0.0" + }, + "tagline": "You Know, for Search" +} diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index 19194e3161d..8de9f46179d 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -20,6 +20,10 @@ package index_recovery import ( + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "io/ioutil" + "net/http" + "net/http/httptest" "testing" "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" @@ -28,3 +32,53 @@ import ( func TestMapper(t *testing.T) { elasticsearch.TestMapperWithInfo(t, "./_meta/test/recovery.*.json", eventsMapping) } + +func createEsMuxer(esVersion, license string, ccrEnabled bool) *http.ServeMux { + nodesLocalHandler := func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte(`{"nodes": { "foobar": {}}}`)) + } + clusterStateMasterHandler := func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte(`{"master_node": "foobar"}`)) + } + rootHandler := func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != "/" { + http.NotFound(w, r) + } + + input, _ := ioutil.ReadFile("./_meta/test/root.710.json") + w.Write(input) + } + licenseHandler := func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte(`{ "license": { "type": "` + license + `" } }`)) + } + + mux := http.NewServeMux() + mux.Handle("/_nodes/_local/nodes", http.HandlerFunc(nodesLocalHandler)) + mux.Handle("/_cluster/state/master_node", http.HandlerFunc(clusterStateMasterHandler)) + mux.Handle("/", http.HandlerFunc(rootHandler)) + mux.Handle("/_license", http.HandlerFunc(licenseHandler)) // for 7.0 and above + mux.Handle("/_xpack/license", http.HandlerFunc(licenseHandler)) // for before 7.0 + + return mux +} + +func TestData(t *testing.T) { + mux := createEsMuxer("7.6.0", "platinum", false) + + server := httptest.NewServer(mux) + defer server.Close() + + ms := mbtest.NewReportingMetricSetV2Error(t, getConfig(server.URL)) + if err := mbtest.WriteEventsReporterV2Error(ms, t, ""); err != nil { + t.Fatal("write", err) + } +} + +func getConfig(host string) map[string]interface{} { + return map[string]interface{}{ + "module": elasticsearch.ModuleName, + "metricsets": []string{"index_recovery"}, + "hosts": []string{host}, + "index_recovery.active_only": false, + } +} From 6739ec46d5dfdbfad5ed0280945e6a7671b7a6c2 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Nov 2020 09:24:07 +0100 Subject: [PATCH 12/16] Maybe fix lint? --- .../elasticsearch/elasticsearch_integration_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index 76f2e45c524..c630f8d957f 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -261,10 +261,10 @@ func getConfig(metricset string, host string) map[string]interface{} { func getXPackConfig(host string) map[string]interface{} { return map[string]interface{}{ - "module": elasticsearch.ModuleName, - "metricsets": xpackMetricSets, - "hosts": []string{host}, - "xpack.enabled": true, + "module": elasticsearch.ModuleName, + "metricsets": xpackMetricSets, + "hosts": []string{host}, + "xpack.enabled": true, // index_recovery.active_only is part of the config of the index_recovery Metricset and it is required during the // test of that particular metricset to get some data from the ES node (instead of an empty JSON if set to true) "index_recovery.active_only": false, From f198cc008bc0e47326d46910655204cb73fa3ee9 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Nov 2020 10:55:04 +0100 Subject: [PATCH 13/16] Fix testdata test --- .../elasticsearch/index_recovery/_meta/data.json | 16 ++++++++-------- .../elasticsearch/index_recovery/data_test.go | 10 +++++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json index 0b68b587b87..bb175629a1f 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/data.json +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/data.json @@ -2,11 +2,11 @@ "@timestamp": "2017-10-12T08:05:34.853Z", "elasticsearch": { "cluster": { - "id": "RAwvZ-UnSTiUYHJ6fGjxmg", + "id": "8l_zoGznQRmtoX9iSC-goA", "name": "docker-cluster" }, "index": { - "name": "metricbeat-8.0.0-2020.11.19-000001", + "name": ".kibana-event-log-8.0.0-000001", "recovery": { "id": 0, "index": { @@ -35,17 +35,17 @@ } }, "total_time": { - "ms": 48 + "ms": 1600 } }, "primary": true, "source": {}, "stage": "DONE", "start_time": { - "ms": 1605821233207 + "ms": 1605819056123 }, "stop_time": { - "ms": 1605821233384 + "ms": 1605819058696 }, "target": { "host": "127.0.0.1", @@ -53,14 +53,14 @@ "name": "082618b4bb36" }, "total_time": { - "ms": 176 + "ms": 2573 }, "translog": { "count": 0, "recovered": 0, "total_on_start": 0, "total_time": { - "ms": 116 + "ms": 951 } }, "type": "EMPTY_STORE", @@ -85,7 +85,7 @@ "period": 10000 }, "service": { - "address": "localhost:9200", + "address": "127.0.0.1:50581", "name": "elasticsearch", "type": "elasticsearch" } diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index 8de9f46179d..e1518ee4d02 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -33,7 +33,7 @@ func TestMapper(t *testing.T) { elasticsearch.TestMapperWithInfo(t, "./_meta/test/recovery.*.json", eventsMapping) } -func createEsMuxer(esVersion, license string, ccrEnabled bool) *http.ServeMux { +func createEsMuxer(license string) *http.ServeMux { nodesLocalHandler := func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(`{"nodes": { "foobar": {}}}`)) } @@ -55,15 +55,19 @@ func createEsMuxer(esVersion, license string, ccrEnabled bool) *http.ServeMux { mux := http.NewServeMux() mux.Handle("/_nodes/_local/nodes", http.HandlerFunc(nodesLocalHandler)) mux.Handle("/_cluster/state/master_node", http.HandlerFunc(clusterStateMasterHandler)) - mux.Handle("/", http.HandlerFunc(rootHandler)) mux.Handle("/_license", http.HandlerFunc(licenseHandler)) // for 7.0 and above mux.Handle("/_xpack/license", http.HandlerFunc(licenseHandler)) // for before 7.0 + mux.Handle("/", http.HandlerFunc(rootHandler)) + mux.Handle("/_recovery", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + content, _ := ioutil.ReadFile("./_meta/test/recovery.710.json") + w.Write(content) + })) return mux } func TestData(t *testing.T) { - mux := createEsMuxer("7.6.0", "platinum", false) + mux := createEsMuxer("platinum") server := httptest.NewServer(mux) defer server.Close() From 36332e3245956d5b8a95f9b6253f3f54923fb2f8 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Nov 2020 13:42:41 +0100 Subject: [PATCH 14/16] Fix fields.go --- metricbeat/module/elasticsearch/fields.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 495bb3d0081..8cb0a887899 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 5bb0551b4b157dc0d7f76d2514ea2336b5a3bb02 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 1 Dec 2020 15:00:02 +0100 Subject: [PATCH 15/16] Modify fields.go --- metricbeat/module/elasticsearch/fields.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 8cb0a887899..5e0791e7a47 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From eca8d7b93385344b12508a61b290ca66d84f40ca Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 1 Dec 2020 15:20:52 +0100 Subject: [PATCH 16/16] Fix linting --- metricbeat/module/elasticsearch/index_recovery/data_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index e1518ee4d02..0cfd576237d 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -20,12 +20,13 @@ package index_recovery import ( - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "io/ioutil" "net/http" "net/http/httptest" "testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" )