diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b5f7bda4ab9..656d88177a1 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -82,6 +82,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff] - in module/windows/perfmon, changed collection method of the second counter value required to create a displayable value {pull}32305[32305] - Fix and improve AWS metric period calculation to avoid zero-length intervals {pull}32724[32724] +- Add missing cluster metadata to k8s module metricsets {pull}32979[32979] *Packetbeat* diff --git a/metricbeat/module/kubernetes/apiserver/_meta/test/metrics.2.0.expected b/metricbeat/module/kubernetes/apiserver/_meta/test/metrics.2.0.expected index a4ef4c0a5fb..b290a2ecd97 100644 --- a/metricbeat/module/kubernetes/apiserver/_meta/test/metrics.2.0.expected +++ b/metricbeat/module/kubernetes/apiserver/_meta/test/metrics.2.0.expected @@ -1,6 +1,6 @@ [ { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -91,7 +91,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -182,7 +182,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -273,7 +273,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -298,7 +298,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -324,7 +324,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -348,7 +348,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -389,7 +389,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -480,7 +480,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -568,7 +568,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -592,7 +592,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -680,7 +680,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -705,7 +705,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -729,7 +729,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -817,7 +817,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -842,7 +842,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -868,7 +868,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -894,7 +894,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -964,7 +964,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1035,7 +1035,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1061,7 +1061,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1087,7 +1087,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1178,7 +1178,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1204,7 +1204,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1230,7 +1230,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1272,7 +1272,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1297,7 +1297,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1385,7 +1385,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1411,7 +1411,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1481,7 +1481,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1551,7 +1551,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1577,7 +1577,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1604,7 +1604,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1630,7 +1630,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1656,7 +1656,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1726,7 +1726,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1752,7 +1752,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1779,7 +1779,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1821,7 +1821,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1847,7 +1847,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1938,7 +1938,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1964,7 +1964,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -1990,7 +1990,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2016,7 +2016,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2107,7 +2107,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2132,7 +2132,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2222,7 +2222,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -2246,7 +2246,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2315,7 +2315,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2385,7 +2385,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2473,7 +2473,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2515,7 +2515,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2537,7 +2537,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2579,7 +2579,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2667,7 +2667,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2692,7 +2692,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2718,7 +2718,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2808,7 +2808,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2834,7 +2834,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2922,7 +2922,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -2991,7 +2991,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3016,7 +3016,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3103,7 +3103,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3187,7 +3187,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3256,7 +3256,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3297,7 +3297,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3338,7 +3338,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3364,7 +3364,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3389,7 +3389,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3415,7 +3415,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3441,7 +3441,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3466,7 +3466,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3507,7 +3507,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3532,7 +3532,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3558,7 +3558,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -3582,7 +3582,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3624,7 +3624,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3650,7 +3650,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3738,7 +3738,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3764,7 +3764,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3790,7 +3790,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3816,7 +3816,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3842,7 +3842,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -3866,7 +3866,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -3956,7 +3956,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4044,7 +4044,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4069,7 +4069,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -4093,7 +4093,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4118,7 +4118,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4144,7 +4144,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4214,7 +4214,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4239,7 +4239,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4330,7 +4330,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -4354,7 +4354,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4380,7 +4380,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4406,7 +4406,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4432,7 +4432,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4457,7 +4457,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4548,7 +4548,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4574,7 +4574,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4616,7 +4616,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -4640,7 +4640,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4681,7 +4681,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4707,7 +4707,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4794,7 +4794,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4863,7 +4863,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4889,7 +4889,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4915,7 +4915,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4942,7 +4942,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -4968,7 +4968,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5038,7 +5038,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5080,7 +5080,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5106,7 +5106,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -5130,7 +5130,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5155,7 +5155,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5197,7 +5197,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5223,7 +5223,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5292,7 +5292,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5318,7 +5318,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5360,7 +5360,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5386,7 +5386,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -5410,7 +5410,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5452,7 +5452,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5478,7 +5478,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5568,7 +5568,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5593,7 +5593,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5635,7 +5635,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5726,7 +5726,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5752,7 +5752,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5843,7 +5843,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -5867,7 +5867,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -5955,7 +5955,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6042,7 +6042,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6069,7 +6069,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -6093,7 +6093,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6183,7 +6183,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6225,7 +6225,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -6249,7 +6249,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6337,7 +6337,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6362,7 +6362,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6387,7 +6387,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6413,7 +6413,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6483,7 +6483,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6508,7 +6508,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6578,7 +6578,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6603,7 +6603,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6630,7 +6630,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6699,7 +6699,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6724,7 +6724,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6750,7 +6750,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6776,7 +6776,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6817,7 +6817,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6904,7 +6904,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6930,7 +6930,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -6972,7 +6972,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -6996,7 +6996,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7065,7 +7065,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7091,7 +7091,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7182,7 +7182,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7208,7 +7208,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7235,7 +7235,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7261,7 +7261,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7349,7 +7349,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7374,7 +7374,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -7398,7 +7398,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7423,7 +7423,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7464,7 +7464,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7554,7 +7554,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7642,7 +7642,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7730,7 +7730,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -7754,7 +7754,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -7778,7 +7778,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7803,7 +7803,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7873,7 +7873,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7898,7 +7898,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -7986,7 +7986,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -8010,7 +8010,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8101,7 +8101,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8192,7 +8192,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8234,7 +8234,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8260,7 +8260,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8301,7 +8301,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8370,7 +8370,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8458,7 +8458,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8484,7 +8484,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8571,7 +8571,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -8595,7 +8595,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8620,7 +8620,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8645,7 +8645,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8715,7 +8715,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8806,7 +8806,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "audit": { @@ -8856,7 +8856,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -8943,7 +8943,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9031,7 +9031,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9073,7 +9073,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9143,7 +9143,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9168,7 +9168,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9194,7 +9194,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9219,7 +9219,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9288,7 +9288,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9375,7 +9375,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9401,7 +9401,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -9425,7 +9425,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9451,7 +9451,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9473,7 +9473,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9557,7 +9557,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9583,7 +9583,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9652,7 +9652,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9740,7 +9740,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9811,7 +9811,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -9835,7 +9835,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9904,7 +9904,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9929,7 +9929,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -9956,7 +9956,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10027,7 +10027,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -10051,7 +10051,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -10075,7 +10075,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10101,7 +10101,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10171,7 +10171,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10259,7 +10259,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10285,7 +10285,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10311,7 +10311,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10337,7 +10337,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10364,7 +10364,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10452,7 +10452,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10540,7 +10540,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10628,7 +10628,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10670,7 +10670,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10739,7 +10739,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10781,7 +10781,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10806,7 +10806,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10894,7 +10894,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10964,7 +10964,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -10990,7 +10990,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11032,7 +11032,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11102,7 +11102,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11128,7 +11128,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11154,7 +11154,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11241,7 +11241,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11311,7 +11311,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11336,7 +11336,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11406,7 +11406,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11475,7 +11475,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11566,7 +11566,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11593,7 +11593,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11681,7 +11681,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11707,7 +11707,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11732,7 +11732,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11758,7 +11758,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -11782,7 +11782,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11823,7 +11823,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11848,7 +11848,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11874,7 +11874,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11900,7 +11900,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -11924,7 +11924,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -11950,7 +11950,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12041,7 +12041,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12129,7 +12129,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12156,7 +12156,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12182,7 +12182,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12269,7 +12269,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12356,7 +12356,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12382,7 +12382,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12469,7 +12469,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12495,7 +12495,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12537,7 +12537,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -12561,7 +12561,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12587,7 +12587,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12675,7 +12675,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12744,7 +12744,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12770,7 +12770,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12861,7 +12861,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -12949,7 +12949,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13039,7 +13039,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13065,7 +13065,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13153,7 +13153,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13244,7 +13244,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13270,7 +13270,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13296,7 +13296,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13338,7 +13338,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13363,7 +13363,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13405,7 +13405,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13493,7 +13493,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13581,7 +13581,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13607,7 +13607,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13633,7 +13633,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13660,7 +13660,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13686,7 +13686,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13755,7 +13755,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13797,7 +13797,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -13821,7 +13821,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13846,7 +13846,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13888,7 +13888,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -13976,7 +13976,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -14000,7 +14000,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14087,7 +14087,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14129,7 +14129,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14154,7 +14154,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14224,7 +14224,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14250,7 +14250,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14277,7 +14277,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14304,7 +14304,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14373,7 +14373,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14461,7 +14461,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14552,7 +14552,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -14578,7 +14578,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14604,7 +14604,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14694,7 +14694,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14720,7 +14720,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14745,7 +14745,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -14769,7 +14769,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14857,7 +14857,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14948,7 +14948,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -14973,7 +14973,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15043,7 +15043,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -15067,7 +15067,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15093,7 +15093,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15163,7 +15163,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15189,7 +15189,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15216,7 +15216,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15242,7 +15242,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15311,7 +15311,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15401,7 +15401,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -15425,7 +15425,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15513,7 +15513,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15539,7 +15539,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15564,7 +15564,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15652,7 +15652,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15678,7 +15678,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15766,7 +15766,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15837,7 +15837,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -15863,7 +15863,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15905,7 +15905,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -15975,7 +15975,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16063,7 +16063,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16089,7 +16089,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16177,7 +16177,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16268,7 +16268,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16294,7 +16294,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16382,7 +16382,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16407,7 +16407,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -16431,7 +16431,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16472,7 +16472,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16497,7 +16497,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16584,7 +16584,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16654,7 +16654,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16680,7 +16680,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16771,7 +16771,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16797,7 +16797,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16885,7 +16885,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -16909,7 +16909,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -16934,7 +16934,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17004,7 +17004,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17046,7 +17046,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17072,7 +17072,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17098,7 +17098,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17168,7 +17168,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17209,7 +17209,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17235,7 +17235,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17305,7 +17305,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17331,7 +17331,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17402,7 +17402,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17472,7 +17472,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17514,7 +17514,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17540,7 +17540,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17582,7 +17582,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17608,7 +17608,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17695,7 +17695,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17782,7 +17782,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17852,7 +17852,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -17922,7 +17922,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18009,7 +18009,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18035,7 +18035,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -18061,7 +18061,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18131,7 +18131,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18221,7 +18221,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18246,7 +18246,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18317,7 +18317,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -18341,7 +18341,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18367,7 +18367,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18455,7 +18455,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18525,7 +18525,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18612,7 +18612,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -18638,7 +18638,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18725,7 +18725,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18813,7 +18813,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18839,7 +18839,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18865,7 +18865,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18891,7 +18891,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -18978,7 +18978,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19004,7 +19004,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19046,7 +19046,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19071,7 +19071,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19141,7 +19141,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19210,7 +19210,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19298,7 +19298,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19323,7 +19323,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19414,7 +19414,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19440,7 +19440,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19527,7 +19527,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19611,7 +19611,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19653,7 +19653,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19678,7 +19678,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19704,7 +19704,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19773,7 +19773,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19861,7 +19861,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19887,7 +19887,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -19975,7 +19975,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20063,7 +20063,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20105,7 +20105,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -20129,7 +20129,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20154,7 +20154,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20245,7 +20245,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20271,7 +20271,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20293,7 +20293,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20319,7 +20319,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -20343,7 +20343,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20431,7 +20431,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20457,7 +20457,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20482,7 +20482,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20551,7 +20551,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20576,7 +20576,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20601,7 +20601,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20692,7 +20692,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20762,7 +20762,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20852,7 +20852,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20878,7 +20878,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -20948,7 +20948,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21018,7 +21018,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21045,7 +21045,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21070,7 +21070,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21140,7 +21140,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21166,7 +21166,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21188,7 +21188,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21213,7 +21213,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21238,7 +21238,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21280,7 +21280,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21368,7 +21368,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21393,7 +21393,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21484,7 +21484,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -21508,7 +21508,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21596,7 +21596,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21622,7 +21622,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21648,7 +21648,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21738,7 +21738,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21764,7 +21764,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21789,7 +21789,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21814,7 +21814,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21901,7 +21901,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -21925,7 +21925,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -21951,7 +21951,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22039,7 +22039,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22130,7 +22130,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22171,7 +22171,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22259,7 +22259,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22284,7 +22284,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22310,7 +22310,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -22334,7 +22334,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22356,7 +22356,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22443,7 +22443,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -22467,7 +22467,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22557,7 +22557,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22583,7 +22583,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22609,7 +22609,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22635,7 +22635,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22726,7 +22726,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22817,7 +22817,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22859,7 +22859,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22901,7 +22901,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -22992,7 +22992,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23079,7 +23079,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23167,7 +23167,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23193,7 +23193,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23218,7 +23218,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23309,7 +23309,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23335,7 +23335,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23361,7 +23361,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23432,7 +23432,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -23456,7 +23456,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23482,7 +23482,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23508,7 +23508,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23534,7 +23534,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -23558,7 +23558,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23646,7 +23646,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23671,7 +23671,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -23695,7 +23695,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23737,7 +23737,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23762,7 +23762,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23787,7 +23787,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -23813,7 +23813,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23839,7 +23839,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23865,7 +23865,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23952,7 +23952,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -23977,7 +23977,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24002,7 +24002,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24090,7 +24090,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24116,7 +24116,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24158,7 +24158,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24183,7 +24183,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24274,7 +24274,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24299,7 +24299,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24390,7 +24390,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24481,7 +24481,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24507,7 +24507,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24597,7 +24597,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24688,7 +24688,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24758,7 +24758,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24784,7 +24784,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24810,7 +24810,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24897,7 +24897,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24922,7 +24922,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -24993,7 +24993,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25019,7 +25019,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25107,7 +25107,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -25131,7 +25131,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25157,7 +25157,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25198,7 +25198,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25285,7 +25285,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25311,7 +25311,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25402,7 +25402,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25490,7 +25490,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25581,7 +25581,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25623,7 +25623,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25649,7 +25649,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25674,7 +25674,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25700,7 +25700,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -25724,7 +25724,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25812,7 +25812,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25838,7 +25838,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25928,7 +25928,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -25953,7 +25953,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26041,7 +26041,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26129,7 +26129,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26154,7 +26154,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26179,7 +26179,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26205,7 +26205,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26231,7 +26231,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26256,7 +26256,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26325,7 +26325,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26350,7 +26350,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26376,7 +26376,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26402,7 +26402,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26473,7 +26473,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -26497,7 +26497,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26522,7 +26522,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26610,7 +26610,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26635,7 +26635,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26723,7 +26723,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26793,7 +26793,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26835,7 +26835,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "etcd": { @@ -26859,7 +26859,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26949,7 +26949,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -26975,7 +26975,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27016,7 +27016,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27106,7 +27106,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27132,7 +27132,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27202,7 +27202,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27228,7 +27228,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27253,7 +27253,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27340,7 +27340,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27365,7 +27365,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27391,7 +27391,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27478,7 +27478,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27503,7 +27503,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27594,7 +27594,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27682,7 +27682,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27724,7 +27724,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27750,7 +27750,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27841,7 +27841,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27882,7 +27882,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27908,7 +27908,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { @@ -27934,7 +27934,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "request": { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver.go b/metricbeat/module/kubernetes/apiserver/apiserver.go index 616d879109d..f8b4afe4baa 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver.go @@ -22,48 +22,46 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" ) -func init() { - //mapping := &prometheus.MetricsMapping{ - mapping := &prometheus.MetricsMapping{ - Metrics: map[string]prometheus.MetricMap{ - "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), - "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), - "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), - "process_open_fds": prometheus.Metric("process.fds.open.count"), - "process_start_time_seconds": prometheus.Metric("process.started.sec"), - "apiserver_watch_events_sizes": prometheus.Metric("watch.events.size.bytes"), - "apiserver_response_sizes": prometheus.Metric("response.size.bytes"), - "apiserver_request_duration_seconds": prometheus.Metric("request.duration.us", prometheus.OpMultiplyBuckets(1000000)), - "apiserver_request_total": prometheus.Metric("request.count"), - "apiserver_current_inflight_requests": prometheus.Metric("request.current.count"), - "apiserver_longrunning_gauge": prometheus.Metric("request.longrunning.count"), - "apiserver_storage_objects": prometheus.Metric("etcd.object.count"), - "apiserver_audit_event_total": prometheus.Metric("audit.event.count"), - "apiserver_audit_requests_rejected_total": prometheus.Metric("audit.rejected.count"), - "rest_client_requests_total": prometheus.Metric("client.request.count"), - }, +var mapping = &prometheus.MetricsMapping{ + Metrics: map[string]prometheus.MetricMap{ + "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), + "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), + "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), + "process_open_fds": prometheus.Metric("process.fds.open.count"), + "process_start_time_seconds": prometheus.Metric("process.started.sec"), + "apiserver_watch_events_sizes": prometheus.Metric("watch.events.size.bytes"), + "apiserver_response_sizes": prometheus.Metric("response.size.bytes"), + "apiserver_request_duration_seconds": prometheus.Metric("request.duration.us", prometheus.OpMultiplyBuckets(1000000)), + "apiserver_request_total": prometheus.Metric("request.count"), + "apiserver_current_inflight_requests": prometheus.Metric("request.current.count"), + "apiserver_longrunning_gauge": prometheus.Metric("request.longrunning.count"), + "apiserver_storage_objects": prometheus.Metric("etcd.object.count"), + "apiserver_audit_event_total": prometheus.Metric("audit.event.count"), + "apiserver_audit_requests_rejected_total": prometheus.Metric("audit.rejected.count"), + "rest_client_requests_total": prometheus.Metric("client.request.count"), + }, - Labels: map[string]prometheus.LabelMap{ - "client": prometheus.KeyLabel("request.client"), - "resource": prometheus.KeyLabel("request.resource"), - "scope": prometheus.KeyLabel("request.scope"), - "subresource": prometheus.KeyLabel("request.subresource"), - "verb": prometheus.KeyLabel("request.verb"), - "code": prometheus.KeyLabel("request.code"), - "contentType": prometheus.KeyLabel("request.content_type"), - "dry_run": prometheus.KeyLabel("request.dry_run"), - "requestKind": prometheus.KeyLabel("request.kind"), - "component": prometheus.KeyLabel("request.component"), - "group": prometheus.KeyLabel("request.group"), - "version": prometheus.KeyLabel("request.version"), - "handler": prometheus.KeyLabel("request.handler"), - "method": prometheus.KeyLabel("request.method"), - "host": prometheus.KeyLabel("request.host"), - "kind": prometheus.KeyLabel("watch.events.kind"), - }, - } + Labels: map[string]prometheus.LabelMap{ + "client": prometheus.KeyLabel("request.client"), + "resource": prometheus.KeyLabel("request.resource"), + "scope": prometheus.KeyLabel("request.scope"), + "subresource": prometheus.KeyLabel("request.subresource"), + "verb": prometheus.KeyLabel("request.verb"), + "code": prometheus.KeyLabel("request.code"), + "contentType": prometheus.KeyLabel("request.content_type"), + "dry_run": prometheus.KeyLabel("request.dry_run"), + "requestKind": prometheus.KeyLabel("request.kind"), + "component": prometheus.KeyLabel("request.component"), + "group": prometheus.KeyLabel("request.group"), + "version": prometheus.KeyLabel("request.version"), + "handler": prometheus.KeyLabel("request.handler"), + "method": prometheus.KeyLabel("request.method"), + "host": prometheus.KeyLabel("request.host"), + "kind": prometheus.KeyLabel("watch.events.kind"), + }, +} - mb.Registry.MustAddMetricSet("kubernetes", "apiserver", - getMetricsetFactory(mapping), +func init() { + mb.Registry.MustAddMetricSet("kubernetes", "apiserver", New, mb.WithHostParser(prometheus.HostParser)) } diff --git a/metricbeat/module/kubernetes/apiserver/metricset.go b/metricbeat/module/kubernetes/apiserver/metricset.go index 3019ade0d83..290003f39b7 100644 --- a/metricbeat/module/kubernetes/apiserver/metricset.go +++ b/metricbeat/module/kubernetes/apiserver/metricset.go @@ -22,45 +22,51 @@ import ( "github.com/elastic/beats/v7/metricbeat/helper/prometheus" "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/elastic-agent-libs/mapstr" ) // Metricset for apiserver is a prometheus based metricset -type metricset struct { +type Metricset struct { mb.BaseMetricSet prometheusClient prometheus.Prometheus prometheusMappings *prometheus.MetricsMapping + clusterMeta mapstr.M } -var _ mb.ReportingMetricSetV2Error = (*metricset)(nil) +var _ mb.ReportingMetricSetV2Error = (*Metricset)(nil) -// getMetricsetFactory as required by` mb.Registry.MustAddMetricSet` -func getMetricsetFactory(prometheusMappings *prometheus.MetricsMapping) mb.MetricSetFactory { - return func(base mb.BaseMetricSet) (mb.MetricSet, error) { - pc, err := prometheus.NewPrometheusClient(base) - if err != nil { - return nil, err - } - return &metricset{ - BaseMetricSet: base, - prometheusClient: pc, - prometheusMappings: prometheusMappings, - }, nil +func New(base mb.BaseMetricSet) (mb.MetricSet, error) { + pc, err := prometheus.NewPrometheusClient(base) + if err != nil { + return nil, err } + ms := &Metricset{ + BaseMetricSet: base, + prometheusClient: pc, + prometheusMappings: mapping, + clusterMeta: util.AddClusterECSMeta(base), + } + + return ms, nil } // Fetch gathers information from the apiserver and reports events with this information. -func (m *metricset) Fetch(reporter mb.ReporterV2) error { +func (m *Metricset) Fetch(reporter mb.ReporterV2) error { events, err := m.prometheusClient.GetProcessedMetrics(m.prometheusMappings) if err != nil { return fmt.Errorf("error getting metrics: %w", err) } - for _, event := range events { - - reporter.Event(mb.Event{ - MetricSetFields: event, - Namespace: m.prometheusMappings.Namespace, - }) + for _, e := range events { + event := mb.TransformMapStrToEvent("kubernetes", e, nil) + if m.clusterMeta != nil { + event.RootFields.DeepUpdate(m.clusterMeta) + } + isOpen := reporter.Event(event) + if !isOpen { + return nil + } } return nil diff --git a/metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected b/metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected index 6e07388c719..b92fcc01f13 100644 --- a/metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected +++ b/metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected @@ -1,6 +1,6 @@ [ { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -41,7 +41,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -82,7 +82,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -123,7 +123,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "node": { @@ -177,7 +177,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -218,7 +218,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "endpoint_slice_mirroring", @@ -252,7 +252,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -293,7 +293,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "cronjob", @@ -327,7 +327,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -368,7 +368,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -409,7 +409,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -450,7 +450,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -474,7 +474,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -515,7 +515,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -556,7 +556,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -597,7 +597,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -621,7 +621,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -662,7 +662,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -703,7 +703,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -744,7 +744,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -785,7 +785,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -826,7 +826,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -867,7 +867,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -908,7 +908,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -949,7 +949,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -990,7 +990,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "ttlcontroller", @@ -1024,7 +1024,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "replicationmanager", @@ -1058,7 +1058,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1099,7 +1099,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1140,7 +1140,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "DynamicCABundle-request-header", @@ -1174,7 +1174,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1215,7 +1215,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1256,7 +1256,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1297,7 +1297,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1321,7 +1321,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1362,7 +1362,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "deployment", @@ -1396,7 +1396,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1437,7 +1437,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1478,7 +1478,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "endpoint_slice", @@ -1512,7 +1512,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1553,7 +1553,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "resource_quota_controller_resource_changes", @@ -1587,7 +1587,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1628,7 +1628,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "root_ca_cert_publisher", @@ -1662,7 +1662,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1703,7 +1703,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1744,7 +1744,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1785,7 +1785,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1826,7 +1826,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "garbage_collector_attempt_to_delete", @@ -1860,7 +1860,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "pvcs", @@ -1894,7 +1894,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "daemonset", @@ -1928,7 +1928,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -1969,7 +1969,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2010,7 +2010,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "disruption_recheck", @@ -2044,7 +2044,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2085,7 +2085,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2109,7 +2109,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "garbage_collector_graph_changes", @@ -2143,7 +2143,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "disruption", @@ -2177,7 +2177,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2218,7 +2218,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2259,7 +2259,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2300,7 +2300,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2341,7 +2341,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2382,7 +2382,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2423,7 +2423,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2464,7 +2464,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "certificate", @@ -2498,7 +2498,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2539,7 +2539,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2580,7 +2580,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2621,7 +2621,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "volumes", @@ -2652,7 +2652,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "DynamicServingCertificateController", @@ -2686,7 +2686,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2727,7 +2727,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "endpoint", @@ -2761,7 +2761,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2802,7 +2802,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2843,7 +2843,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "replicaset", @@ -2877,7 +2877,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2918,7 +2918,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -2959,7 +2959,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3000,7 +3000,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3041,7 +3041,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3082,7 +3082,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3123,7 +3123,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "leader": { @@ -3143,7 +3143,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3184,7 +3184,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3225,7 +3225,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3266,7 +3266,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "statefulset", @@ -3300,7 +3300,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3341,7 +3341,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3382,7 +3382,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3423,7 +3423,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3464,7 +3464,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "ttl_jobs_to_delete", @@ -3498,7 +3498,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3539,7 +3539,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3580,7 +3580,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3621,7 +3621,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3662,7 +3662,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3703,7 +3703,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3744,7 +3744,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3785,7 +3785,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3826,7 +3826,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3850,7 +3850,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "DynamicCABundle-client-ca-bundle", @@ -3884,7 +3884,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3925,7 +3925,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -3966,7 +3966,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4007,7 +4007,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4048,7 +4048,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "job", @@ -4082,7 +4082,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4123,7 +4123,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4164,7 +4164,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "ephemeral_volume", @@ -4198,7 +4198,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4239,7 +4239,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4280,7 +4280,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4321,7 +4321,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4362,7 +4362,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "ClusterRoleAggregator", @@ -4396,7 +4396,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "DynamicCABundle-csr-controller", @@ -4430,7 +4430,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4471,7 +4471,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4512,7 +4512,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4553,7 +4553,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4594,7 +4594,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4635,7 +4635,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4676,7 +4676,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "garbage_collector_attempt_to_orphan", @@ -4710,7 +4710,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "horizontalpodautoscaler", @@ -4744,7 +4744,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4785,7 +4785,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4826,7 +4826,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "namespace", @@ -4860,7 +4860,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4901,7 +4901,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "serviceaccount", @@ -4935,7 +4935,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -4976,7 +4976,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5017,7 +5017,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "noexec_taint_pod", @@ -5048,7 +5048,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5089,7 +5089,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5130,7 +5130,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5171,7 +5171,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5212,7 +5212,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "serviceaccount_tokens_secret", @@ -5246,7 +5246,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5287,7 +5287,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "pvprotection", @@ -5321,7 +5321,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5345,7 +5345,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5386,7 +5386,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5427,7 +5427,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "claims", @@ -5458,7 +5458,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5499,7 +5499,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5540,7 +5540,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "noexec_taint_node", @@ -5571,7 +5571,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5612,7 +5612,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5653,7 +5653,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5694,7 +5694,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5735,7 +5735,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5776,7 +5776,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5817,7 +5817,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5858,7 +5858,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5899,7 +5899,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5923,7 +5923,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "serviceaccount_tokens_service", @@ -5957,7 +5957,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -5998,7 +5998,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "resourcequota_primary", @@ -6032,7 +6032,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "pvcprotection", @@ -6066,7 +6066,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6107,7 +6107,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6148,7 +6148,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6189,7 +6189,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6230,7 +6230,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "resourcequota_priority", @@ -6264,7 +6264,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "bootstrap_signer_queue", @@ -6298,7 +6298,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6322,7 +6322,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "node_lifecycle_controller", @@ -6353,7 +6353,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6394,7 +6394,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6435,7 +6435,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "orphaned_pods_nodes", @@ -6469,7 +6469,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "volume_expand", @@ -6503,7 +6503,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "token_cleaner", @@ -6537,7 +6537,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -6578,7 +6578,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "node_lifecycle_controller_pods", @@ -6612,7 +6612,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "name": "service", diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager.go b/metricbeat/module/kubernetes/controllermanager/controllermanager.go index 9f7d487ceef..5808acd8d80 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager.go @@ -18,47 +18,99 @@ package controllermanager import ( + "fmt" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/elastic-agent-libs/mapstr" ) +var mapping = &prometheus.MetricsMapping{ + Metrics: map[string]prometheus.MetricMap{ + "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), + "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), + "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), + "process_open_fds": prometheus.Metric("process.fds.open.count"), + "process_max_fds": prometheus.Metric("process.fds.max.count"), + "process_start_time_seconds": prometheus.Metric("process.started.sec"), + // rest_client_request_duration_seconds buckets declared in + // https://github.com/kubernetes/component-base/blob/3b9b201c27aa896b98da61b94545efe442ae597e/metrics/prometheus/restclient/metrics.go#L39 + "rest_client_request_duration_seconds": prometheus.Metric("client.request.duration.us", prometheus.OpMultiplyBuckets(1000000)), + "rest_client_requests_total": prometheus.Metric("client.request.count"), + "workqueue_longest_running_processor_seconds": prometheus.Metric("workqueue.longestrunning.sec"), + "workqueue_unfinished_work_seconds": prometheus.Metric("workqueue.unfinished.sec"), + "workqueue_adds_total": prometheus.Metric("workqueue.adds.count"), + "workqueue_depth": prometheus.Metric("workqueue.depth.count"), + "workqueue_retries_total": prometheus.Metric("workqueue.retries.count"), + "node_collector_evictions_number": prometheus.Metric("node.collector.eviction.count"), + "node_collector_unhealthy_nodes_in_zone": prometheus.Metric("node.collector.unhealthy.count"), + "node_collector_zone_size": prometheus.Metric("node.collector.count"), + "node_collector_zone_health": prometheus.Metric("node.collector.health.pct"), + "leader_election_master_status": prometheus.BooleanMetric("leader.is_master"), + }, + + Labels: map[string]prometheus.LabelMap{ + "code": prometheus.KeyLabel("code"), + "method": prometheus.KeyLabel("method"), + "host": prometheus.KeyLabel("host"), + "name": prometheus.KeyLabel("name"), + "zone": prometheus.KeyLabel("zone"), + "url": prometheus.KeyLabel("url"), + "verb": prometheus.KeyLabel("verb"), + }, +} + func init() { - mapping := &prometheus.MetricsMapping{ - Metrics: map[string]prometheus.MetricMap{ - "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), - "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), - "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), - "process_open_fds": prometheus.Metric("process.fds.open.count"), - "process_max_fds": prometheus.Metric("process.fds.max.count"), - "process_start_time_seconds": prometheus.Metric("process.started.sec"), - // rest_client_request_duration_seconds buckets declared in - // https://github.com/kubernetes/component-base/blob/3b9b201c27aa896b98da61b94545efe442ae597e/metrics/prometheus/restclient/metrics.go#L39 - "rest_client_request_duration_seconds": prometheus.Metric("client.request.duration.us", prometheus.OpMultiplyBuckets(1000000)), - "rest_client_requests_total": prometheus.Metric("client.request.count"), - "workqueue_longest_running_processor_seconds": prometheus.Metric("workqueue.longestrunning.sec"), - "workqueue_unfinished_work_seconds": prometheus.Metric("workqueue.unfinished.sec"), - "workqueue_adds_total": prometheus.Metric("workqueue.adds.count"), - "workqueue_depth": prometheus.Metric("workqueue.depth.count"), - "workqueue_retries_total": prometheus.Metric("workqueue.retries.count"), - "node_collector_evictions_number": prometheus.Metric("node.collector.eviction.count"), - "node_collector_unhealthy_nodes_in_zone": prometheus.Metric("node.collector.unhealthy.count"), - "node_collector_zone_size": prometheus.Metric("node.collector.count"), - "node_collector_zone_health": prometheus.Metric("node.collector.health.pct"), - "leader_election_master_status": prometheus.BooleanMetric("leader.is_master"), - }, + mb.Registry.MustAddMetricSet("kubernetes", "controllermanager", New, + mb.WithHostParser(prometheus.HostParser)) +} + +// MetricSet type defines all fields of the MetricSet +// The event MetricSet listens to events from Kubernetes API server and streams them to the output. +// MetricSet implements the mb.PushMetricSet interface, and therefore does not rely on polling. +type MetricSet struct { + mb.BaseMetricSet + prometheusClient prometheus.Prometheus + prometheusMappings *prometheus.MetricsMapping + clusterMeta mapstr.M +} - Labels: map[string]prometheus.LabelMap{ - "code": prometheus.KeyLabel("code"), - "method": prometheus.KeyLabel("method"), - "host": prometheus.KeyLabel("host"), - "name": prometheus.KeyLabel("name"), - "zone": prometheus.KeyLabel("zone"), - "url": prometheus.KeyLabel("url"), - "verb": prometheus.KeyLabel("verb"), - }, +// New create a new instance of the MetricSet +// Part of new is also setting up the configuration by processing additional +// configuration entries if needed. +func New(base mb.BaseMetricSet) (mb.MetricSet, error) { + pc, err := prometheus.NewPrometheusClient(base) + if err != nil { + return nil, err + } + ms := &MetricSet{ + BaseMetricSet: base, + prometheusClient: pc, + prometheusMappings: mapping, + clusterMeta: util.AddClusterECSMeta(base), } - mb.Registry.MustAddMetricSet("kubernetes", "controllermanager", - prometheus.MetricSetBuilder(mapping), - mb.WithHostParser(prometheus.HostParser)) + return ms, nil +} + +// Fetch gathers information from the apiserver and reports events with this information. +func (m *MetricSet) Fetch(reporter mb.ReporterV2) error { + events, err := m.prometheusClient.GetProcessedMetrics(m.prometheusMappings) + if err != nil { + return fmt.Errorf("error getting metrics: %w", err) + } + + for _, e := range events { + event := mb.TransformMapStrToEvent("kubernetes", e, nil) + if m.clusterMeta != nil { + event.RootFields.DeepUpdate(m.clusterMeta) + } + isOpen := reporter.Event(event) + if !isOpen { + return nil + } + } + + return nil } diff --git a/metricbeat/module/kubernetes/proxy/_meta/test/metrics.proxy.1.14.expected b/metricbeat/module/kubernetes/proxy/_meta/test/metrics.proxy.1.14.expected index c9ec2c47cc4..cf68ff112ee 100644 --- a/metricbeat/module/kubernetes/proxy/_meta/test/metrics.proxy.1.14.expected +++ b/metricbeat/module/kubernetes/proxy/_meta/test/metrics.proxy.1.14.expected @@ -1,6 +1,6 @@ [ { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "process": { @@ -96,7 +96,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "code": "200", @@ -120,7 +120,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -144,7 +144,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "handler": "prometheus", @@ -200,7 +200,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { diff --git a/metricbeat/module/kubernetes/proxy/proxy.go b/metricbeat/module/kubernetes/proxy/proxy.go index 520a708f31d..4928134c282 100644 --- a/metricbeat/module/kubernetes/proxy/proxy.go +++ b/metricbeat/module/kubernetes/proxy/proxy.go @@ -18,39 +18,91 @@ package proxy import ( + "fmt" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/elastic-agent-libs/mapstr" ) +var mapping = &prometheus.MetricsMapping{ + Metrics: map[string]prometheus.MetricMap{ + + "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), + "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), + "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), + "process_open_fds": prometheus.Metric("process.fds.open.count"), + "process_start_time_seconds": prometheus.Metric("process.started.sec"), + "http_request_duration_microseconds": prometheus.Metric("http.request.duration.us"), + "http_request_size_bytes": prometheus.Metric("http.request.size.bytes"), + "http_response_size_bytes": prometheus.Metric("http.response.size.bytes"), + "http_requests_total": prometheus.Metric("http.request.count"), + "rest_client_requests_total": prometheus.Metric("client.request.count"), + "kubeproxy_sync_proxy_rules_duration_seconds": prometheus.Metric("sync.rules.duration.us", + prometheus.OpMultiplyBuckets(1000000)), + "kubeproxy_network_programming_duration_seconds": prometheus.Metric("sync.networkprogramming.duration.us", + prometheus.OpMultiplyBuckets(1000000)), + }, + + Labels: map[string]prometheus.LabelMap{ + "code": prometheus.KeyLabel("code"), + "host": prometheus.KeyLabel("host"), + "method": prometheus.KeyLabel("method"), + "handler": prometheus.KeyLabel("handler"), + }, +} + func init() { - mapping := &prometheus.MetricsMapping{ - Metrics: map[string]prometheus.MetricMap{ - - "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), - "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), - "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), - "process_open_fds": prometheus.Metric("process.fds.open.count"), - "process_start_time_seconds": prometheus.Metric("process.started.sec"), - "http_request_duration_microseconds": prometheus.Metric("http.request.duration.us"), - "http_request_size_bytes": prometheus.Metric("http.request.size.bytes"), - "http_response_size_bytes": prometheus.Metric("http.response.size.bytes"), - "http_requests_total": prometheus.Metric("http.request.count"), - "rest_client_requests_total": prometheus.Metric("client.request.count"), - "kubeproxy_sync_proxy_rules_duration_seconds": prometheus.Metric("sync.rules.duration.us", - prometheus.OpMultiplyBuckets(1000000)), - "kubeproxy_network_programming_duration_seconds": prometheus.Metric("sync.networkprogramming.duration.us", - prometheus.OpMultiplyBuckets(1000000)), - }, - - Labels: map[string]prometheus.LabelMap{ - "code": prometheus.KeyLabel("code"), - "host": prometheus.KeyLabel("host"), - "method": prometheus.KeyLabel("method"), - "handler": prometheus.KeyLabel("handler"), - }, + mb.Registry.MustAddMetricSet("kubernetes", "proxy", New, + mb.WithHostParser(prometheus.HostParser)) +} + +// MetricSet type defines all fields of the MetricSet +// The event MetricSet listens to events from Kubernetes API server and streams them to the output. +// MetricSet implements the mb.PushMetricSet interface, and therefore does not rely on polling. +type MetricSet struct { + mb.BaseMetricSet + prometheusClient prometheus.Prometheus + prometheusMappings *prometheus.MetricsMapping + clusterMeta mapstr.M +} + +// New create a new instance of the MetricSet +// Part of new is also setting up the configuration by processing additional +// configuration entries if needed. +func New(base mb.BaseMetricSet) (mb.MetricSet, error) { + pc, err := prometheus.NewPrometheusClient(base) + if err != nil { + return nil, err + } + ms := &MetricSet{ + BaseMetricSet: base, + prometheusClient: pc, + prometheusMappings: mapping, + clusterMeta: util.AddClusterECSMeta(base), } - mb.Registry.MustAddMetricSet("kubernetes", "proxy", - prometheus.MetricSetBuilder(mapping), - mb.WithHostParser(prometheus.HostParser)) + return ms, nil +} + +// Fetch gathers information from the apiserver and reports events with this information. +func (m *MetricSet) Fetch(reporter mb.ReporterV2) error { + events, err := m.prometheusClient.GetProcessedMetrics(m.prometheusMappings) + if err != nil { + return fmt.Errorf("error getting metrics: %w", err) + } + + for _, e := range events { + event := mb.TransformMapStrToEvent("kubernetes", e, nil) + if m.clusterMeta != nil { + event.RootFields.DeepUpdate(m.clusterMeta) + } + isOpen := reporter.Event(event) + if !isOpen { + return nil + } + } + + return nil } diff --git a/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected b/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected index 056f2cca261..362668e7043 100644 --- a/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected +++ b/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected @@ -1,6 +1,6 @@ [ { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "process": { @@ -72,7 +72,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "operation": "preemption_evaluation", @@ -102,7 +102,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "operation": "predicate_evaluation", @@ -132,7 +132,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "leader": { @@ -152,7 +152,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "result": "scheduled", @@ -176,7 +176,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -200,7 +200,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "result": "error", @@ -224,7 +224,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -248,7 +248,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "result": "unschedulable", @@ -272,7 +272,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "handler": "prometheus", @@ -328,7 +328,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "operation": "binding", @@ -358,7 +358,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -382,7 +382,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -406,7 +406,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "code": "200", diff --git a/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.17.expected b/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.17.expected index 096dc18fdc4..1e652d03c12 100644 --- a/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.17.expected +++ b/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.17.expected @@ -1,6 +1,6 @@ [ { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -24,7 +24,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "process": { @@ -110,7 +110,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "operation": "predicate_evaluation", @@ -140,7 +140,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "operation": "binding", @@ -170,7 +170,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -194,7 +194,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "leader": { @@ -214,7 +214,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { @@ -238,7 +238,7 @@ "DisableTimeSeries": false }, { - "RootFields": null, + "RootFields": {}, "ModuleFields": null, "MetricSetFields": { "client": { diff --git a/metricbeat/module/kubernetes/scheduler/scheduler.go b/metricbeat/module/kubernetes/scheduler/scheduler.go index bb68114df4e..33e13784ddf 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler.go @@ -18,46 +18,97 @@ package scheduler import ( + "fmt" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/elastic-agent-libs/mapstr" ) +var mapping = &prometheus.MetricsMapping{ + Metrics: map[string]prometheus.MetricMap{ + "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), + "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), + "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), + "process_open_fds": prometheus.Metric("process.fds.open.count"), + "process_start_time_seconds": prometheus.Metric("process.started.sec"), + "http_request_duration_microseconds": prometheus.Metric("http.request.duration.us"), + "http_request_size_bytes": prometheus.Metric("http.request.size.bytes"), + "http_response_size_bytes": prometheus.Metric("http.response.size.bytes"), + "http_requests_total": prometheus.Metric("http.request.count"), + "rest_client_requests_total": prometheus.Metric("client.request.count"), + "leader_election_master_status": prometheus.BooleanMetric("leader.is_master"), + "scheduler_e2e_scheduling_duration_seconds": prometheus.Metric("scheduling.e2e.duration.us", + prometheus.OpMultiplyBuckets(1000000)), + "scheduler_pod_preemption_victims": prometheus.Metric("scheduling.pod.preemption.victims", + // this is needed in order to solve compatibility issue of different + // different k8s versions, issue: https://github.com/elastic/beats/issues/19332 + prometheus.OpSetNumericMetricSuffix("count")), + "scheduler_schedule_attempts_total": prometheus.Metric("scheduling.pod.attempts.count"), + "scheduler_scheduling_duration_seconds": prometheus.Metric("scheduling.duration.seconds"), + }, + + Labels: map[string]prometheus.LabelMap{ + "handler": prometheus.KeyLabel("handler"), + "code": prometheus.KeyLabel("code"), + "method": prometheus.KeyLabel("method"), + "host": prometheus.KeyLabel("host"), + "name": prometheus.KeyLabel("name"), + "result": prometheus.KeyLabel("result"), + "operation": prometheus.KeyLabel("operation"), + }, +} + func init() { - mapping := &prometheus.MetricsMapping{ - Metrics: map[string]prometheus.MetricMap{ - "process_cpu_seconds_total": prometheus.Metric("process.cpu.sec"), - "process_resident_memory_bytes": prometheus.Metric("process.memory.resident.bytes"), - "process_virtual_memory_bytes": prometheus.Metric("process.memory.virtual.bytes"), - "process_open_fds": prometheus.Metric("process.fds.open.count"), - "process_start_time_seconds": prometheus.Metric("process.started.sec"), - "http_request_duration_microseconds": prometheus.Metric("http.request.duration.us"), - "http_request_size_bytes": prometheus.Metric("http.request.size.bytes"), - "http_response_size_bytes": prometheus.Metric("http.response.size.bytes"), - "http_requests_total": prometheus.Metric("http.request.count"), - "rest_client_requests_total": prometheus.Metric("client.request.count"), - "leader_election_master_status": prometheus.BooleanMetric("leader.is_master"), - "scheduler_e2e_scheduling_duration_seconds": prometheus.Metric("scheduling.e2e.duration.us", - prometheus.OpMultiplyBuckets(1000000)), - "scheduler_pod_preemption_victims": prometheus.Metric("scheduling.pod.preemption.victims", - // this is needed in order to solve compatibility issue of different - // different k8s versions, issue: https://github.com/elastic/beats/issues/19332 - prometheus.OpSetNumericMetricSuffix("count")), - "scheduler_schedule_attempts_total": prometheus.Metric("scheduling.pod.attempts.count"), - "scheduler_scheduling_duration_seconds": prometheus.Metric("scheduling.duration.seconds"), - }, - - Labels: map[string]prometheus.LabelMap{ - "handler": prometheus.KeyLabel("handler"), - "code": prometheus.KeyLabel("code"), - "method": prometheus.KeyLabel("method"), - "host": prometheus.KeyLabel("host"), - "name": prometheus.KeyLabel("name"), - "result": prometheus.KeyLabel("result"), - "operation": prometheus.KeyLabel("operation"), - }, + mb.Registry.MustAddMetricSet("kubernetes", "scheduler", New, + mb.WithHostParser(prometheus.HostParser)) +} + +// MetricSet type defines all fields of the MetricSet +// The event MetricSet listens to events from Kubernetes API server and streams them to the output. +// MetricSet implements the mb.PushMetricSet interface, and therefore does not rely on polling. +type MetricSet struct { + mb.BaseMetricSet + prometheusClient prometheus.Prometheus + prometheusMappings *prometheus.MetricsMapping + clusterMeta mapstr.M +} + +// New create a new instance of the MetricSet +// Part of new is also setting up the configuration by processing additional +// configuration entries if needed. +func New(base mb.BaseMetricSet) (mb.MetricSet, error) { + pc, err := prometheus.NewPrometheusClient(base) + if err != nil { + return nil, err + } + ms := &MetricSet{ + BaseMetricSet: base, + prometheusClient: pc, + prometheusMappings: mapping, + clusterMeta: util.AddClusterECSMeta(base), } + return ms, nil +} - mb.Registry.MustAddMetricSet("kubernetes", "scheduler", - prometheus.MetricSetBuilder(mapping), - mb.WithHostParser(prometheus.HostParser)) +// Fetch gathers information from the apiserver and reports events with this information. +func (m *MetricSet) Fetch(reporter mb.ReporterV2) error { + events, err := m.prometheusClient.GetProcessedMetrics(m.prometheusMappings) + if err != nil { + return fmt.Errorf("error getting metrics: %w", err) + } + + for _, e := range events { + event := mb.TransformMapStrToEvent("kubernetes", e, nil) + if m.clusterMeta != nil { + event.RootFields.DeepUpdate(m.clusterMeta) + } + isOpen := reporter.Event(event) + if !isOpen { + return nil + } + } + + return nil } diff --git a/metricbeat/module/kubernetes/system/system.go b/metricbeat/module/kubernetes/system/system.go index 7975261ce02..f72c53000ca 100644 --- a/metricbeat/module/kubernetes/system/system.go +++ b/metricbeat/module/kubernetes/system/system.go @@ -24,6 +24,8 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/beats/v7/metricbeat/mb/parse" k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/elastic-agent-libs/mapstr" ) const ( @@ -53,8 +55,9 @@ func init() { // multiple fetch calls. type MetricSet struct { mb.BaseMetricSet - http *helper.HTTP - mod k8smod.Module + http *helper.HTTP + mod k8smod.Module + clusterMeta mapstr.M } // New create a new instance of the MetricSet @@ -69,11 +72,14 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { if !ok { return nil, fmt.Errorf("must be child of kubernetes module") } - return &MetricSet{ + ms := &MetricSet{ BaseMetricSet: base, http: http, mod: mod, - }, nil + clusterMeta: util.AddClusterECSMeta(base), + } + + return ms, nil } // Fetch methods implements the data gathering and data conversion to the right @@ -91,7 +97,11 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error { } for _, e := range events { - isOpen := reporter.Event(mb.TransformMapStrToEvent("kubernetes", e, nil)) + event := mb.TransformMapStrToEvent("kubernetes", e, nil) + if m.clusterMeta != nil { + event.RootFields.DeepUpdate(m.clusterMeta) + } + isOpen := reporter.Event(event) if !isOpen { return nil } diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index aeddde7dbbf..c52f4bf8571 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -574,3 +574,24 @@ func GetClusterECSMeta(cfg *conf.C, client k8sclient.Interface, logger *logp.Log } return ecsClusterMeta, nil } + +// AddClusterECSMeta adds ECS orchestrator fields +func AddClusterECSMeta(base mb.BaseMetricSet) mapstr.M { + config, err := GetValidatedConfig(base) + if err != nil { + logp.Info("could not retrieve validated config") + return nil + } + client, err := kubernetes.GetKubernetesClient(config.KubeConfig, config.KubeClientOptions) + if err != nil { + logp.Err("fail to get kubernetes client: %s", err) + return nil + } + cfg, _ := conf.NewConfigFrom(&config) + ecsClusterMeta, err := GetClusterECSMeta(cfg, client, base.Logger()) + if err != nil { + logp.Info("could not retrieve cluster metadata: %s", err) + return nil + } + return ecsClusterMeta +} diff --git a/metricbeat/module/kubernetes/util/prometheus.go b/metricbeat/module/kubernetes/util/prometheus.go index a5236f95d1f..06430ccc53f 100644 --- a/metricbeat/module/kubernetes/util/prometheus.go +++ b/metricbeat/module/kubernetes/util/prometheus.go @@ -17,7 +17,9 @@ package util -import dto "github.com/prometheus/client_model/go" +import ( + dto "github.com/prometheus/client_model/go" +) // GetLabel returns desired label from the given metric, or "" if not present func GetLabel(m *dto.Metric, label string) string { diff --git a/metricbeat/module/kubernetes/volume/volume.go b/metricbeat/module/kubernetes/volume/volume.go index b0f54c275a8..911ccb9a61f 100644 --- a/metricbeat/module/kubernetes/volume/volume.go +++ b/metricbeat/module/kubernetes/volume/volume.go @@ -25,8 +25,6 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb/parse" k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" - "github.com/elastic/elastic-agent-autodiscover/kubernetes" - conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -82,26 +80,9 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { BaseMetricSet: base, http: http, mod: mod, + clusterMeta: util.AddClusterECSMeta(base), } - // add ECS orchestrator fields - config, err := util.GetValidatedConfig(base) - if err != nil { - logp.Info("Kubernetes metricset enriching is disabled") - } else { - client, err := kubernetes.GetKubernetesClient(config.KubeConfig, config.KubeClientOptions) - if err != nil { - return nil, fmt.Errorf("fail to get kubernetes client: %w", err) - } - cfg, _ := conf.NewConfigFrom(&config) - ecsClusterMeta, err := util.GetClusterECSMeta(cfg, client, ms.Logger()) - if err != nil { - ms.Logger().Debugf("could not retrieve cluster metadata: %w", err) - } - if ecsClusterMeta != nil { - ms.clusterMeta = ecsClusterMeta - } - } return ms, nil }