From 733aa95b7ac0c6a708b131aced32ea97102cd973 Mon Sep 17 00:00:00 2001 From: Piotr Gwizdala <17101802+thampiotr@users.noreply.github.com> Date: Fri, 5 May 2023 14:27:36 +0100 Subject: [PATCH] reformat and rephrase and fix changelog --- CHANGELOG.md | 3 +-- docs/sources/flow/reference/components/loki.source.api.md | 2 +- .../flow/reference/components/prometheus.source.api.md | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e08442fa8a7..696c5098f71a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,11 @@ Main (unreleased) ### Features - New Grafana Agent Flow components: + - `loki.source.api` - receive Loki log entries over HTTP (e.g. from other agents). (@thampiotr) - `prometheus.operator.servicemonitors` discovers ServiceMonitor resources in your Kubernetes cluster and scrape the targets they reference. (@captncraig, @marctc, @jcreixell) - `prometheus.source.api` - receive Prometheus metrics over HTTP (e.g. from other agents). (@thampiotr) -- Added new Grafana Agent Flow components: - - `loki.source.api` - receive Loki log entries over HTTP (e.g. from other agents). (@thampiotr) - Added coalesce function to river stdlib. (@jkroepke) ### Enhancements diff --git a/docs/sources/flow/reference/components/loki.source.api.md b/docs/sources/flow/reference/components/loki.source.api.md index e10a24191def..eb71f948d2f8 100644 --- a/docs/sources/flow/reference/components/loki.source.api.md +++ b/docs/sources/flow/reference/components/loki.source.api.md @@ -6,7 +6,7 @@ title: loki.source.api `loki.source.api` receives log entries over HTTP and forwards them to other `loki.*` components. -The HTTP API exposed is compatible with [Loki push API][loki-push-api] and the `logproto` format. This means that other [`loki.write`][loki.write] components can be used as a client and send requests to `loki.source.api` and enables using the Agent as a proxy for logs. +The HTTP API exposed is compatible with [Loki push API][loki-push-api] and the `logproto` format. This means that other [`loki.write`][loki.write] components can be used as a client and send requests to `loki.source.api` which enables using the Agent as a proxy for logs. [loki.write]: {{< relref "./loki.write.md" >}} [loki-push-api]: https://grafana.com/docs/loki/latest/api/#push-log-entries-to-loki diff --git a/docs/sources/flow/reference/components/prometheus.source.api.md b/docs/sources/flow/reference/components/prometheus.source.api.md index c72e12db3e0a..40da3201b78e 100644 --- a/docs/sources/flow/reference/components/prometheus.source.api.md +++ b/docs/sources/flow/reference/components/prometheus.source.api.md @@ -6,7 +6,7 @@ title: prometheus.source.api `prometheus.source.api` listens for HTTP requests containing Prometheus metric samples and forwards them to other components capable of receiving metrics. -The HTTP API exposed is compatible with [Prometheus `remote_write` API][prometheus-remote-write-docs]. This means that other [`prometheus.remote_write`][prometheus.remote_write] components can be used as a client and send requests to `prometheus.source.api`. This enables Grafana Agents to send metrics over the network to, for example, other Grafana Agents. +The HTTP API exposed is compatible with [Prometheus `remote_write` API][prometheus-remote-write-docs]. This means that other [`prometheus.remote_write`][prometheus.remote_write] components can be used as a client and send requests to `prometheus.source.api` which enables using the Agent as a proxy for prometheus metrics. [prometheus.remote_write]: {{< relref "./prometheus.remote_write.md" >}} [prometheus-remote-write-docs]: https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver @@ -25,7 +25,7 @@ prometheus.source.api "LABEL" { The component will start HTTP server supporting the following requests: -- POST on `/api/v1/metrics/write` - Send metrics to the component, which in turn will be forwarded to the receivers as configured in `forward_to` argument. The request format must match that of [Prometheus `remote_write` API][prometheus-remote-write-docs]. One way to send valid requests to this component is to use another Grafana Agent with a [`prometheus.remote_write`][prometheus.remote_write] component. +- `POST /api/v1/metrics/write` - send metrics to the component, which in turn will be forwarded to the receivers as configured in `forward_to` argument. The request format must match that of [Prometheus `remote_write` API][prometheus-remote-write-docs]. One way to send valid requests to this component is to use another Grafana Agent with a [`prometheus.remote_write`][prometheus.remote_write] component. ## Arguments