Skip to content
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
6 changes: 5 additions & 1 deletion libbeat/scripts/generate_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,15 @@ def fill_field_properties(args, field, defaults, path):
}

elif field["type"] in ["geo_point", "date", "long", "integer",
"double", "float", "boolean"]:
"double", "float", "half_float", "boolean"]:
# Convert all integer fields to long
if field["type"] == "integer":
field["type"] = "long"

if args.es2x and field["type"] == "half_float":
# ES 2.x doesn't support half floats, so convert to floats
field["type"] = "float"

properties[field["name"]] = {
"type": field.get("type")
}
Expand Down
78 changes: 39 additions & 39 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Total number of kilobytes served.
[float]
=== apache.status.requests_per_sec

type: float
type: half_float

Requests per second.

Expand All @@ -87,7 +87,7 @@ Bytes per second.
[float]
=== apache.status.bytes_per_request

type: float
type: half_float

Bytes per request.

Expand Down Expand Up @@ -141,39 +141,39 @@ CPU stats.
[float]
=== apache.status.cpu.load

type: float
type: half_float

CPU Load.


[float]
=== apache.status.cpu.user

type: float
type: half_float

CPU user load.


[float]
=== apache.status.cpu.system

type: float
type: half_float

System cpu.


[float]
=== apache.status.cpu.children_user

type: float
type: half_float

CPU of children user.


[float]
=== apache.status.cpu.children_system

type: float
type: half_float

CPU of children system.

Expand Down Expand Up @@ -227,23 +227,23 @@ Load averages.
[float]
=== apache.status.load.1

type: float
type: half_float

Load average for the last minute.


[float]
=== apache.status.load.5

type: float
type: half_float

Load average for the last 5 minutes.


[float]
=== apache.status.load.15

type: float
type: half_float

Load average for the last 15 minutes.

Expand Down Expand Up @@ -1333,31 +1333,31 @@ Redis CPU stats
[float]
=== redis.info.cpu.used.sys

type: float
type: half_float

System CPU consumed by the Redis server.


[float]
=== redis.info.cpu.used.sys_children

type: float
type: half_float

User CPU consumed by the Redis server.


[float]
=== redis.info.cpu.used.user

type: float
type: half_float

System CPU consumed by the background processes.


[float]
=== redis.info.cpu.used.user_children

type: float
type: half_float

User CPU consumed by the background processes.

Expand Down Expand Up @@ -1899,7 +1899,7 @@ CPU Core number.
[float]
=== system.core.user.pct

type: float
type: half_float

The percentage of CPU time spent in user space. On multi-core systems, you can have percentages that are greater than 100%. For example, if 3 cores are at 60% use, then the `cpu.user_p` will be 180%.

Expand All @@ -1915,7 +1915,7 @@ The amount of CPU time spent in user space.
[float]
=== system.core.system.pct

type: float
type: half_float

The percentage of CPU time spent in kernel space.

Expand All @@ -1931,7 +1931,7 @@ The amount of CPU time spent in kernel space.
[float]
=== system.core.nice.pct

type: float
type: half_float

The percentage of CPU time spent on low-priority processes.

Expand All @@ -1947,7 +1947,7 @@ The amount of CPU time spent on low-priority processes.
[float]
=== system.core.idle.pct

type: float
type: half_float

The percentage of CPU time spent idle.

Expand All @@ -1963,7 +1963,7 @@ The amount of CPU time spent idle.
[float]
=== system.core.iowait.pct

type: float
type: half_float

The percentage of CPU time spent in wait (on disk).

Expand All @@ -1979,7 +1979,7 @@ The amount of CPU time spent in wait (on disk).
[float]
=== system.core.irq.pct

type: float
type: half_float

The percentage of CPU time spent servicing and handling hardware interrupts.

Expand All @@ -1995,7 +1995,7 @@ The amount of CPU time spent servicing and handling hardware interrupts.
[float]
=== system.core.softirq.pct

type: float
type: half_float

The percentage of CPU time spent servicing and handling software interrupts.

Expand All @@ -2011,7 +2011,7 @@ The amount of CPU time spent servicing and handling software interrupts.
[float]
=== system.core.steal.pct

type: float
type: half_float

The percentage of CPU time spent in involuntary wait by the virtual CPU while the hypervisor was servicing another processor. Available only on Unix.

Expand All @@ -2034,63 +2034,63 @@ The amount of CPU time spent in involuntary wait by the virtual CPU while the hy
[float]
=== system.cpu.user.pct

type: float
type: half_float

The percentage of CPU time spent in user space. On multi-core systems, you can have percentages that are greater than 100%. For example, if 3 cores are at 60% use, then the `cpu.user_p` will be 180%.


[float]
=== system.cpu.system.pct

type: float
type: half_float

The percentage of CPU time spent in kernel space.


[float]
=== system.cpu.nice.pct

type: float
type: half_float

The percentage of CPU time spent on low-priority processes.


[float]
=== system.cpu.idle.pct

type: float
type: half_float

The percentage of CPU time spent idle.


[float]
=== system.cpu.iowait.pct

type: float
type: half_float

The percentage of CPU time spent in wait (on disk).


[float]
=== system.cpu.irq.pct

type: float
type: half_float

The percentage of CPU time spent servicing and handling hardware interrupts.


[float]
=== system.cpu.softirq.pct

type: float
type: half_float

The percentage of CPU time spent servicing and handling software interrupts.


[float]
=== system.cpu.steal.pct

type: float
type: half_float

The percentage of CPU time spent in involuntary wait by the virtual CPU while the hypervisor was servicing another processor. Available only on Unix.

Expand Down Expand Up @@ -2169,23 +2169,23 @@ Load averages.
[float]
=== system.cpu.load.1

type: float
type: half_float

Load average for the last minute.


[float]
=== system.cpu.load.5

type: float
type: half_float

Load average for the last 5 minutes.


[float]
=== system.cpu.load.15

type: float
type: half_float

Load average for the last 15 minutes.

Expand Down Expand Up @@ -2345,7 +2345,7 @@ The used disk space in bytes.
[float]
=== system.filesystem.used.pct

type: float
type: half_float

The percentage of used disk space.

Expand Down Expand Up @@ -2435,7 +2435,7 @@ Available memory.
[float]
=== system.memory.used.pct

type: float
type: half_float

The percentage of used memory.

Expand Down Expand Up @@ -2466,7 +2466,7 @@ Actual available memory. This value is the "free" memory plus the memory used fo
[float]
=== system.memory.actual.used.pct

type: float
type: half_float

The percentage of actual used memory.

Expand Down Expand Up @@ -2504,7 +2504,7 @@ Available swap memory.
[float]
=== system.memory.swap.used.pct

type: float
type: half_float

The percentage of used swap memory.

Expand Down Expand Up @@ -2662,7 +2662,7 @@ The amount of CPU time the process spent in user space.
[float]
=== system.process.cpu.total.pct

type: float
type: half_float

The percentage of CPU time spent by the process since the last update. Its value is similar to the %CPU value of the process displayed by the top command on Unix systems.

Expand Down Expand Up @@ -2716,7 +2716,7 @@ The Resident Set Size. The amount of memory the process occupied in main memory
[float]
=== system.process.memory.rss.pct

type: float
type: half_float

The percentage of memory the process occupied in main memory (RAM).

Expand Down
Loading