Skip to content

Commit 73262fc

Browse files
dehaansamar4ukclayton-cornellmarctcjan-mrm
authored
Create patch v1.10.1 (#4146)
* fix faro.receiver cors not allowing x-scope-orgid, traceparent headers (#4051) * fix faro.receiver cors not allowing x-scope-orgid, traceparent headers * sort values listed in Access-Control-Request-Headers header in test * fix faro.receiver readme to include allowed headers list * Update docs/sources/reference/components/faro/faro.receiver.md Co-authored-by: Clayton Cornell <[email protected]> --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit d481390) * Ensure cluster notifications are sent to remotecfg components (#4006) * Ensure cluster notifications are sent to remotecfg components * Update changelog * Address PR feedback * add some locking for a race condition in test (cherry picked from commit 1fa6b5a) * Fix references to `text_file` collector and lack of`dns` config conversion (#4024) * Fix references to collector * Ensure DNS config is appropriately converted for windows exporter * add changelog * Update docs/sources/reference/components/prometheus/prometheus.exporter.windows.md Co-authored-by: Clayton Cornell <[email protected]> * Update blurb about text_file/textfile in windows docs * Update docs/sources/reference/components/prometheus/prometheus.exporter.windows.md Co-authored-by: Clayton Cornell <[email protected]> --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 12d94d3) * Update walqueue dependency for external_labels fix (#4133) (cherry picked from commit f8607d6) * Add metric missing features and remove unneeded validations (#4094) (cherry picked from commit 93a6365) * fix missed merge conflict * fix: stage.multiline now passes through structured metadata in loki.process (#4050) * fix: stage.multiline now passes through structured metadata in loki.process * fix: set correct expected assert value * Update internal/component/loki/process/stages/multiline.go Co-authored-by: Paulin Todev <[email protected]> * refactor: implemented review feedback about how to clone, added needed import --------- Co-authored-by: Paulin Todev <[email protected]> (cherry picked from commit f20c549) * Fix Windows installer values (#4125) * Fix Windows installer values Fix URLs appearing within quotes in the Windows installer. * Update Windows installer publisher Put the company name as the publisher, rather than the about URL. * Update CHANGELOG Add changes from PR. (cherry picked from commit 46a9d29) * Fix worker pool stuck on shutdown in certain cases (#4111) * Fix worker pool stuck on shutdown in certain cases * Changelog (cherry picked from commit ee4ffd0) * branch walqueue to skip prom3 in 1.10 patch * Remove unused remotecfg code unintentionally merged --------- Co-authored-by: Irina Marchuk <[email protected]> Co-authored-by: Clayton Cornell <[email protected]> Co-authored-by: Marc Tudurí <[email protected]> Co-authored-by: jan-mrm <[email protected]> Co-authored-by: Paulin Todev <[email protected]> Co-authored-by: Martin Costello <[email protected]> Co-authored-by: Piotr <[email protected]>
1 parent f6b7e6d commit 73262fc

File tree

22 files changed

+382
-121
lines changed

22 files changed

+382
-121
lines changed

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@ This document contains a historical list of changes between releases. Only
77
changes that impact end-user behavior are listed; changes to documentation or
88
internal API changes are not present.
99

10+
v1.10.1
11+
-----------------
12+
13+
### Bugfixes
14+
15+
- Fix issue with `faro.receiver` cors not allowing X-Scope-OrgID and traceparent headers. (@mar4uk)
16+
17+
- Fix issues with propagating cluster peers change notifications to components configured with remotecfg. (@dehaansa)
18+
19+
- Fix issues with statistics reporter not including components only configured with remotecfg. (@dehaansa)
20+
21+
- Fix issues with `prometheus.exporter.windows` not propagating `dns` collector config. (@dehaansa)
22+
23+
- Fixed a bug in `prometheus.write.queue` which caused retries even when `max_retry_attempts` was set to `0`. (@ptodev)
24+
25+
- Fixed a bug in `prometheus.write.queue` which caused labelling issues when providing more than one label in `external_labels`. (@dehaansa)
26+
27+
- Add `application_host` and `network_inter_zone` features to `beyla.ebpf` component. (@marctc)
28+
29+
- Fix issues in `loki.process` where `stage.multiline` did not pass through structured metadata. (@jan-mrm)
30+
31+
- Fix URLs in the Windows installer being wrapped in quotes. (@martincostello)
32+
33+
- Fixed an issue where certain `otelcol.*` components could prevent Alloy from shutting down when provided invalid configuration. (@thampiotr)
34+
1035
v1.10.0
1136
-----------------
1237

docs/sources/reference/components/beyla/beyla.ebpf.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,9 @@ The `metrics` block configures which metrics Beyla collects.
417417
* `application_process` exports metrics about the processes that run the instrumented application.
418418
* `application_service_graph` exports application-level service graph metrics.
419419
* `application_span` exports application-level metrics in traces span metrics format.
420+
* `application_host` exports application-level host metrics for host-based pricing.
420421
* `network` exports network-level metrics.
422+
* `network_inter_zone` exports network-level inter-zone metrics.
421423

422424
`instrumentations` is a list of instrumentations to enable for the metrics. The following instrumentations are available:
423425

docs/sources/reference/components/faro/faro.receiver.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ The default value, `[]`, disables CORS support.
105105
To support requests from all origins, set `cors_allowed_origins` to `["*"]`.
106106
The `*` character indicates a wildcard.
107107

108+
You can use the following headers for cross-domain requests: `Content-Type`, `Traceparent`, `X-API-Key`, `X-Faro-Session-Id`, or `X-Scope-OrgID`.
109+
108110
When the `api_key` argument is non-empty, client requests must have an HTTP header called `X-API-Key` matching the value of the `api_key` argument.
109111
Requests that are missing the header or have the wrong value are rejected with an `HTTP 401 Unauthorized` status code.
110112
If the `api_key` argument is empty, no authentication checks are performed, and the `X-API-Key` HTTP header is ignored.

go.mod

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ require (
7676
github.com/grafana/snowflake-prometheus-exporter v0.0.0-20250627131542-0c2feac3a700
7777
github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0
7878
github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329
79-
github.com/grafana/walqueue v0.0.0-20250606153244-9d2294b26901
80-
github.com/hashicorp/consul/api v1.32.0
81-
github.com/hashicorp/go-discover v0.0.0-20230724184603-e89ebd1b2f65
79+
github.com/grafana/walqueue v0.0.0-20250806200024-8857bde78364 // alloy-1.10 branch to cherry pick fixes w/o prom3 update
80+
github.com/hashicorp/consul/api v1.32.1
81+
github.com/hashicorp/go-discover v1.1.0
8282
github.com/hashicorp/go-multierror v1.1.1
8383
github.com/hashicorp/golang-lru v1.0.2
8484
github.com/hashicorp/golang-lru/v2 v2.0.7
@@ -186,11 +186,11 @@ require (
186186
github.com/prometheus/mysqld_exporter v0.17.2
187187
github.com/prometheus/node_exporter v1.6.0
188188
github.com/prometheus/procfs v0.16.1
189-
github.com/prometheus/prometheus v0.304.1 // replaced by a fork of v2.54.1 further down this file
189+
github.com/prometheus/prometheus v0.304.2 // replaced by a fork of v2.54.1 further down this file
190190
github.com/prometheus/snmp_exporter v0.29.0 // if you update the snmp_exporter version, make sure to update the SNMP_VERSION in _index
191191
github.com/prometheus/statsd_exporter v0.28.0
192192
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3
193-
github.com/rogpeppe/go-internal v1.13.1
193+
github.com/rogpeppe/go-internal v1.14.1
194194
github.com/rs/cors v1.11.1
195195
github.com/samber/lo v1.38.1
196196
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33
@@ -269,16 +269,16 @@ require (
269269
go.uber.org/goleak v1.3.0
270270
go.uber.org/multierr v1.11.0
271271
go.uber.org/zap v1.27.0
272-
golang.org/x/crypto v0.38.0
272+
golang.org/x/crypto v0.39.0
273273
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91
274-
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b
275-
golang.org/x/net v0.40.0
274+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
275+
golang.org/x/net v0.41.0
276276
golang.org/x/oauth2 v0.30.0
277-
golang.org/x/sync v0.14.0
277+
golang.org/x/sync v0.15.0
278278
golang.org/x/sys v0.33.0
279-
golang.org/x/text v0.25.0
279+
golang.org/x/text v0.26.0
280280
golang.org/x/time v0.11.0
281-
golang.org/x/tools v0.33.0
281+
golang.org/x/tools v0.34.0
282282
google.golang.org/api v0.230.0
283283
google.golang.org/grpc v1.72.2
284284
google.golang.org/protobuf v1.36.6
@@ -528,7 +528,7 @@ require (
528528
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
529529
github.com/danieljoos/wincred v1.2.2 // indirect
530530
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
531-
github.com/deneonet/benc v1.1.7 // indirect
531+
github.com/deneonet/benc v1.1.8 // indirect
532532
github.com/dennwc/btrfs v0.0.0-20230312211831-a1f570bd01a1 // indirect
533533
github.com/dennwc/ioctl v1.0.0 // indirect
534534
github.com/dennwc/varint v1.0.0 // indirect
@@ -806,7 +806,7 @@ require (
806806
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
807807
github.com/pelletier/go-toml v1.9.5 // indirect
808808
github.com/percona/percona-backup-mongodb v1.8.1-0.20241022111827-8d3ad8a6eb7a // indirect
809-
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
809+
github.com/philhofer/fwd v1.2.0 // indirect
810810
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
811811
github.com/pierrec/lz4/v4 v4.1.22 // indirect
812812
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
@@ -955,7 +955,7 @@ require (
955955
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
956956
golang.design/x/chann v0.1.2 // indirect
957957
golang.org/x/arch v0.7.0 // indirect
958-
golang.org/x/mod v0.24.0 // indirect
958+
golang.org/x/mod v0.25.0 // indirect
959959
golang.org/x/term v0.32.0 // indirect
960960
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
961961
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -997,11 +997,13 @@ require (
997997
github.com/Shopify/sarama v1.38.1 // indirect
998998
github.com/apache/arrow-go/v18 v18.0.0 // indirect
999999
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
1000+
github.com/aws/aws-sdk-go-v2/service/ecs v1.53.8 // indirect
10001001
github.com/bahlo/generic-list-go v0.2.0 // indirect
10011002
github.com/containerd/containerd/v2 v2.0.5 // indirect
10021003
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
10031004
github.com/google/go-tpm v0.9.5 // indirect
10041005
github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc // indirect
1006+
github.com/hashicorp/go-discover/provider/gce v0.0.0-20241120163552-5eb1507d16b4 // indirect
10051007
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
10061008
github.com/mariomac/guara v0.0.0-20250408105519-1e4dbdfb7136 // indirect
10071009
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect

0 commit comments

Comments
 (0)