Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into add-beats-tests-to-…
Browse files Browse the repository at this point in the history
…serverless
  • Loading branch information
fearful-symmetry committed Nov 13, 2023
2 parents 48d7ea2 + 755c8cb commit 374cc74
Show file tree
Hide file tree
Showing 12 changed files with 146 additions and 30 deletions.
32 changes: 32 additions & 0 deletions changelog/fragments/1699010487-leaderelectionconfig.yaml
Original file line number Diff line number Diff line change
@@ -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: enhancement

# Change summary; a 80ish characters long description of the change.
summary: Added Kubernetes leader_election provider configuration parameters

# 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: elastic-agent

# 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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -132,6 +132,21 @@ data:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_namespace
type: metrics
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'kube-state-metrics:8080'
period: 10s
# Openshift:
# if to access 'kube-state-metrics' are used third party tools, like kube-rbac-proxy or similar, that perform RBAC authorization
# and/or tls termination, then configuration below should be considered:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_node
type: metrics
Expand Down Expand Up @@ -337,7 +352,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -365,7 +380,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -506,7 +521,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -127,7 +127,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand All @@ -152,7 +152,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -293,7 +293,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ data:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_namespace
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_node
Expand Down Expand Up @@ -173,4 +183,4 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -127,7 +127,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand All @@ -152,7 +152,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -293,7 +293,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ data:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_namespace
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_node
Expand Down Expand Up @@ -173,4 +183,4 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
23 changes: 19 additions & 4 deletions deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -132,6 +132,21 @@ data:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_namespace
type: metrics
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'kube-state-metrics:8080'
period: 10s
# Openshift:
# if to access 'kube-state-metrics' are used third party tools, like kube-rbac-proxy or similar, that perform RBAC authorization
# and/or tls termination, then configuration below should be considered:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_node
type: metrics
Expand Down Expand Up @@ -337,7 +352,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -365,7 +380,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -506,7 +521,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -132,6 +132,21 @@ data:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_namespace
type: metrics
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'kube-state-metrics:8080'
period: 10s
# Openshift:
# if to access 'kube-state-metrics' are used third party tools, like kube-rbac-proxy or similar, that perform RBAC authorization
# and/or tls termination, then configuration below should be considered:
# bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
# ssl.certificate_authorities:
# - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
- data_stream:
dataset: kubernetes.state_node
type: metrics
Expand Down Expand Up @@ -337,7 +352,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -365,7 +380,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -506,7 +521,7 @@ data:
meta:
package:
name: kubernetes
version: 1.29.2
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -127,7 +127,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand All @@ -152,7 +152,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down Expand Up @@ -293,7 +293,7 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
data_stream:
namespace: default
streams:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ data:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_namespace
metricsets:
- state_namespace
add_metadata: true
hosts:
- 'localhost:8080'
period: 10s
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
- data_stream:
type: metrics
dataset: kubernetes.state_node
Expand Down Expand Up @@ -173,4 +183,4 @@ data:
meta:
package:
name: kubernetes
version: 1.42.0
version: 1.52.0
Loading

0 comments on commit 374cc74

Please sign in to comment.