Skip to content

Commit a55a54f

Browse files
authored
Merge branch 'main' into dependabot/go_modules/github.com/elastic/elastic-agent-libs-0.7.5
2 parents f98ba8c + b607b92 commit a55a54f

File tree

3 files changed

+39
-1
lines changed

3 files changed

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

pkg/testing/ess/serverless.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ func (srv *ServerlessClient) WaitForKibana(ctx context.Context) error {
250250

251251
// ResetCredentials resets the credentials for the given ESS instance
252252
func (srv *ServerlessClient) ResetCredentials(ctx context.Context) (CredResetResponse, error) {
253-
resetURL := fmt.Sprintf("%s/api/v1/serverless/projects/%s/%s/_reset-credentials", serverlessURL, srv.projectType, srv.proj.ID)
253+
resetURL := fmt.Sprintf("%s/api/v1/serverless/projects/%s/%s/_reset-internal-credentials", serverlessURL, srv.projectType, srv.proj.ID)
254254

255255
resetHandler, err := http.NewRequestWithContext(ctx, "POST", resetURL, nil)
256256
if err != nil {

specs/filebeat.spec.yml

+6
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ inputs:
9595
outputs: *outputs
9696
shippers: *shippers
9797
command: *command
98+
- name: etw
99+
description: "Event Tracing for Windows"
100+
platforms: *platforms
101+
outputs: *outputs
102+
shippers: *shippers
103+
command: *command
98104
- name: gcp-pubsub
99105
description: "GCP Pub-Sub"
100106
platforms: *platforms

0 commit comments

Comments
 (0)