From 328ea22027a306b658be762797140f5567465a47 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Wed, 1 Oct 2025 16:44:44 +0200 Subject: [PATCH 1/5] Define default value for otelcol datasets --- .../parallel/httpcheck/_dev/test/policy/test-eprcheck.expected | 2 +- test/packages/parallel/httpcheck/manifest.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected index 715512ae1a..e86914b30f 100644 --- a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected +++ b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected @@ -25,7 +25,7 @@ processors: - context: datapoint statements: - set(attributes["data_stream.type"], "metrics") - - set(attributes["data_stream.dataset"], "httpcheck.check") + - set(attributes["data_stream.dataset"], "httpcheckreceiver") - set(attributes["data_stream.namespace"], "ep") receivers: httpcheck/componentid-0: diff --git a/test/packages/parallel/httpcheck/manifest.yml b/test/packages/parallel/httpcheck/manifest.yml index 20af460097..c24b895506 100644 --- a/test/packages/parallel/httpcheck/manifest.yml +++ b/test/packages/parallel/httpcheck/manifest.yml @@ -31,6 +31,7 @@ policy_templates: title: HTTP Check description: Perform HTTP checks and collect its results. input: otelcol + otelcol_dataset: httpcheckreceiver template_path: input.yml.hbs vars: - name: period From d4b0aed1d6a66fb76c2af5db8ecc48dabc5287a2 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 7 Oct 2025 12:47:39 +0200 Subject: [PATCH 2/5] Align otel input test package with current recommendations --- .../parallel/httpcheck/fields/base-fields.yml | 12 ------------ test/packages/parallel/httpcheck/manifest.yml | 7 +------ 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 test/packages/parallel/httpcheck/fields/base-fields.yml diff --git a/test/packages/parallel/httpcheck/fields/base-fields.yml b/test/packages/parallel/httpcheck/fields/base-fields.yml deleted file mode 100644 index 7c798f4534..0000000000 --- a/test/packages/parallel/httpcheck/fields/base-fields.yml +++ /dev/null @@ -1,12 +0,0 @@ -- name: data_stream.type - type: constant_keyword - description: Data stream type. -- name: data_stream.dataset - type: constant_keyword - description: Data stream dataset. -- name: data_stream.namespace - type: constant_keyword - description: Data stream namespace. -- name: '@timestamp' - type: date - description: Event timestamp. diff --git a/test/packages/parallel/httpcheck/manifest.yml b/test/packages/parallel/httpcheck/manifest.yml index c24b895506..9d39df043c 100644 --- a/test/packages/parallel/httpcheck/manifest.yml +++ b/test/packages/parallel/httpcheck/manifest.yml @@ -26,12 +26,11 @@ icons: size: 32x32 type: image/svg+xml policy_templates: - - name: check + - name: httpcheckreceiver type: metrics title: HTTP Check description: Perform HTTP checks and collect its results. input: otelcol - otelcol_dataset: httpcheckreceiver template_path: input.yml.hbs vars: - name: period @@ -68,10 +67,6 @@ policy_templates: multi: true required: false show_user: false -elasticsearch: - index_template: - mappings: - subobjects: false owner: github: elastic/ecosystem type: elastic From 3942c3ee83bf42a201caeb4b9697928890fa46aa Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 7 Oct 2025 13:31:54 +0200 Subject: [PATCH 3/5] Replace package-spec --- go.mod | 3 ++- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 99378e7dc8..9fe13281e8 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,6 @@ require ( golang.org/x/term v0.35.0 // indirect golang.org/x/text v0.29.0 // indirect golang.org/x/time v0.12.0 // indirect - golang.org/x/tools/go/expect v0.1.1-deprecated // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -202,3 +201,5 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect ) + +replace github.com/elastic/package-spec/v3 => github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98 diff --git a/go.sum b/go.sum index 821147ae66..f6b6f56d29 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,6 @@ github.com/elastic/gojsonschema v1.2.1 h1:cUMbgsz0wyEB4x7xf3zUEvUVDl6WCz2RKcQPul github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg= github.com/elastic/kbncontent v0.1.4 h1:GoUkJkqkn2H6iJTnOHcxEqYVVYyjvcebLQVaSR1aSvU= github.com/elastic/kbncontent v0.1.4/go.mod h1:kOPREITK9gSJsiw/WKe7QWSO+PRiZMyEFQCw+CMLAHI= -github.com/elastic/package-spec/v3 v3.5.0 h1:rvB+lWXXoUkSVx4TaHerV/eO6uN0NH1E5sPW1kW74Lk= -github.com/elastic/package-spec/v3 v3.5.0/go.mod h1:dH//Q1geKx3fxC0lwPrVmnjN6RMqyDf5tnsw7trwqWE= github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU= github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -262,6 +260,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98 h1:IdPZ6E8R2mI3O+BF+W1VbLPsTh+Lqs8S6MjgRKDRpnc= +github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98/go.mod h1:vWBPhVjiL8XoZ85lyCSMjKqSwzeb41zEmd6lElJsrk0= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= From 8dfe41b8ced92ffd511554a42498e8c609919e03 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 7 Oct 2025 17:08:08 +0200 Subject: [PATCH 4/5] Update expected policy --- .../parallel/httpcheck/_dev/test/policy/test-eprcheck.expected | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected index e86914b30f..9ac9ac20d7 100644 --- a/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected +++ b/test/packages/parallel/httpcheck/_dev/test/policy/test-eprcheck.expected @@ -25,7 +25,7 @@ processors: - context: datapoint statements: - set(attributes["data_stream.type"], "metrics") - - set(attributes["data_stream.dataset"], "httpcheckreceiver") + - set(attributes["data_stream.dataset"], "httpcheck.httpcheckreceiver") - set(attributes["data_stream.namespace"], "ep") receivers: httpcheck/componentid-0: From ce717360b0201a47d5c3e02625d5d24e4eda2669 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 23 Oct 2025 20:57:34 +0200 Subject: [PATCH 5/5] Revert go.mod replaces --- go.mod | 3 +-- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8fa86f8e26..293f297ec1 100644 --- a/go.mod +++ b/go.mod @@ -183,6 +183,7 @@ require ( golang.org/x/term v0.36.0 // indirect golang.org/x/text v0.30.0 // indirect golang.org/x/time v0.12.0 // indirect + golang.org/x/tools/go/expect v0.1.1-deprecated // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -201,5 +202,3 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect ) - -replace github.com/elastic/package-spec/v3 => github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98 diff --git a/go.sum b/go.sum index 9a85c668b5..b34f5a5d5c 100644 --- a/go.sum +++ b/go.sum @@ -132,6 +132,8 @@ github.com/elastic/gojsonschema v1.2.1 h1:cUMbgsz0wyEB4x7xf3zUEvUVDl6WCz2RKcQPul github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg= github.com/elastic/kbncontent v0.1.4 h1:GoUkJkqkn2H6iJTnOHcxEqYVVYyjvcebLQVaSR1aSvU= github.com/elastic/kbncontent v0.1.4/go.mod h1:kOPREITK9gSJsiw/WKe7QWSO+PRiZMyEFQCw+CMLAHI= +github.com/elastic/package-spec/v3 v3.5.0 h1:rvB+lWXXoUkSVx4TaHerV/eO6uN0NH1E5sPW1kW74Lk= +github.com/elastic/package-spec/v3 v3.5.0/go.mod h1:dH//Q1geKx3fxC0lwPrVmnjN6RMqyDf5tnsw7trwqWE= github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU= github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -260,8 +262,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98 h1:IdPZ6E8R2mI3O+BF+W1VbLPsTh+Lqs8S6MjgRKDRpnc= -github.com/jsoriano/package-spec/v3 v3.0.0-20251007110543-e0845c9b6b98/go.mod h1:vWBPhVjiL8XoZ85lyCSMjKqSwzeb41zEmd6lElJsrk0= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=