Skip to content

Commit 105b187

Browse files
committed
cri stats: drop unused changes
Signed-off-by: Peter Hunt <[email protected]>
1 parent aff8aed commit 105b187

File tree

1 file changed

+1
-51
lines changed
  • keps/sig-node/2371-cri-pod-container-stats

1 file changed

+1
-51
lines changed

keps/sig-node/2371-cri-pod-container-stats/README.md

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ These correspond to some fields of the [ContainerStats](#summary-container-stats
304304
+ // Corresponds to Stats Summary API CPUStats UsageCoreNanoSeconds
305305
= UInt64Value usage_core_nano_seconds = 2;
306306
+ // Total CPU usage (sum of all cores) averaged over the sample window.
307-
+ UInt64Value usage_nano_seconds = 3;
307+
+ UInt64Value usage_nano_cores = 3;
308308
=}
309309
310310
=// MemoryUsage provides the memory usage information.
@@ -331,58 +331,8 @@ These correspond to some fields of the [ContainerStats](#summary-container-stats
331331
+ // Cumulative number of major page faults.
332332
+ Uint64Value major_page_faults = 6;
333333
=}
334-
335-
=// FilesystemUsage provides the filesystem usage information.
336-
=message FilesystemUsage {
337-
= // Timestamp in nanoseconds at which the information were collected. Must be > 0.
338-
+ // Corresponds to Stats Summary API FsStats Time field
339-
= int64 timestamp = 1;
340-
= // The unique identifier of the filesystem.
341-
+ // Does not correspond to any field in Stats Summary API FsStats
342-
= FilesystemIdentifier fs_id = 2;
343-
= // UsedBytes represents the bytes used for images on the filesystem.
344-
= // This may differ from the total bytes used on the filesystem and may not
345-
= // equal CapacityBytes - AvailableBytes.
346-
= // Corresponds to Stats Summary API FsStats UsedBytes field
347-
= UInt64Value used_bytes = 3;
348-
= // InodesUsed represents the inodes used by the images.
349-
= // This may not equal InodesCapacity - InodesAvailable because the underlying
350-
= // filesystem may also be used for purposes other than storing images.
351-
= // Corresponds to Stats Summary API FsStats InodesUsed field
352-
= UInt64Value inodes_used = 4;
353-
+ // TODO: Unclear how the remaining fields relate to container stats. Is it filled in cAdvisor?
354-
+ // AvailableBytes represents the storage space available (bytes) for the filesystem.
355-
+ UInt64Value available_bytes = 5;
356-
+ // CapacityBytes represents the total capacity (bytes) of the filesystems underlying storage.
357-
+ UInt64Value capacity_bytes = 6;
358-
+ // InodesFree represents the free inodes in the filesystem.
359-
+ UInt64Value inodes_free = 7;
360-
+ // Inodes represents the total inodes in the filesystem.
361-
+ UInt64Value inodes = 8;
362-
=}
363334
```
364335

365-
All together, below is the proposition for the new `ContainerStats` object:
366-
```
367-
=// ContainerStats provides the resource usage statistics for a container.
368-
=message ContainerStats {
369-
= // Information of the container.
370-
+ // Corresponds to the Stats Summary API ContainerStats Name field
371-
= ContainerAttributes attributes = 1;
372-
= // CPU usage gathered from the container.
373-
+ // Corresponds to Stats Summary API ContainerStats CPUStats field
374-
= CpuUsage cpu = 2;
375-
= // Memory usage gathered from the container.
376-
+ // Corresponds to Stats Summary API ContainerStats MemoryStats field
377-
= MemoryUsage memory = 3;
378-
= // Usage of the writable layer.
379-
+ // Corresponds to Stats Summary API ContainerStats Rootfs field
380-
= FilesystemUsage writable_layer = 4;
381-
+ // Stats pertaining to container logs usage of filesystem resources
382-
+ // Logs.UsedBytes is the number of bytes used for the container logs.
383-
+ FilesystemUsage logs = 5;
384-
=}
385-
```
386336
Notes:
387337
- In Stats Summary API ContainerStats object, there's a timestamp field. We do not need such a field, as each struct in the ContainerStats object
388338
has its own timestamp, allowing CRI implementations flexibility when they collect which metrics.

0 commit comments

Comments
 (0)