Merge branch 'main' into dependabot/go_modules/otel-dependencies-c1de…

…7b8524

changelog/fragments/1707481157-etw-filebeat-spec.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: feature
+
+# Change summary; a 80ish characters long description of the change.
+summary: Add ETW input mapping to the Filebeat spec.
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: spec
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: https://github.com/owner/repo/1234
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234

pkg/testing/ess/serverless.go

@@ -250,7 +250,7 @@ func (srv *ServerlessClient) WaitForKibana(ctx context.Context) error {
 
 // ResetCredentials resets the credentials for the given ESS instance
 func (srv *ServerlessClient) ResetCredentials(ctx context.Context) (CredResetResponse, error) {
-	resetURL := fmt.Sprintf("%s/api/v1/serverless/projects/%s/%s/_reset-credentials", serverlessURL, srv.projectType, srv.proj.ID)
+	resetURL := fmt.Sprintf("%s/api/v1/serverless/projects/%s/%s/_reset-internal-credentials", serverlessURL, srv.projectType, srv.proj.ID)
 
 	resetHandler, err := http.NewRequestWithContext(ctx, "POST", resetURL, nil)
 	if err != nil {

specs/filebeat.spec.yml

@@ -95,6 +95,12 @@ inputs:
     outputs: *outputs
     shippers: *shippers
     command: *command
+  - name: etw
+    description: "Event Tracing for Windows"
+    platforms: *platforms
+    outputs: *outputs
+    shippers: *shippers
+    command: *command
   - name: gcp-pubsub
     description: "GCP Pub-Sub"
     platforms: *platforms