Skip to content

Commit 2a43177

Browse files
authored
[chore][receiver/hostmetricsreceiver] sort metadata.yaml entries (#43496)
#### Description Sort metadata.yaml file in preparation for sort validation using mdatagen. Context: open-telemetry/opentelemetry-collector#13782 Signed-off-by: Paulo Dias <[email protected]>
1 parent 9cf4990 commit 2a43177

File tree

9 files changed

+215
-223
lines changed

9 files changed

+215
-223
lines changed

receiver/hostmetricsreceiver/internal/scraper/cpuscraper/metadata.yaml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,19 @@ attributes:
2121
enum: [idle, interrupt, nice, softirq, steal, system, user, wait]
2222

2323
metrics:
24-
system.cpu.time:
25-
enabled: true
26-
description: Total seconds each logical CPU spent on each mode.
27-
unit: s
28-
stability:
29-
level: development
30-
sum:
31-
value_type: double
32-
aggregation_temporality: cumulative
33-
monotonic: true
34-
attributes: [cpu, state]
35-
36-
system.cpu.utilization:
24+
system.cpu.frequency:
3725
enabled: false
38-
description: Difference in system.cpu.time since the last measurement per logical CPU, divided by the elapsed time (value in interval [0,1]).
39-
unit: "1"
26+
description: Current frequency of the CPU core in Hz.
27+
unit: "Hz"
4028
stability:
4129
level: development
4230
gauge:
4331
value_type: double
44-
attributes: [cpu, state]
32+
attributes: [cpu]
4533

46-
system.cpu.physical.count:
34+
system.cpu.logical.count:
4735
enabled: false
48-
description: Number of available physical CPUs.
36+
description: Number of available logical CPUs.
4937
unit: "{cpu}"
5038
stability:
5139
level: development
@@ -54,9 +42,9 @@ metrics:
5442
monotonic: false
5543
aggregation_temporality: cumulative
5644

57-
system.cpu.logical.count:
45+
system.cpu.physical.count:
5846
enabled: false
59-
description: Number of available logical CPUs.
47+
description: Number of available physical CPUs.
6048
unit: "{cpu}"
6149
stability:
6250
level: development
@@ -65,12 +53,24 @@ metrics:
6553
monotonic: false
6654
aggregation_temporality: cumulative
6755

68-
system.cpu.frequency:
56+
system.cpu.time:
57+
enabled: true
58+
description: Total seconds each logical CPU spent on each mode.
59+
unit: s
60+
stability:
61+
level: development
62+
sum:
63+
value_type: double
64+
aggregation_temporality: cumulative
65+
monotonic: true
66+
attributes: [cpu, state]
67+
68+
system.cpu.utilization:
6969
enabled: false
70-
description: Current frequency of the CPU core in Hz.
71-
unit: "Hz"
70+
description: Difference in system.cpu.time since the last measurement per logical CPU, divided by the elapsed time (value in interval [0,1]).
71+
unit: "1"
7272
stability:
7373
level: development
7474
gauge:
7575
value_type: double
76-
attributes: [cpu]
76+
attributes: [cpu, state]

receiver/hostmetricsreceiver/internal/scraper/diskscraper/metadata.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metrics:
3232
aggregation_temporality: cumulative
3333
monotonic: true
3434
attributes: [device, direction]
35-
system.disk.operations:
36-
enabled: true
37-
description: Disk operations count.
38-
unit: "{operations}"
39-
stability:
40-
level: development
41-
sum:
42-
value_type: int
43-
aggregation_temporality: cumulative
44-
monotonic: true
45-
attributes: [device, direction]
4635

4736
system.disk.io_time:
4837
enabled: true
@@ -55,6 +44,17 @@ metrics:
5544
aggregation_temporality: cumulative
5645
monotonic: true
5746
attributes: [device]
47+
system.disk.merged:
48+
enabled: true
49+
description: The number of disk reads/writes merged into single physical disk access operations.
50+
unit: "{operations}"
51+
stability:
52+
level: development
53+
sum:
54+
value_type: int
55+
aggregation_temporality: cumulative
56+
monotonic: true
57+
attributes: [device, direction]
5858
system.disk.operation_time:
5959
enabled: true
6060
description: Time spent in disk operations.
@@ -66,17 +66,17 @@ metrics:
6666
aggregation_temporality: cumulative
6767
monotonic: true
6868
attributes: [device, direction]
69-
system.disk.weighted_io_time:
69+
system.disk.operations:
7070
enabled: true
71-
description: Time disk spent activated multiplied by the queue length.
72-
unit: s
71+
description: Disk operations count.
72+
unit: "{operations}"
7373
stability:
7474
level: development
7575
sum:
76-
value_type: double
76+
value_type: int
7777
aggregation_temporality: cumulative
7878
monotonic: true
79-
attributes: [device]
79+
attributes: [device, direction]
8080

8181
system.disk.pending_operations:
8282
enabled: true
@@ -89,14 +89,14 @@ metrics:
8989
aggregation_temporality: cumulative
9090
monotonic: false
9191
attributes: [device]
92-
system.disk.merged:
92+
system.disk.weighted_io_time:
9393
enabled: true
94-
description: The number of disk reads/writes merged into single physical disk access operations.
95-
unit: "{operations}"
94+
description: Time disk spent activated multiplied by the queue length.
95+
unit: s
9696
stability:
9797
level: development
9898
sum:
99-
value_type: int
99+
value_type: double
100100
aggregation_temporality: cumulative
101101
monotonic: true
102-
attributes: [device, direction]
102+
attributes: [device]

receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/metadata.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ attributes:
3333
description: Filesystem type, such as, "ext4", "tmpfs", etc.
3434

3535
metrics:
36-
system.filesystem.usage:
36+
system.filesystem.inodes.usage:
3737
enabled: true
38-
description: Filesystem bytes used.
39-
unit: By
38+
description: FileSystem inodes used.
39+
unit: "{inodes}"
4040
stability:
4141
level: development
4242
sum:
@@ -45,10 +45,10 @@ metrics:
4545
monotonic: false
4646
attributes: [device, mode, mountpoint, type, state]
4747

48-
system.filesystem.inodes.usage:
48+
system.filesystem.usage:
4949
enabled: true
50-
description: FileSystem inodes used.
51-
unit: "{inodes}"
50+
description: Filesystem bytes used.
51+
unit: By
5252
stability:
5353
level: development
5454
sum:

receiver/hostmetricsreceiver/internal/scraper/loadscraper/metadata.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ status:
1111
sem_conv_version: 1.9.0
1212

1313
metrics:
14-
system.cpu.load_average.1m:
14+
system.cpu.load_average.15m:
1515
enabled: true
16-
description: Average CPU Load over 1 minute.
16+
description: Average CPU Load over 15 minutes.
1717
unit: "{thread}"
1818
stability:
1919
level: development
2020
gauge:
2121
value_type: double
2222

23-
system.cpu.load_average.5m:
23+
system.cpu.load_average.1m:
2424
enabled: true
25-
description: Average CPU Load over 5 minutes.
25+
description: Average CPU Load over 1 minute.
2626
unit: "{thread}"
2727
stability:
2828
level: development
2929
gauge:
3030
value_type: double
3131

32-
system.cpu.load_average.15m:
32+
system.cpu.load_average.5m:
3333
enabled: true
34-
description: Average CPU Load over 15 minutes.
34+
description: Average CPU Load over 5 minutes.
3535
unit: "{thread}"
3636
stability:
3737
level: development

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/metadata.yaml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ attributes:
1717
enum: [buffered, cached, inactive, free, slab_reclaimable, slab_unreclaimable, used]
1818

1919
metrics:
20-
system.memory.limit:
20+
system.linux.memory.available:
2121
enabled: false
22-
description: Total bytes of memory available.
22+
description: An estimate of how much memory is available for starting new applications, without swapping. This is a more accurate alternative than system.memory.usage with state=free. (Linux only)
2323
unit: By
2424
stability:
2525
level: development
@@ -28,27 +28,26 @@ metrics:
2828
aggregation_temporality: cumulative
2929
monotonic: false
3030

31-
system.memory.usage:
32-
enabled: true
33-
description: Bytes of memory in use.
31+
system.linux.memory.dirty:
32+
enabled: false
33+
description: The amount of dirty memory according to `/proc/meminfo`.
3434
unit: By
3535
stability:
3636
level: development
3737
sum:
3838
value_type: int
3939
aggregation_temporality: cumulative
4040
monotonic: false
41-
attributes: [state]
42-
43-
system.memory.utilization:
41+
system.memory.limit:
4442
enabled: false
45-
description: Percentage of memory bytes in use.
46-
unit: "1"
43+
description: Total bytes of memory available.
44+
unit: By
4745
stability:
4846
level: development
49-
gauge:
50-
value_type: double
51-
attributes: [state]
47+
sum:
48+
value_type: int
49+
aggregation_temporality: cumulative
50+
monotonic: false
5251

5352
system.memory.page_size:
5453
enabled: false
@@ -61,24 +60,24 @@ metrics:
6160
aggregation_temporality: cumulative
6261
monotonic: false
6362

64-
system.linux.memory.available:
65-
enabled: false
66-
description: An estimate of how much memory is available for starting new applications, without swapping. This is a more accurate alternative than system.memory.usage with state=free. (Linux only)
63+
system.memory.usage:
64+
enabled: true
65+
description: Bytes of memory in use.
6766
unit: By
6867
stability:
6968
level: development
7069
sum:
7170
value_type: int
7271
aggregation_temporality: cumulative
7372
monotonic: false
73+
attributes: [state]
7474

75-
system.linux.memory.dirty:
75+
system.memory.utilization:
7676
enabled: false
77-
description: The amount of dirty memory according to `/proc/meminfo`.
78-
unit: By
77+
description: Percentage of memory bytes in use.
78+
unit: "1"
7979
stability:
8080
level: development
81-
sum:
82-
value_type: int
83-
aggregation_temporality: cumulative
84-
monotonic: false
81+
gauge:
82+
value_type: double
83+
attributes: [state]

receiver/hostmetricsreceiver/internal/scraper/networkscraper/metadata.yaml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,37 @@ attributes:
2727
type: string
2828

2929
metrics:
30-
system.network.packets:
30+
system.network.connections:
3131
enabled: true
32-
description: The number of packets transferred.
33-
unit: "{packets}"
32+
description: The number of connections.
33+
unit: "{connections}"
3434
stability:
3535
level: development
3636
sum:
3737
value_type: int
3838
aggregation_temporality: cumulative
39-
monotonic: true
40-
attributes: [device, direction]
39+
monotonic: false
40+
attributes: [protocol, state]
41+
system.network.conntrack.count:
42+
enabled: false
43+
description: The count of entries in conntrack table.
44+
unit: "{entries}"
45+
stability:
46+
level: development
47+
sum:
48+
value_type: int
49+
aggregation_temporality: cumulative
50+
monotonic: false
51+
system.network.conntrack.max:
52+
enabled: false
53+
description: The limit for entries in the conntrack table.
54+
unit: "{entries}"
55+
stability:
56+
level: development
57+
sum:
58+
value_type: int
59+
aggregation_temporality: cumulative
60+
monotonic: false
4161
system.network.dropped:
4262
enabled: true
4363
description: The number of packets dropped.
@@ -71,34 +91,14 @@ metrics:
7191
aggregation_temporality: cumulative
7292
monotonic: true
7393
attributes: [device, direction]
74-
system.network.connections:
94+
system.network.packets:
7595
enabled: true
76-
description: The number of connections.
77-
unit: "{connections}"
78-
stability:
79-
level: development
80-
sum:
81-
value_type: int
82-
aggregation_temporality: cumulative
83-
monotonic: false
84-
attributes: [protocol, state]
85-
system.network.conntrack.count:
86-
enabled: false
87-
description: The count of entries in conntrack table.
88-
unit: "{entries}"
89-
stability:
90-
level: development
91-
sum:
92-
value_type: int
93-
aggregation_temporality: cumulative
94-
monotonic: false
95-
system.network.conntrack.max:
96-
enabled: false
97-
description: The limit for entries in the conntrack table.
98-
unit: "{entries}"
96+
description: The number of packets transferred.
97+
unit: "{packets}"
9998
stability:
10099
level: development
101100
sum:
102101
value_type: int
103102
aggregation_temporality: cumulative
104-
monotonic: false
103+
monotonic: true
104+
attributes: [device, direction]

0 commit comments

Comments
 (0)