Skip to content

Commit

Permalink
Rename nanos to ns (#2252)
Browse files Browse the repository at this point in the history 
See #2195 (comment)
  • Loading branch information
@ruflin @tsg
ruflin authored and tsg committed Aug 12, 2016
1 parent 3b115eb commit 10f3e0a
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion libbeat/docs/event-conventions.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ List of standardised words and units across all Beats:
* ms: millisecond, millis
* mb: megabytes
* msg: message
* nanos: nanoseconds
* ns: nanoseconds
* norm: normalized
* us: microseconds

8 changes: 4 additions & 4 deletions metricbeat/docs/fields.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2955,7 +2955,7 @@ Number of times tasks in a cgroup have been throttled (that is, not allowed to r


[float]
=== system.process.cgroup.cpu.stats.throttled.nanos
=== system.process.cgroup.cpu.stats.throttled.ns

type: long

Expand Down Expand Up @@ -2984,22 +2984,22 @@ Path to the cgroup relative to the cgroup subsystem's mountpoint.


[float]
=== system.process.cgroup.cpuacct.total.nanos
=== system.process.cgroup.cpuacct.total.ns

type: long

Total CPU time in nanoseconds consumed by all tasks in the cgroup.


[float]
=== system.process.cgroup.cpuacct.stats.user.nanos
=== system.process.cgroup.cpuacct.stats.user.ns

type: long

CPU time consumed by tasks in user mode.

[float]
=== system.process.cgroup.cpuacct.stats.system.nanos
=== system.process.cgroup.cpuacct.stats.system.ns

type: long

Expand Down
8 changes: 4 additions & 4 deletions metricbeat/etc/fields.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,7 @@
not allowed to run because they have exhausted all of the
available time as specified by their quota).
- name: stats.throttled.nanos
- name: stats.throttled.ns
type: long
description: >
The total time duration (in nanoseconds) for which tasks in a
Expand All @@ -1816,17 +1816,17 @@
Path to the cgroup relative to the cgroup subsystem's
mountpoint.
- name: total.nanos
- name: total.ns
type: long
description: >
Total CPU time in nanoseconds consumed by all tasks in the
cgroup.
- name: stats.user.nanos
- name: stats.user.ns
type: long
description: CPU time consumed by tasks in user mode.

- name: stats.system.nanos
- name: stats.system.ns
type: long
description: CPU time consumed by tasks in user (kernel) mode.

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/etc/kibana/index-pattern/metricbeat.json
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions metricbeat/metricbeat.template-es2x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1463,7 +1463,7 @@
},
"throttled": {
"properties": {
"nanos": {
"ns": {
"type": "long"
},
"periods": {
Expand Down Expand Up @@ -1491,14 +1491,14 @@
"properties": {
"system": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
},
"user": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
Expand All @@ -1507,7 +1507,7 @@
},
"total": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
Expand Down
8 changes: 4 additions & 4 deletions metricbeat/metricbeat.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@
},
"throttled": {
"properties": {
"nanos": {
"ns": {
"type": "long"
},
"periods": {
Expand All @@ -1480,14 +1480,14 @@
"properties": {
"system": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
},
"user": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
Expand All @@ -1496,7 +1496,7 @@
},
"total": {
"properties": {
"nanos": {
"ns": {
"type": "long"
}
}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/doc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ List of standardised words and units across all metricsets. On the left are the
* ms: millisecond, millis
* mb: megabytes
* msg: message
* nanos: nanoseconds
* ns: nanoseconds
* norm: normalized
* us: microseconds
Expand Down
8 changes: 4 additions & 4 deletions metricbeat/module/system/process/_meta/fields.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
not allowed to run because they have exhausted all of the
available time as specified by their quota).
- name: stats.throttled.nanos
- name: stats.throttled.ns
type: long
description: >
The total time duration (in nanoseconds) for which tasks in a
Expand All @@ -194,17 +194,17 @@
Path to the cgroup relative to the cgroup subsystem's
mountpoint.
- name: total.nanos
- name: total.ns
type: long
description: >
Total CPU time in nanoseconds consumed by all tasks in the
cgroup.
- name: stats.user.nanos
- name: stats.user.ns
type: long
description: CPU time consumed by tasks in user mode.

- name: stats.system.nanos
- name: stats.system.ns
type: long
description: CPU time consumed by tasks in user (kernel) mode.

Expand Down
8 changes: 4 additions & 4 deletions metricbeat/module/system/process/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func cgroupCPUToMapStr(cpu *cgroup.CPUSubsystem) common.MapStr {
"periods": cpu.Stats.Periods,
"throttled": common.MapStr{
"periods": cpu.Stats.ThrottledPeriods,
"nanos": cpu.Stats.ThrottledTimeNanos,
"ns": cpu.Stats.ThrottledTimeNanos,
},
},
}
Expand All @@ -187,15 +187,15 @@ func cgroupCPUAccountingToMapStr(cpuacct *cgroup.CPUAccountingSubsystem) common.
"id": cpuacct.ID,
"path": cpuacct.Path,
"total": common.MapStr{
"nanos": cpuacct.TotalNanos,
"ns": cpuacct.TotalNanos,
},
"percpu": perCPUUsage,
"stats": common.MapStr{
"system": common.MapStr{
"nanos": cpuacct.Stats.SystemNanos,
"ns": cpuacct.Stats.SystemNanos,
},
"user": common.MapStr{
"nanos": cpuacct.Stats.UserNanos,
"ns": cpuacct.Stats.UserNanos,
},
},
}
Expand Down

0 comments on commit 10f3e0a

Please sign in to comment.