Skip to content

Commit 462b708

Browse files
committed
Merge remote-tracking branch 'upstream/main' into beats-report-package-version
2 parents 83712d9 + ca03640 commit 462b708

File tree

8 files changed

+143
-34
lines changed

8 files changed

+143
-34
lines changed

NOTICE.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23268,11 +23268,11 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg/scram@v1.0.3/LICENS
2326823268

2326923269
--------------------------------------------------------------------------------
2327023270
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
23271-
Version: v2.4.7
23271+
Version: v2.4.8
2327223272
Licence type (autodetected): Apache-2.0
2327323273
--------------------------------------------------------------------------------
2327423274

23275-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.4.7/LICENSE:
23275+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.4.8/LICENSE:
2327623276

2327723277
Apache License
2327823278
Version 2.0, January 2004

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ require (
219219
github.com/pkg/xattr v0.4.9
220220
github.com/sergi/go-diff v1.3.1
221221
github.com/shirou/gopsutil/v3 v3.22.10
222-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.7
222+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8
223223
go.elastic.co/apm/module/apmhttp/v2 v2.4.8
224224
go.elastic.co/apm/v2 v2.4.8
225225
go.mongodb.org/mongo-driver v1.5.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1920,8 +1920,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
19201920
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
19211921
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
19221922
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
1923-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.7 h1:Gfp+wxPotE1s5X5ufn3W28zYaSunKEWE/x9Xo+5WzoI=
1924-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.7/go.mod h1:taxw6rHuZtTF0p0DAv1xAg0fkvGprVIJu92JvbcgifU=
1923+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8 h1:4j3wI1e+WV6u+9ZR7lorkJI2rnJfjOWtkMeZG08PbRI=
1924+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8/go.mod h1:C9ajbSjZ3akTrFOjBr+pMq8bPVOH9vhIG+knZAuPW3s=
19251925
go.elastic.co/apm/module/apmhttp/v2 v2.4.8 h1:C1piLq4wcFHFB7jpFW1WPEyEl6zbRpf9SAY8S8tX7Qk=
19261926
go.elastic.co/apm/module/apmhttp/v2 v2.4.8/go.mod h1:FzO5ptAs5oKB3xE1/hpxMA0a7mLIycp2RZdBtp4+uTA=
19271927
go.elastic.co/apm/v2 v2.4.8 h1:3RuqxDjhgumT1BYxJGnVPdGY12lCzF+KGyvtSTynCYo=

libbeat/docs/shared-autodiscover.asciidoc

+132-23
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ Configuration parameters:
178178
* `node` or `namespace`: Specify labels and annotations filters for the extra metadata coming from node and namespace. By default all labels are included while annotations are not. To change default behaviour `include_labels`, `exclude_labels` and `include_annotations` can be defined. Those settings are useful when storing labels and annotations that require special handling to avoid overloading the storage output.
179179
Note: wildcards are not supported for those settings.
180180
The enrichment of `node` or `namespace` metadata can be individually disabled by setting `enabled: false`.
181-
* `deployment`: If resource is `pod` and it is created from a `deployment`, by default the deployment name is added, this can be disabled by setting `deployment: false`.
182-
* `cronjob`: If resource is `pod` and it is created from a `cronjob`, by default the cronjob name is added, this can be disabled by setting `cronjob: false`.
181+
* `deployment`: If resource is `pod` and it is created from a `deployment`, by default the deployment name isn't added, this can be enabled by setting `deployment: true`.
182+
* `cronjob`: If resource is `pod` and it is created from a `cronjob`, by default the cronjob name isn't added, this can be enabled by setting `cronjob: true`.
183183
+
184184
Example:
185185
["source","yaml",subs="attributes"]
@@ -190,8 +190,8 @@ Example:
190190
node:
191191
include_labels: ["nodelabel2"]
192192
include_annotations: ["nodeannotation1"]
193-
deployment: false
194-
cronjob: false
193+
# deployment: false
194+
# cronjob: false
195195
-------------------------------------------------------------------------------------
196196

197197
`unique`:: (Optional) Defaults to `false`. Marking an autodiscover provider as unique results into
@@ -203,39 +203,148 @@ Example:
203203
Different Beats that refer to the same leader lease will be competitors in holding the lease
204204
and only one will be elected as leader each time.
205205

206-
The configuration of templates and conditions is similar to that of the Docker provider. Configuration templates can
207-
contain variables from the autodiscover event. They can be accessed under data namespace.
206+
Configuration templates can contain variables from the autodiscover event. These variables can be accessed under the `data`
207+
namespace, e.g. to access Pod IP: `${data.kubernetes.pod.ip}`.
208208

209-
These are the fields available within config templating. The `kubernetes.*` fields will be available on each emitted event.
209+
These are the fields available within config templating. The `kubernetes.*` fields will be available on each emitted event:
210210

211211
[float]
212212
====== Generic fields:
213213
* host
214-
* port (if exposed)
215-
* kubernetes.labels
216-
* kubernetes.annotations
217214

218215
[float]
219216
====== Pod specific:
220-
* kubernetes.container.id
221-
* kubernetes.container.image
222-
* kubernetes.container.name
223-
* kubernetes.namespace
224-
* kubernetes.node.name
225-
* kubernetes.pod.name
226-
* kubernetes.pod.uid
217+
|===
218+
|Key |Type |Description
219+
220+
|`port`
221+
|`string`
222+
|Pod port. If pod has multiple ports exposed should be used `ports.<port-name>` instead
223+
224+
|`kubernetes.namespace`
225+
|`string`
226+
|Namespace, where the Pod is running
227+
228+
|`kubernetes.namespace_uuid`
229+
|`string`
230+
|UUID of the Namespace, where the Pod is running
231+
232+
|`kubernetes.namespace_annotations.*`
233+
|`object`
234+
|Annotations of the Namespace, where the Pod is running. Annotations should be used in not dedoted format, e.g. `kubernetes.namespace_annotations.app.kubernetes.io/name`
235+
236+
|`kubernetes.pod.name`
237+
|`string`
238+
|Name of the Pod
239+
240+
|`kubernetes.pod.uid`
241+
|`string`
242+
|UID of the Pod
243+
244+
|`kubernetes.pod.ip`
245+
|`string`
246+
|IP of the Pod
247+
248+
|`kubernetes.labels.*`
249+
|`object`
250+
|Object of the Pod labels. Labels should be used in not dedoted format, e.g. `kubernetes.labels.app.kubernetes.io/name`
251+
252+
|`kubernetes.annotations.*`
253+
|`object`
254+
|Object of the Pod annotations. Annotations should be used in not dedoted format, e.g. `kubernetes.annotations.test.io/test`
255+
256+
|`kubernetes.container.name`
257+
|`string`
258+
|Name of the container
259+
260+
|`kubernetes.container.runtime`
261+
|`string`
262+
|Runtime of the container
263+
264+
|`kubernetes.container.id`
265+
|`string`
266+
|ID of the container
267+
268+
|`kubernetes.container.image`
269+
|`string`
270+
|Image of the container
271+
272+
|`kubernetes.node.name`
273+
|`string`
274+
|Name of the Node
275+
276+
|`kubernetes.node.uid`
277+
|`string`
278+
|UID of the Node
279+
280+
|`kubernetes.node.hostname`
281+
|`string`
282+
|Hostname of the Node
283+
|===
227284

228285
[float]
229286
====== Node specific:
230-
* kubernetes.node.name
231-
* kubernetes.node.uid
287+
|===
288+
|Key |Type |Description
289+
290+
|`kubernetes.labels.*`
291+
|`object`
292+
|Object of labels of the Node
293+
294+
|`kubernetes.annotations.*`
295+
|`object`
296+
|Object of annotations of the Node
297+
298+
|`kubernetes.node.name`
299+
|`string`
300+
|Name of the Node
301+
302+
|`kubernetes.node.uid`
303+
|`string`
304+
|UID of the Node
305+
306+
|`kubernetes.node.hostname`
307+
|`string`
308+
|Hostname of the Node
309+
|===
232310

233311
[float]
234312
====== Service specific:
235-
* kubernetes.namespace
236-
* kubernetes.service.name
237-
* kubernetes.service.uid
238-
* kubernetes.annotations
313+
|===
314+
|Key |Type |Description
315+
316+
|`port`
317+
|`string`
318+
|Service port
319+
320+
|`kubernetes.namespace`
321+
|`string`
322+
|Namespace of the Service
323+
324+
|`kubernetes.namespace_uuid`
325+
|`string`
326+
|UUID of the Namespace of the Service
327+
328+
|`kubernetes.namespace_annotations.*`
329+
|`object`
330+
|Annotations of the Namespace of the Service. Annotations should be used in not dedoted format, e.g. `kubernetes.namespace_annotations.app.kubernetes.io/name`
331+
332+
|`kubernetes.labels.*`
333+
|`object`
334+
|Object of the Service labels
335+
336+
|`kubernetes.annotations.*`
337+
|`object`
338+
|Object of the Service annotations
339+
340+
|`kubernetes.service.name`
341+
|`string`
342+
|Name of the Service
343+
344+
|`kubernetes.service.uid`
345+
|`string`
346+
|UID of the Service
347+
|===
239348

240349
If the `include_annotations` config is added to the provider config, then the list of annotations present in the config
241350
are added to the event.

libbeat/tests/system/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ packaging==20.4
4545
parameterized==0.7.0
4646
paramiko==3.4.0
4747
pluggy==0.13.1
48-
protobuf==3.19.4
48+
protobuf==3.19.5
4949
py==1.11.0
5050
pycodestyle==2.6.0
5151
pycparser==2.21

libbeat/tests/system/requirements_aix.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ packaging==20.4
4545
parameterized==0.7.0
4646
paramiko==3.4.0
4747
pluggy==0.13.1
48-
protobuf==3.19.4
48+
protobuf==3.19.5
4949
py==1.11.0
5050
pycodestyle==2.6.0
5151
pycparser==2.21

testing/environments/snapshot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '2.3'
44
services:
55
elasticsearch:
6-
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-sq0d327c-SNAPSHOT
6+
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-knq1zsti-SNAPSHOT
77
# When extend is used it merges healthcheck.tests, see:
88
# https://github.com/docker/compose/issues/8962
99
# healthcheck:
@@ -31,7 +31,7 @@ services:
3131
- "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
3232

3333
logstash:
34-
image: docker.elastic.co/logstash/logstash:8.13.0-sq0d327c-SNAPSHOT
34+
image: docker.elastic.co/logstash/logstash:8.13.0-knq1zsti-SNAPSHOT
3535
healthcheck:
3636
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
3737
retries: 600
@@ -44,7 +44,7 @@ services:
4444
- 5055:5055
4545

4646
kibana:
47-
image: docker.elastic.co/kibana/kibana:8.13.0-sq0d327c-SNAPSHOT
47+
image: docker.elastic.co/kibana/kibana:8.13.0-knq1zsti-SNAPSHOT
4848
environment:
4949
- "ELASTICSEARCH_USERNAME=kibana_system_user"
5050
- "ELASTICSEARCH_PASSWORD=testing"

x-pack/metricbeat/module/istio/proxy/_meta/docs.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ metricbeat.autodiscover:
2929
config:
3030
- module: istio
3131
metricsets: ["proxy"]
32-
hosts: "${data.host}:15090"
32+
hosts: "${data.kubernetes.pod.ip}:15090"
3333
--------------------------------------------

0 commit comments

Comments
 (0)