cgroup: add net container_device label (#16261)
Ilya Mashchenko committed
Oct 24, 2023 at 15:51 UTC
1b3b107bb2b0f9d301d9bb975ec673ffae82bd4d
2 files changed
+37
-40
collectors/cgroups.plugin/metadata.yaml
+36
-40
@@ -86,9 +86,9 @@ modules:
86
description: ""
87
labels:
88
- name: container_name
89
- description: TBD
89
+ description: The container name or group path if name resolution fails.
90
- name: image
91
- description: TBD
91
+ description: Docker/Podman container image name.
92
metrics:
93
- name: cgroup.cpu_limit
94
description: CPU Usage within the limits
@@ -314,13 +314,15 @@ modules:
314
description: ""
315
labels:
316
- name: container_name
317
- description: TBD
317
+ description: The container name or group path if name resolution fails.
318
- name: image
319
- description: TBD
319
+ description: Docker/Podman container image name.
320
- name: device
321
- description: TBD
321
+ description: "The name of the host network interface linked to the container's network interface."
322
+ - name: container_device
323
+ description: Container network interface name.
324
- name: interface_type
323
- description: TBD
325
+ description: 'Network interface type. Always "virtual" for the containers.'
326
metrics:
327
- name: cgroup.net_net
328
description: Bandwidth
@@ -445,30 +447,26 @@ modules:
447
availability: []
448
scopes:
449
- name: k8s cgroup
448
- description: ""
450
+ description: These metrics refer to the Pod container.
451
labels:
452
+ - name: k8s_node_name
453
+ description: 'Node name. The value of _pod.spec.nodeName_.'
454
- name: k8s_namespace
451
- description: TBD
452
- - name: k8s_pod_name
453
- description: TBD
454
- - name: k8s_pod_uid
455
- description: TBD
455
+ description: 'Namespace name. The value of _pod.metadata.namespace_.'
456
- name: k8s_controller_kind
457
- description: TBD
457
+ description: 'Controller kind (ReplicaSet, DaemonSet, StatefulSet, Job, etc.). The value of _pod.OwnerReferences.Controller.Kind_.'
458
- name: k8s_controller_name
459
- description: TBD
460
- - name: k8s_node_name
461
- description: TBD
459
+ description: 'Controller name.The value of _pod.OwnerReferences.Controller.Name_.'
460
+ - name: k8s_pod_name
461
+ description: 'Pod name. The value of _pod.metadata.name_.'
462
- name: k8s_container_name
463
- description: TBD
464
- - name: k8s_container_id
465
- description: TBD
463
+ description: 'Container name. The value of _pod.spec.containers.name_.'
464
- name: k8s_kind
467
- description: TBD
465
+ description: 'Instance kind: "pod" or "container".'
466
- name: k8s_qos_class
469
- description: TBD
467
+ description: 'QoS class (guaranteed, burstable, besteffort).'
468
- name: k8s_cluster_id
471
- description: TBD
469
+ description: 'Cluster ID. The value of kube-system namespace _namespace.metadata.uid_.'
470
metrics:
471
- name: k8s.cgroup.cpu_limit
472
description: CPU Usage within the limits
@@ -691,34 +689,32 @@ modules:
689
dimensions:
690
- name: time
691
- name: k8s cgroup network device
694
- description: ""
692
+ description: These metrics refer to the Pod container network interface.
693
labels:
694
- name: device
697
- description: TBD
695
+ description: "The name of the host network interface linked to the container's network interface."
696
+ - name: container_device
697
+ description: Container network interface name.
698
- name: interface_type
699
- description: TBD
699
+ description: 'Network interface type. Always "virtual" for the containers.'
700
+ - name: k8s_node_name
701
+ description: 'Node name. The value of _pod.spec.nodeName_.'
702
- name: k8s_namespace
701
- description: TBD
702
- - name: k8s_pod_name
703
- description: TBD
704
- - name: k8s_pod_uid
705
- description: TBD
703
+ description: 'Namespace name. The value of _pod.metadata.namespace_.'
704
- name: k8s_controller_kind
707
- description: TBD
705
+ description: 'Controller kind (ReplicaSet, DaemonSet, StatefulSet, Job, etc.). The value of _pod.OwnerReferences.Controller.Kind_.'
706
- name: k8s_controller_name
709
- description: TBD
710
- - name: k8s_node_name
711
- description: TBD
707
+ description: 'Controller name.The value of _pod.OwnerReferences.Controller.Name_.'
708
+ - name: k8s_pod_name
709
+ description: 'Pod name. The value of _pod.metadata.name_.'
710
- name: k8s_container_name
713
- description: TBD
714
- - name: k8s_container_id
715
- description: TBD
711
+ description: 'Container name. The value of _pod.spec.containers.name_.'
712
- name: k8s_kind
717
- description: TBD
713
+ description: 'Instance kind: "pod" or "container".'
714
- name: k8s_qos_class
719
- description: TBD
715
+ description: 'QoS class (guaranteed, burstable, besteffort).'
716
- name: k8s_cluster_id
721
- description: TBD
717
+ description: 'Cluster ID. The value of kube-system namespace _namespace.metadata.uid_.'
718
metrics:
719
- name: k8s.cgroup.net_net
720
description: Bandwidth
collectors/proc.plugin/proc_net_dev.c
+1
@@ -521,6 +521,7 @@ static inline void netdev_rename_cgroup(struct netdev *d, struct netdev_rename *
521
d->chart_family = strdupz("net");
522
523
rrdlabels_copy(d->chart_labels, r->chart_labels);
524
+ rrdlabels_add(d->chart_labels, "container_device", r->container_device, RRDLABEL_SRC_AUTO | RRDLABEL_FLAG_PERMANENT);
525
526
d->priority = NETDATA_CHART_PRIO_CGROUP_NET_IFACE;
527
d->flipped = 1;