diff --git a/.ci/updatecli.d/update-json-specs.yml b/.ci/updatecli.d/update-json-specs.yml index d1dadfe9d9..d39d4e765d 100644 --- a/.ci/updatecli.d/update-json-specs.yml +++ b/.ci/updatecli.d/update-json-specs.yml @@ -24,10 +24,10 @@ sources: - findsubmatch: pattern: "[0-9a-f]{40}" - cgroup_parsing.json: + container_metadata_discovery.json: kind: file spec: - file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/cgroup_parsing.json + file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/container_metadata_discovery.json service_resource_inference.json: kind: file spec: @@ -70,13 +70,13 @@ actions: * https://github.com/elastic/apm/commit/{{ source "sha" }} targets: - cgroup_parsing.json: - name: cgroup_parsing.json + container_metadata_discovery.json: + name: container_metadata_discovery.json scmid: default - sourceid: cgroup_parsing.json + sourceid: container_metadata_discovery.json kind: file spec: - file: test/fixtures/json-specs/cgroup_parsing.json + file: test/fixtures/json-specs/container_metadata_discovery.json service_resource_inference.json: name: service_resource_inference.json scmid: default diff --git a/test/fixtures/json-specs/cgroup_parsing.json b/test/fixtures/json-specs/cgroup_parsing.json deleted file mode 100644 index f28d87d4c3..0000000000 --- a/test/fixtures/json-specs/cgroup_parsing.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "testUnderscores": { - "groupLine": "1:name=systemd:/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod90d81341_92de_11e7_8cf2_507b9d4141fa.slice/crio-2227daf62df6694645fee5df53c1f91271546a9560e8600a525690ae252b7f63.scope", - "containerId": "2227daf62df6694645fee5df53c1f91271546a9560e8600a525690ae252b7f63", - "podId": "90d81341-92de-11e7-8cf2-507b9d4141fa" - }, - "testOpenshiftForm": { - "groupLine": "9:freezer:/kubepods.slice/kubepods-pod22949dce_fd8b_11ea_8ede_98f2b32c645c.slice/docker-b15a5bdedd2e7645c3be271364324321b908314e4c77857bbfd32a041148c07f.scope", - "containerId": "b15a5bdedd2e7645c3be271364324321b908314e4c77857bbfd32a041148c07f", - "podId": "22949dce-fd8b-11ea-8ede-98f2b32c645c" - }, - "testUbuntuCGroup": { - "groupLine": "1:name=systemd:/user.slice/user-1000.slice/user@1000.service/apps.slice/apps-org.gnome.Terminal.slice/vte-spawn-75bc72bd-6642-4cf5-b62c-0674e11bfc84.scope", - "containerId": null, - "podId": null - }, - "testAwsEcsCGroup": { - "groupLine": "1:name=systemd:/ecs/03752a671e744971a862edcee6195646/03752a671e744971a862edcee6195646-4015103728", - "containerId": "03752a671e744971a862edcee6195646-4015103728", - "podId": null - } -}