[metricbeat] [containerd] group metrics by dimensions (#37537)

* add grouping logic * update tests data * add changelog entry * make update * add comments * fix changelog * frange over group events * range over grouped events
elastic · Jan 7, 2024 · 6cb79c0 · 6cb79c0
1 parent 091da4e
commit 6cb79c0
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 778 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -238,6 +238,7 @@ Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will d
 - Add GCP CloudSQL metadata {pull}33066[33066]
 - Add GCP Carbon Footprint metricbeat data {pull}34820[34820]
 - Add event loop utilization metric to Kibana module {pull}35020[35020]
+- Fix containerd metrics grouping for TSDB {pull}37537[37537]
 - Add metrics grouping by dimensions and time to Azure app insights {pull}36634[36634]
 - Align on the algorithm used to transform Prometheus histograms into Elasticsearch histograms {pull}36647[36647]
 - Enhance GCP billing with detailed tables identification, additional fields, and optimized data handling. {pull}36902[36902]

diff --git a/x-pack/metricbeat/module/containerd/cpu/_meta/data.json b/x-pack/metricbeat/module/containerd/cpu/_meta/data.json
@@ -7,11 +7,56 @@
         "cpu": {
             "usage": {
                 "cpu": {
+                    "0": {
+                        "ns": 99137817570
+                    },
+                    "1": {
+                        "ns": 116475261138
+                    },
+                    "10": {
+                        "ns": 106709905770
+                    },
+                    "11": {
+                        "ns": 104878380370
+                    },
+                    "2": {
+                        "ns": 105305653633
+                    },
+                    "3": {
+                        "ns": 101195506344
+                    },
                     "4": {
                         "ns": 105731762224
+                    },
+                    "5": {
+                        "ns": 98155683224
+                    },
+                    "6": {
+                        "ns": 95075348914
+                    },
+                    "7": {
+                        "ns": 97134782770
+                    },
+                    "8": {
+                        "ns": 104266711568
+                    },
+                    "9": {
+                        "ns": 102272190459
                     }
                 },
-                "percpu": {}
+                "kernel": {
+                    "ns": 532180000000,
+                    "pct": 0
+                },
+                "percpu": {},
+                "total": {
+                    "ns": 1236339003984,
+                    "pct": 0
+                },
+                "user": {
+                    "ns": 525470000000,
+                    "pct": 0
+                }
             }
         },
         "namespace": "k8s.io"