Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/grafana/alloy into main
Browse files Browse the repository at this point in the history
  • Loading branch information
vaxvms committed Nov 14, 2024
2 parents 70006be + 7290a06 commit 288da36
Show file tree
Hide file tree
Showing 84 changed files with 2,637 additions and 118 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@ Main (unreleased)

- Add `add_cloudwatch_timestamp` to `prometheus.exporter.cloudwatch` metrics. (@captncraig)

v1.5.0-rc.0
- Add support to `prometheus.operator.servicemonitors` to allow `endpointslice` role. (@yoyosir)

- Add `otelcol.exporter.splunkhec` allowing to export otel data to Splunk HEC (@adlotsof)

### Bugfixes

- Fixed an issue in the `prometheus.exporter.postgres` component that would leak goroutines when the target was not reachable (@dehaansa)

v1.5.0
-----------------

### Breaking changes
Expand All @@ -32,7 +40,10 @@ v1.5.0-rc.0

### Features

- Add support bundle generation via the API endpoint /-/support (@dehaansa)

- Add the function `path_join` to the stdlib. (@wildum)

- Add `pyroscope.receive_http` component to receive and forward Pyroscope profiles (@marcsanmi)

- Add support to `loki.source.syslog` for the RFC3164 format ("BSD syslog"). (@sushain97)
Expand All @@ -44,6 +55,8 @@ v1.5.0-rc.0
- (_Experimental_) Add a `prometheus.write.queue` component to add an alternative to `prometheus.remote_write`
which allowing the writing of metrics to a prometheus endpoint. (@mattdurham)

- (_Experimental_) Add the `array.combine_maps` function to the stdlib. (@ptodev, @wildum)

- Add a `prometheus.mapping` component to add a label based on a source_label and a mapping table. (@vaxvms)

### Enhancements
Expand Down
13 changes: 0 additions & 13 deletions docs/developer/release/11-update-otel.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/developer/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ responsible for ownership of the following workflows:
5. [Update Helm Charts](./8-update-helm-charts.md)
6. [Update Homebrew](./9-update-homebrew.md)
7. [Announce Release](./10-announce-release.md)
8. [Update OTEL Contrib](./11-update-otel.md)

## Patch Release Publish - latest version (`1.15.1`, `1.15.2`...)
1. [Update the "main" and "release/" branches](./3-update-version-in-code.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/collect/prometheus-metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This topic describes how to:

Before components can collect Prometheus metrics, you must have a component responsible for writing those metrics somewhere.

The [prometheus.remote_write][] component is responsible for delivering Prometheus metrics to one or Prometheus-compatible endpoints.
The [prometheus.remote_write][] component is responsible for delivering Prometheus metrics to one or more Prometheus-compatible endpoints.
After a `prometheus.remote_write` component is defined, you can use other {{< param "PRODUCT_NAME" >}} components to forward metrics to it.

To configure a `prometheus.remote_write` component for metrics delivery, complete the following steps:
Expand Down
2 changes: 2 additions & 0 deletions docs/sources/reference/cli/run.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ The following flags are supported:
* `--server.http.ui-path-prefix`: Base path where the UI is exposed (default `/`).
* `--storage.path`: Base directory where components can store data (default `data-alloy/`).
* `--disable-reporting`: Disable [data collection][] (default `false`).
* `--disable-support-bundle`: Disable [support bundle][] endpoint (default `false`).
* `--cluster.enabled`: Start {{< param "PRODUCT_NAME" >}} in clustered mode (default `false`).
* `--cluster.node-name`: The name to use for this node (defaults to the environment's hostname).
* `--cluster.join-addresses`: Comma-separated list of addresses to join the cluster at (default `""`). Mutually exclusive with `--cluster.discover-peers`.
Expand Down Expand Up @@ -178,6 +179,7 @@ Refer to [alloy convert][] for more details on how `extra-args` work.
[go-discover]: https://github.com/hashicorp/go-discover
[in-memory HTTP traffic]: ../../../get-started/component_controller/#in-memory-traffic
[data collection]: ../../../data-collection/
[support bundle]: ../../../troubleshoot/support_bundle
[components]: ../../get-started/components/
[component controller]: ../../../get-started/component_controller/
[UI]: ../../../troubleshoot/debug/#clustering-page
1 change: 1 addition & 0 deletions docs/sources/reference/compatibility/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ The following components, grouped by namespace, _export_ OpenTelemetry `otelcol.
- [otelcol.exporter.otlp](../components/otelcol/otelcol.exporter.otlp)
- [otelcol.exporter.otlphttp](../components/otelcol/otelcol.exporter.otlphttp)
- [otelcol.exporter.prometheus](../components/otelcol/otelcol.exporter.prometheus)
- [otelcol.exporter.splunkhec](../components/otelcol/otelcol.exporter.splunkhec)
- [otelcol.processor.attributes](../components/otelcol/otelcol.processor.attributes)
- [otelcol.processor.batch](../components/otelcol/otelcol.processor.batch)
- [otelcol.processor.deltatocumulative](../components/otelcol/otelcol.processor.deltatocumulative)
Expand Down
Loading

0 comments on commit 288da36

Please sign in to comment.