Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename object-type to object_type #3655

Merged
merged 1 commit into from
Feb 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libbeat/_meta/fields.common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

- name: fields
type: object
object-type: keyword
object_type: keyword
description: >
Contains user configurable fields.

4 changes: 2 additions & 2 deletions libbeat/scripts/generate_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def fill_field_properties(args, field, defaults, path):
}

elif field["type"] in ["object"]:
if field.get("object-type") == "text":
if field.get("object_type") == "text":
# add a dynamic template to set all members of
# the object as text
if len(path) > 0:
Expand Down Expand Up @@ -288,7 +288,7 @@ def fill_field_properties(args, field, defaults, path):
}
})

if field.get("object-type") == "long":
if field.get("object_type") == "long":
if len(path) > 0:
name = path + "." + field["name"]
else:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/docker/container/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
Size of the files that have been created or changed since creation.
- name: labels
type: object
object-type: keyword
object_type: keyword
description: >
Image labels.
- name: tags
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/docker/image/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

- name: labels
type: object
object-type: keyword
object_type: keyword
description: >
Image labels.

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/system/process/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
domain and is formatted as `domain\username`.
- name: env
type: object
object-type: keyword
object_type: keyword
description: >
The environment variables used to start the process. The data is
available on FreeBSD, Linux, and OS X.
Expand Down Expand Up @@ -236,7 +236,7 @@

- name: percpu
type: object
object-type: long
object_type: long
description: >
CPU time (in nanoseconds) consumed on each CPU by all tasks in
this cgroup.
Expand Down
8 changes: 4 additions & 4 deletions packetbeat/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@

- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
Message header field table.

Expand Down Expand Up @@ -829,7 +829,7 @@

- name: supported
type: object
object-type: keyword
object_type: keyword
description: Indicates which startup options are supported by the server. This message comes as a response to an OPTIONS message.

- name: authentication
Expand Down Expand Up @@ -1177,7 +1177,7 @@
and the form values are set in the HTTP body when the content-type is set to `x-www-form-urlencoded`.
- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
A map containing the captured header fields from the request.
Which headers to capture is configurable. If headers with the same
Expand All @@ -1201,7 +1201,7 @@

- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
A map containing the captured header fields from the response.
Which headers to capture is configurable. If headers with the
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/protos/amqp/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@

- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
Message header field table.

Expand Down
2 changes: 1 addition & 1 deletion packetbeat/protos/cassandra/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

- name: supported
type: object
object-type: keyword
object_type: keyword
description: Indicates which startup options are supported by the server. This message comes as a response to an OPTIONS message.

- name: authentication
Expand Down
4 changes: 2 additions & 2 deletions packetbeat/protos/http/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
and the form values are set in the HTTP body when the content-type is set to `x-www-form-urlencoded`.
- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
A map containing the captured header fields from the request.
Which headers to capture is configurable. If headers with the same
Expand All @@ -40,7 +40,7 @@

- name: headers
type: object
object-type: keyword
object_type: keyword
description: >
A map containing the captured header fields from the response.
Which headers to capture is configurable. If headers with the
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

- name: event_data
type: object
object-type: keyword
object_type: keyword
required: false
description: >
The event-specific data. This field is mutually exclusive with
Expand Down Expand Up @@ -151,7 +151,7 @@

- name: user_data
type: object
object-type: keyword
object_type: keyword
required: false
description: >
The event specific data. This field is mutually exclusive with
Expand Down