Add new cgroup metrics metadata (DataDog#20564)

* Add new cgroup metrics metadata

Follow up of DataDog/datadog-agent#37328 which
adds additional memory metrics from cgroup.

* Add docs about extended metrics

* Improve public docs

- add mentions of the flag they enabled with

---------

Co-authored-by: Dmitry <dmitry.ponomarev@datadoghq.com>

Author: bonnefoa

container/README.md

@@ -20,7 +20,7 @@ The `container` check requires some folders to be mounted to allow for automatic
 
 ### Configuration
 
-The `container` check does not expose any specific configuration settings. To customize common fields or to force the activation of the `container` check, follow these steps:
+The `container` check exposes specific configuration settings to emit extended memory metrics in addition to standard set. To customize common fields or to force the activation of the `container` check, follow these steps:
 
 1. Create the `container.d/conf.yaml` file in the `conf.d/` folder at the root of your Agent's configuration directory.
 
@@ -39,6 +39,8 @@ Some metrics may not be available depending on your environment (Linux / Windows
 
 See [metadata.csv][3] for a list of metrics provided by this integration.
 
+If you need extended container memory metrics `extended_memory_metrics` has to be set to `true`. It will enable following metrics: active_anon, inactive_anon, active_file, inactive_file, unevictable, shmem, file_mapped, file_dirty, file_writeback, page_tables, refault_anon, refault_file
+
 ## Troubleshooting
 
 Need help? Contact [Datadog support][1].

container/metadata.csv

@@ -1,34 +1,46 @@
-metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name,curated_metric
-container.cpu.limit,gauge,,nanocore,,The maximum CPU time available to the container,0,container,cpu_limit,
-container.cpu.system,gauge,,nanocore,,The container system CPU usage,0,container,cpu_system,
-container.cpu.throttled,gauge,,nanosecond,,The total cpu throttled time,0,container,cpu_throttled,
-container.cpu.throttled.periods,gauge,,,,The number of periods during which the container was throttled,0,container,cpu_throttled_periods,
-container.cpu.usage,gauge,,nanocore,,The container total CPU Usage,0,container,cpu_total,
-container.cpu.user,gauge,,nanocore,,The container userspace CPU usage,0,container,cpu_user,
-container.io.read,gauge,,byte,,The number of bytes read from disks by this container,0,container,io_read,
-container.io.read.operations,gauge,,,,The number of read operations done by this container,0,container,io_read_ops,
-container.io.write,gauge,,byte,,The number of bytes written to disks by this container,0,container,io_write,
-container.io.write.operations,gauge,,,,The number of write operations done by this container,0,container,io_write_ops,
-container.memory.cache,gauge,,byte,,The container cache usage,0,container,mem_cache,
-container.memory.commit,gauge,,byte,,The container commit memory usage,0,container,mem_commit,
-container.memory.commit.peak,gauge,,byte,,The container peak commit memory usage,0,container,mem_commit_peak,
-container.memory.kernel,gauge,,byte,,The container kernel memory usage,0,container,mem_kernel_usage,
-container.memory.limit,gauge,,byte,,The container memory limit,0,container,mem_limit,
-container.memory.major_page_faults,count,,,,Number of major page faults incurred,0,container,pgmajfault,
-container.memory.oom_events,gauge,,,,The number of OOM events triggered by the container,0,container,mem_oom_events,
-container.memory.page_faults,count,,,,Total number of page faults incurred,0,container,pgfault,
-container.memory.rss,gauge,,byte,,The container RSS usage,0,container,mem_rss,
-container.memory.soft_limit,gauge,,byte,,The container memory soft limit,0,container,mem_soft_limit,
-container.memory.swap,gauge,,byte,,The container swap usage,0,container,mem_swap,
-container.memory.usage,gauge,,byte,,The container total memory usage,0,container,mem_usage,
-container.memory.usage.peak,gauge,,byte,,The maximum memory usage recorded since the container started,0,container,mem_usage_peak,
-container.memory.working_set,gauge,,byte,,The container working set usage,0,container,mem_workingset,
-container.net.rcvd,gauge,,byte,,The number of network bytes received (per interface),0,container,net_sent,
-container.net.rcvd.packets,gauge,,,,The number of network packets received (per interface),0,container,net_p_rcvd,
-container.net.sent,gauge,,byte,,The number of network bytes sent (per interface),0,container,net_sent,
-container.net.sent.packets,gauge,,,,The number of network packets sent (per interface),0,container,net_p_sent,
-container.pid.open_files,gauge,,,,The number of open file descriptors (Linux only),0,container,open_files,
-container.pid.thread_count,gauge,,,,The number of threads running inside this container,0,container,thread_count,
-container.pid.thread_limit,gauge,,,,The maximum number of threads for this container,0,container,thread_limit,
-container.restarts,gauge,,,,The number of container restarted,0,container,restarts,
-container.uptime,gauge,,second,,The container uptime,0,container,uptime,
+metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name,curated_metric,sample_tags
+container.cpu.limit,gauge,,nanocore,,The maximum CPU time available to the container,0,container,cpu_limit,,
+container.cpu.system,gauge,,nanocore,,The container system CPU usage,0,container,cpu_system,,
+container.cpu.throttled,gauge,,nanosecond,,The total cpu throttled time,0,container,cpu_throttled,,
+container.cpu.throttled.periods,gauge,,,,The number of periods during which the container was throttled,0,container,cpu_throttled_periods,,
+container.cpu.usage,gauge,,nanocore,,The container total CPU Usage,0,container,cpu_total,,
+container.cpu.user,gauge,,nanocore,,The container userspace CPU usage,0,container,cpu_user,,
+container.io.read,gauge,,byte,,The number of bytes read from disks by this container,0,container,io_read,,
+container.io.read.operations,gauge,,,,The number of read operations done by this container,0,container,io_read_ops,,
+container.io.write,gauge,,byte,,The number of bytes written to disks by this container,0,container,io_write,,
+container.io.write.operations,gauge,,,,The number of write operations done by this container,0,container,io_write_ops,,
+container.memory.active_anon,gauge,,byte,,The container active anonymous memory (requires extended_memory_metrics flag in the check config),0,container,mem_active_anon,,
+container.memory.active_file,gauge,,byte,,The container active file-backed memory (requires extended_memory_metrics flag in the check config),0,container,mem_active_file,,
+container.memory.cache,gauge,,byte,,The container cache usage,0,container,mem_cache,,
+container.memory.commit,gauge,,byte,,The container commit memory usage,0,container,mem_commit,,
+container.memory.commit.peak,gauge,,byte,,The container peak commit memory usage,0,container,mem_commit_peak,,
+container.memory.file_dirty,gauge,,byte,,The container memory that are waiting to get written back to the disk (requires extended_memory_metrics flag in the check config),0,container,mem_dirty,,
+container.memory.file_mapped,gauge,,byte,,The container mapped file memory (requires extended_memory_metrics flag in the check config),0,container,mem_file_mapped,,
+container.memory.file_writeback,gauge,,byte,,The container memory that is queued for syncing to disk (requires extended_memory_metrics flag in the check config),0,container,mem_writeback,,
+container.memory.inactive_anon,gauge,,byte,,The container inactive anonymous memory (requires extended_memory_metrics flag in the check config),0,container,mem_inactive_anon,,
+container.memory.inactive_file,gauge,,byte,,The container inactive file-backed memory (requires extended_memory_metrics flag in the check config),0,container,mem_inactive_file,,
+container.memory.kernel,gauge,,byte,,The container kernel memory usage,0,container,mem_kernel_usage,,
+container.memory.limit,gauge,,byte,,The container memory limit,0,container,mem_limit,,
+container.memory.major_page_faults,count,,,,Number of major page faults incurred,0,container,pgmajfault,,
+container.memory.oom_events,gauge,,,,The number of OOM events triggered by the container,0,container,mem_oom_events,,
+container.memory.page_faults,count,,,,Total number of page faults incurred,0,container,pgfault,,
+container.memory.page_tables,gauge,,byte,,The container memory allocated for page tables (requires extended_memory_metrics flag in the check config),0,container,mem_pagetables,,
+container.memory.refault_anon,count,,byte,,The number of refaults of previously evicted anonymous pages (requires extended_memory_metrics flag in the check config),-1,container,mem_refault_anon,,
+container.memory.refault_file,count,,byte,,The number of refaults of previously evicted file pages (requires extended_memory_metrics flag in the check config),-1,container,mem_refault_page,,
+container.memory.rss,gauge,,byte,,The container RSS usage,0,container,mem_rss,,
+container.memory.shmem,gauge,,byte,,"The container swap-backed memory such as tmpfs (requires extended_memory_metrics flag in the check config), shm segments...",0,container,mem_shmem,,
+container.memory.soft_limit,gauge,,byte,,The container memory soft limit,0,container,mem_soft_limit,,
+container.memory.swap,gauge,,byte,,The container swap usage,0,container,mem_swap,,
+container.memory.unevictable,gauge,,byte,,The container memory that can't be reclaimed (requires extended_memory_metrics flag in the check config),0,container,mem_unevictable,,
+container.memory.usage,gauge,,byte,,The container total memory usage,0,container,mem_usage,,
+container.memory.usage.peak,gauge,,byte,,The maximum memory usage recorded since the container started,0,container,mem_usage_peak,,
+container.memory.working_set,gauge,,byte,,The container working set usage,0,container,mem_workingset,,
+container.net.rcvd,gauge,,byte,,The number of network bytes received (per interface),0,container,net_sent,,
+container.net.rcvd.packets,gauge,,,,The number of network packets received (per interface),0,container,net_p_rcvd,,
+container.net.sent,gauge,,byte,,The number of network bytes sent (per interface),0,container,net_sent,,
+container.net.sent.packets,gauge,,,,The number of network packets sent (per interface),0,container,net_p_sent,,
+container.pid.open_files,gauge,,,,The number of open file descriptors (Linux only),0,container,open_files,,
+container.pid.thread_count,gauge,,,,The number of threads running inside this container,0,container,thread_count,,
+container.pid.thread_limit,gauge,,,,The maximum number of threads for this container,0,container,thread_limit,,
+container.restarts,gauge,,,,The number of container restarted,0,container,restarts,,
+container.uptime,gauge,,second,,The container uptime,0,container,uptime,,