Browse Source

Add labels for cgroup name (#14856)

thiagoftsm 1 year ago
parent
commit
9ad4519cc3

+ 5 - 0
collectors/cgroups.plugin/sys_fs_cgroup.c

@@ -2715,6 +2715,11 @@ static inline void discovery_process_cgroup(struct cgroup *cg) {
 
     worker_is_busy(WORKER_DISCOVERY_PROCESS_NETWORK);
     read_cgroup_network_interfaces(cg);
+    if (!cg->chart_labels)
+        cg->chart_labels = rrdlabels_create();
+    if (!k8s_is_kubepod(cg)) {
+        rrdlabels_add(cg->chart_labels, "cgroup_name", cg->chart_id, RRDLABEL_SRC_AUTO);
+    }
 }
 
 static inline void discovery_find_all_cgroups() {

+ 3 - 0
collectors/proc.plugin/proc_net_dev.c

@@ -519,6 +519,9 @@ static inline void netdev_rename_cgroup(struct netdev *d, struct netdev_rename *
     d->chart_family = strdupz("net");
 
     rrdlabels_copy(d->chart_labels, r->chart_labels);
+    if (strncmp(r->ctx_prefix, "k8s", 3)) {
+        rrdlabels_add(d->chart_labels, "cgroup_name", r->container_name, RRDLABEL_SRC_AUTO);
+    }
 
     d->priority = NETDATA_CHART_PRIO_CGROUP_NET_IFACE;
     d->flipped = 1;