Skip to content

Commit

Permalink
Merge branch 'grafana:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rootmout authored Jun 27, 2023
2 parents 538cb97 + b71f228 commit 1797847
Show file tree
Hide file tree
Showing 34 changed files with 780 additions and 621 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Main (unreleased)

- Update `module.git` with basic and SSH key authentication support. (@djcode)

- Update `redis_exporter` dependency to v1.51.0. (@jcreixell)

- Enforce sha256 digest signing for rpms enabling installation on FIPS-enabled OSes. (@kfriedrich123)

### Bugfixes

- Add signing region to remote.s3 component for use with custom endpoints so that Authorization Headers work correctly when
Expand All @@ -57,11 +61,17 @@ Main (unreleased)
- Fix oauth default scope in `loki.source.azure_event_hubs`. (@akselleirv)

- Fix panic from improper startup ordering in `prometheus.operator.servicemonitors`. (@captncraig)
-

- Fixes a bug in conversion of OpenTelemetry histograms when exported to Prometheus. (@grcevski)

- Fix bug where `otelcol.exporter.otlphttp` ignores configuration for `traces_endpoint`, `metrics_endpoint`, and `logs_endpoint` attributes. (@SimoneFalzone)

- Fix issue in `prometheus.remote_write` where the `queue_config` and
`metadata_config` blocks used incorrect defaults when not specified in the
config file. (@rfratto)

- Fix issue where published RPMs were not signed. (@rfratto)

v0.34.2 (2023-06-20)
--------------------

Expand Down
8 changes: 6 additions & 2 deletions component/prometheus/remotewrite/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ func (r *QueueOptions) SetToDefault() {

func (r *QueueOptions) toPrometheusType() config.QueueConfig {
if r == nil {
return config.DefaultQueueConfig
var res QueueOptions
res.SetToDefault()
return res.toPrometheusType()
}

return config.QueueConfig{
Expand Down Expand Up @@ -141,7 +143,9 @@ func (o *MetadataOptions) SetToDefault() {

func (o *MetadataOptions) toPrometheusType() config.MetadataConfig {
if o == nil {
return config.DefaultMetadataConfig
var res MetadataOptions
res.SetToDefault()
return res.toPrometheusType()
}

return config.MetadataConfig{
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/flow/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ prometheus.remote_write "default" {
* Check out our [Reference][] documentation to find specific information you
might be looking for.

[Install]: {{< relref "./install/" >}}
[Install]: {{< relref "./setup/install/" >}}
[Concepts]: {{< relref "./concepts/" >}}
[Getting started]: {{< relref "./getting-started/" >}}
[Tutorials]: {{< relref "./tutorials/ ">}}
Expand Down
10 changes: 0 additions & 10 deletions docs/sources/flow/install/_index.md

This file was deleted.

279 changes: 0 additions & 279 deletions docs/sources/flow/install/linux.md

This file was deleted.

Loading

0 comments on commit 1797847

Please sign in to comment.