From 7817c2217a160f4b5b3985dead3e30d3f4ebaf1a Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Fri, 3 Nov 2023 18:00:46 +0200 Subject: [PATCH 01/14] loki/wal: fix panic for duplicate registered metrics (#5705) Signed-off-by: Paschalis Tsilias --- CHANGELOG.md | 3 +++ component/common/loki/wal/watcher_metrics.go | 22 ++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 536b89e10b6f..01f8efc42043 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,6 +98,9 @@ Main (unreleased) - Fixed a bug where UDP syslog messages were never processed (@joshuapare) +- Fix a bug where reloading the configuration of a `loki.write` component lead + to a panic. (@tpaschalis) + ### Enhancements - The `loki.write` WAL now has snappy compression enabled by default. (@thepalbi) diff --git a/component/common/loki/wal/watcher_metrics.go b/component/common/loki/wal/watcher_metrics.go index 697b111c69af..4064f8b22aac 100644 --- a/component/common/loki/wal/watcher_metrics.go +++ b/component/common/loki/wal/watcher_metrics.go @@ -80,13 +80,23 @@ func NewWatcherMetrics(reg prometheus.Registerer) *WatcherMetrics { } if reg != nil { - reg.MustRegister(m.recordsRead) - reg.MustRegister(m.recordDecodeFails) - reg.MustRegister(m.droppedWriteNotifications) - reg.MustRegister(m.segmentRead) - reg.MustRegister(m.currentSegment) - reg.MustRegister(m.watchersRunning) + m.recordsRead = mustRegisterOrGet(reg, m.recordsRead).(*prometheus.CounterVec) + m.recordDecodeFails = mustRegisterOrGet(reg, m.recordDecodeFails).(*prometheus.CounterVec) + m.droppedWriteNotifications = mustRegisterOrGet(reg, m.droppedWriteNotifications).(*prometheus.CounterVec) + m.segmentRead = mustRegisterOrGet(reg, m.segmentRead).(*prometheus.CounterVec) + m.currentSegment = mustRegisterOrGet(reg, m.currentSegment).(*prometheus.GaugeVec) + m.watchersRunning = mustRegisterOrGet(reg, m.watchersRunning).(*prometheus.GaugeVec) } return m } + +func mustRegisterOrGet(reg prometheus.Registerer, c prometheus.Collector) prometheus.Collector { + if err := reg.Register(c); err != nil { + if are, ok := err.(prometheus.AlreadyRegisteredError); ok { + return are.ExistingCollector + } + panic(err) + } + return c +} From 7fe50233ae4017387550bfe3adca2a95090d5bf1 Mon Sep 17 00:00:00 2001 From: Pierre KELBERT Date: Fri, 3 Nov 2023 18:00:55 +0100 Subject: [PATCH 02/14] config-reloader: change to non-root user (#4235) --- CHANGELOG.md | 64 +++++++++++---------- pkg/operator/resources_pod_template.go | 8 ++- pkg/operator/resources_pod_template_test.go | 27 ++++++++- 3 files changed, 65 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f8efc42043..9fbef786b1b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,40 @@ Main (unreleased) - `otelcol.processor.filter` - filters OTLP telemetry data using OpenTelemetry Transformation Language (OTTL). (@hainenber) +### Enhancements + +- The `loki.write` WAL now has snappy compression enabled by default. (@thepalbi) + +- Allow converting labels to structured metadata with Loki's structured_metadata stage. (@gonzalesraul) + +- Improved performance of `pyroscope.scrape` component when working with a large number of targets. (@cyriltovena) + +- Added support for comma-separated list of fields in `source` option and a + new `separator` option in `drop` stage of `loki.process`. (@thampiotr) + +- The `loki.source.docker` component now allows connecting to Docker daemons + over HTTP(S) and setting up TLS credentials. (@tpaschalis) + +- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, + which configures whether to add type and unit suffixes to metrics names. (@mar4uk) + +- Added an `exclude_event_message` option to `loki.source.windowsevent` in flow mode, + which excludes the human-friendly event message from Windows event logs. (@ptodev) + +- Improve detection of rolled log files in `loki.source.kubernetes` and + `loki.source.podlogs` (@slim-bean). + +- Support clustering in `loki.source.kubernetes` (@slim-bean). + +- Support clustering in `loki.source.podlogs` (@rfratto). + +- Make component list sortable in web UI. (@hainenber) + +- Adds new metrics (`mssql_server_total_memory_bytes`, `mssql_server_target_memory_bytes`, + and `mssql_available_commit_memory_bytes`) for `mssql` integration. + +- Grafana Agent Operator: `config-reloader` container no longer runs as root. + (@rootmout) ### Bugfixes @@ -101,37 +135,7 @@ Main (unreleased) - Fix a bug where reloading the configuration of a `loki.write` component lead to a panic. (@tpaschalis) -### Enhancements - -- The `loki.write` WAL now has snappy compression enabled by default. (@thepalbi) - -- Allow converting labels to structured metadata with Loki's structured_metadata stage. (@gonzalesraul) - -- Improved performance of `pyroscope.scrape` component when working with a large number of targets. (@cyriltovena) - -- Added support for comma-separated list of fields in `source` option and a - new `separator` option in `drop` stage of `loki.process`. (@thampiotr) - -- The `loki.source.docker` component now allows connecting to Docker daemons - over HTTP(S) and setting up TLS credentials. (@tpaschalis) -- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, - which configures whether to add type and unit suffixes to metrics names. (@mar4uk) - -- Added an `exclude_event_message` option to `loki.source.windowsevent` in flow mode, - which excludes the human-friendly event message from Windows event logs. (@ptodev) - -- Improve detection of rolled log files in `loki.source.kubernetes` and - `loki.source.podlogs` (@slim-bean). - -- Support clustering in `loki.source.kubernetes` (@slim-bean). - -- Support clustering in `loki.source.podlogs` (@rfratto). - -- Make component list sortable in web UI. (@hainenber) - -- Adds new metrics (`mssql_server_total_memory_bytes`, `mssql_server_target_memory_bytes`, - and `mssql_available_commit_memory_bytes`) for `mssql` integration. v0.37.3 (2023-10-26) ----------------- diff --git a/pkg/operator/resources_pod_template.go b/pkg/operator/resources_pod_template.go index cd4d8aee714b..c826ea6ea980 100644 --- a/pkg/operator/resources_pod_template.go +++ b/pkg/operator/resources_pod_template.go @@ -207,6 +207,8 @@ func generatePodTemplate( imagePathConfigReloader = *d.Agent.Spec.ConfigReloaderImage } + boolFalse := false + boolTrue := true operatorContainers := []core_v1.Container{ { Name: "config-reloader", @@ -214,7 +216,11 @@ func generatePodTemplate( VolumeMounts: volumeMounts, Env: envVars, SecurityContext: &core_v1.SecurityContext{ - RunAsUser: pointer.Int64(0), + AllowPrivilegeEscalation: &boolFalse, + ReadOnlyRootFilesystem: &boolTrue, + Capabilities: &core_v1.Capabilities{ + Drop: []core_v1.Capability{"ALL"}, + }, }, Args: []string{ "--config-file=/var/lib/grafana-agent/config-in/agent.yml", diff --git a/pkg/operator/resources_pod_template_test.go b/pkg/operator/resources_pod_template_test.go index 3f229c8313da..eb855820cc9d 100644 --- a/pkg/operator/resources_pod_template_test.go +++ b/pkg/operator/resources_pod_template_test.go @@ -98,6 +98,12 @@ func Test_generatePodTemplate(t *testing.T) { assert.False(t, tmpl.Spec.Containers[i].SecurityContext.Privileged != nil && *tmpl.Spec.Containers[i].SecurityContext.Privileged, "privileged is not required. Fargate cannot schedule privileged containers.") + assert.False(t, tmpl.Spec.Containers[i].SecurityContext.RunAsUser != nil && + *tmpl.Spec.Containers[i].SecurityContext.RunAsUser == int64(0), + "force the container to run as root is not required.") + assert.False(t, tmpl.Spec.Containers[i].SecurityContext.AllowPrivilegeEscalation != nil && + *tmpl.Spec.Containers[i].SecurityContext.AllowPrivilegeEscalation, + "allow privilege escalation is not required.") } }) @@ -110,9 +116,24 @@ func Test_generatePodTemplate(t *testing.T) { tmpl, _, err := generatePodTemplate(cfg, "agent", deploy, podTemplateOptions{Privileged: true}) require.NoError(t, err) - assert.True(t, tmpl.Spec.Containers[1].SecurityContext.Privileged != nil && - *tmpl.Spec.Containers[1].SecurityContext.Privileged, - "privileged is needed if pod options say so.") + for i := range tmpl.Spec.Containers { + // only grafana-agent container is supposed to be privileged + if tmpl.Spec.Containers[i].Name == "grafana-agent" { + assert.True(t, tmpl.Spec.Containers[i].SecurityContext.Privileged != nil && + *tmpl.Spec.Containers[i].SecurityContext.Privileged, + "privileged is needed for grafana-agent if pod options say so.") + } else { + assert.False(t, tmpl.Spec.Containers[i].SecurityContext.Privileged != nil && + *tmpl.Spec.Containers[i].SecurityContext.Privileged, + "privileged is not required for other containers.") + assert.False(t, tmpl.Spec.Containers[i].SecurityContext.RunAsUser != nil && + *tmpl.Spec.Containers[i].SecurityContext.RunAsUser == int64(0), + "force the container to run as root is not required for other containers.") + assert.False(t, tmpl.Spec.Containers[i].SecurityContext.AllowPrivilegeEscalation != nil && + *tmpl.Spec.Containers[i].SecurityContext.AllowPrivilegeEscalation, + "allow privilege escalation is not required for other containers.") + } + } }) t.Run("runtimeclassname set if passed in", func(t *testing.T) { From f31d5426897c6fd1eb1f49cc781b44bc56f94757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:02:44 -0400 Subject: [PATCH 03/14] build(deps): bump github.com/hashicorp/vault/api/auth/gcp (#5697) Bumps [github.com/hashicorp/vault/api/auth/gcp](https://github.com/hashicorp/vault) from 0.2.0 to 0.5.0. - [Release notes](https://github.com/hashicorp/vault/releases) - [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG-v0.md) - [Commits](https://github.com/hashicorp/vault/compare/v0.2.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/vault/api/auth/gcp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 18 +++++------------- go.sum | 22 +++++++--------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index d62e88a06943..ebed4397a468 100644 --- a/go.mod +++ b/go.mod @@ -72,11 +72,11 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 github.com/hashicorp/golang-lru/v2 v2.0.5 - github.com/hashicorp/vault/api v1.7.2 + github.com/hashicorp/vault/api v1.10.0 github.com/hashicorp/vault/api/auth/approle v0.2.0 github.com/hashicorp/vault/api/auth/aws v0.2.0 github.com/hashicorp/vault/api/auth/azure v0.2.0 - github.com/hashicorp/vault/api/auth/gcp v0.2.0 + github.com/hashicorp/vault/api/auth/gcp v0.5.0 github.com/hashicorp/vault/api/auth/kubernetes v0.2.0 github.com/hashicorp/vault/api/auth/ldap v0.2.0 github.com/hashicorp/vault/api/auth/userpass v0.2.0 @@ -283,7 +283,6 @@ require ( github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/armon/go-radix v1.0.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect @@ -409,24 +408,19 @@ require ( github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect - github.com/hashicorp/go-plugin v1.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 // indirect - github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/mdns v1.0.4 // indirect github.com/hashicorp/memberlist v0.5.0 // indirect github.com/hashicorp/nomad/api v0.0.0-20230718173136-3a687930bd3e // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/hashicorp/vault/sdk v0.5.1 // indirect github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect - github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect github.com/hodgesds/perf-utils v0.7.0 // indirect github.com/huandu/xstrings v1.3.3 // indirect github.com/iancoleman/strcase v0.3.0 // indirect @@ -486,7 +480,6 @@ require ( github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mna/redisc v1.3.2 // indirect github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect @@ -523,7 +516,6 @@ require ( github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect @@ -610,7 +602,6 @@ require ( gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect howett.net/plist v1.0.0 // indirect @@ -623,6 +614,8 @@ require github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab require ( github.com/githubexporter/github-exporter v0.0.0-20231025122338-656e7dc33fe7 + github.com/natefinch/atomic v1.0.1 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.87.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 ) @@ -632,6 +625,7 @@ require ( github.com/Shopify/sarama v1.38.1 // indirect github.com/Workiva/go-datastructures v1.1.0 // indirect github.com/drone/envsubst v1.0.3 // indirect + github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/hetznercloud/hcloud-go/v2 v2.0.0 // indirect github.com/julienschmidt/httprouter v1.3.0 // indirect @@ -639,10 +633,8 @@ require ( github.com/leoluk/perflib_exporter v0.2.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect - github.com/natefinch/atomic v1.0.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.87.0 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/prometheus-community/prom-label-proxy v0.6.0 // indirect diff --git a/go.sum b/go.sum index 6097d5c430b3..f29e630b8772 100644 --- a/go.sum +++ b/go.sum @@ -296,7 +296,6 @@ github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -431,8 +430,6 @@ github.com/boynux/squid-exporter v1.10.5-0.20230618153315-c1fae094e18e h1:C1vYe7 github.com/boynux/squid-exporter v1.10.5-0.20230618153315-c1fae094e18e/go.mod h1:8NpZERGK+R9DGuZqqsKfnf2qI/rh7yBT8End29IvgNA= github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg= github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= -github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/burningalchemist/sql_exporter v0.0.0-20221222155641-2ff59aa75200 h1:1zECtssRshqhP8+DELKyWeg8rxaRC5OO72kJQhrJOE8= @@ -723,6 +720,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= +github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1167,8 +1166,6 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-plugin v0.0.0-20180331002553-e8d22c780116/go.mod h1:JSqWYsict+jzcj0+xElxyrBQRPNoiWQuddnxArJ7XHQ= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= -github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/go-retryablehttp v0.0.0-20180531211321-3b087ef2d313/go.mod h1:fXcdFsQoipQa7mwORhKad5jmDCeSy/RCGzWA08PO0lM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= @@ -1183,7 +1180,6 @@ github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR3 github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA= github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg= github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw= -github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc= github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ= @@ -1245,16 +1241,17 @@ github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfE github.com/hashicorp/vault v0.10.3/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190318174639-195e0e9d07f1/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= -github.com/hashicorp/vault/api v1.7.2 h1:kawHE7s/4xwrdKbkmwQi0wYaIeUhk5ueek7ljuezCVQ= github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndus4GCrtouy0M= +github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= +github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= github.com/hashicorp/vault/api/auth/approle v0.2.0 h1:mdNYwDRp+tqvJmyfbkaHLLePGYDY27mOFtBZBb7va/I= github.com/hashicorp/vault/api/auth/approle v0.2.0/go.mod h1:w4PwYaLJmGq0cMss0ZAV9b49vcrpB6SKxMMLUp4voR8= github.com/hashicorp/vault/api/auth/aws v0.2.0 h1:s7445TloGqcL8rJ7TZtuy0mwblyVslOzt0ZAsjEKdeM= github.com/hashicorp/vault/api/auth/aws v0.2.0/go.mod h1:HxED8t0CNmbDFPUqOvr/cqEbJsOEsZdSruAtKYty3uU= github.com/hashicorp/vault/api/auth/azure v0.2.0 h1:C8dr30RoSC2zSqm1Tzow1xwlSUmAOkrP0R7ubu9nvvU= github.com/hashicorp/vault/api/auth/azure v0.2.0/go.mod h1:VMmVy3C2r1l/Fbj6OPf+KHe4jmo/UraQa8TDEzBrcTo= -github.com/hashicorp/vault/api/auth/gcp v0.2.0 h1:4ggAVtJPAXa9ctUvCj3iNuX1Zc7X8Z5O8RcNby1TnXs= -github.com/hashicorp/vault/api/auth/gcp v0.2.0/go.mod h1:5nAXjDcU8XJRbuoYBsvwJOj1wRzX/DaQSDoPaWHB5Kw= +github.com/hashicorp/vault/api/auth/gcp v0.5.0 h1:FIfgeN1Y6VOfIc0hh0LNO5gveiktXrV2EW4JQrJHTrU= +github.com/hashicorp/vault/api/auth/gcp v0.5.0/go.mod h1:ZBqARl2T6MiaR9zmSN5ytgKEkC1An9UAAZuiCqeYCB4= github.com/hashicorp/vault/api/auth/kubernetes v0.2.0 h1:ScdzRAF8JZIdJYP4oprZKsIS4GSTCaTP4iG2JJlJDvA= github.com/hashicorp/vault/api/auth/kubernetes v0.2.0/go.mod h1:2BKADs9mwqAycDK/6tiHRh2sX0SPnC0DN4wHjJoAirw= github.com/hashicorp/vault/api/auth/ldap v0.2.0 h1:pBzFM1Fu0IgS7mfKxVEiCsuPbHEgE5EbXzp6RgN9uXQ= @@ -1262,14 +1259,11 @@ github.com/hashicorp/vault/api/auth/ldap v0.2.0/go.mod h1:ezky0BvVjLnFBPN4XrFR27 github.com/hashicorp/vault/api/auth/userpass v0.2.0 h1:xgP3Pz8P2hDbXzn0dbIBz8HhRj/wNdZVDZfBbZ0Vams= github.com/hashicorp/vault/api/auth/userpass v0.2.0/go.mod h1:DkYCgkWaw+UvJz3CQRKCOVSyYt6YzWgSwBTswLbL7d4= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= -github.com/hashicorp/vault/sdk v0.5.1 h1:zly/TmNgOXCGgWIRA8GojyXzG817POtVh3uzIwzZx+8= github.com/hashicorp/vault/sdk v0.5.1/go.mod h1:DoGraE9kKGNcVgPmTuX357Fm6WAx1Okvde8Vp3dPDoU= github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw= github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d h1:W+SIwDdl3+jXWeidYySAgzytE3piq6GumXeBjFBG67c= -github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/heroku/x v0.0.61 h1:yfoAAtnFWSFZj+UlS+RZL/h8QYEp1R4wHVEg0G+Hwh4= github.com/heroku/x v0.0.61/go.mod h1:C7xYbpMdond+s6L5VpniDUSVPRwm3kZum1o7XiD5ZHk= github.com/hetznercloud/hcloud-go/v2 v2.0.0 h1:Sg1DJ+MAKvbYAqaBaq9tPbwXBS2ckPIaMtVdUjKu+4g= @@ -1391,8 +1385,6 @@ github.com/jefferai/jsonx v0.0.0-20160721235117-9cc31c3135ee/go.mod h1:N0t2vlmpe github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= -github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= -github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= @@ -2474,6 +2466,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -3138,7 +3131,6 @@ gopkg.in/olivere/elastic.v5 v5.0.70/go.mod h1:FylZT6jQWtfHsicejzOm3jIMVPOAksa80i gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod h1:s9mmoLkaGeAh97qygnNj4xWkiN7e1SKekYC6CovU+ek= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= From ffccd0a66d5a08280e6a6339e20e9eb44f043980 Mon Sep 17 00:00:00 2001 From: Nicolai Hornung Date: Fri, 3 Nov 2023 23:25:54 +0100 Subject: [PATCH 04/14] Fixing example in remote.kubernetes.secret.md to include nonsensitive() (#5704) The prometheus.remote_write basic_auth username is a string type and the agent will non start if the username is provided directly as a secret out of remote.kubernetes.secret. Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> --- .../flow/reference/components/remote.kubernetes.secret.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/flow/reference/components/remote.kubernetes.secret.md b/docs/sources/flow/reference/components/remote.kubernetes.secret.md index d2126d2a46c3..f72eab8fde72 100644 --- a/docs/sources/flow/reference/components/remote.kubernetes.secret.md +++ b/docs/sources/flow/reference/components/remote.kubernetes.secret.md @@ -156,7 +156,7 @@ prometheus.remote_write "default" { endpoint { url = remote.kubernetes.configmap.endpoint.data["url"] basic_auth { - username = remote.kubernetes.configmap.endpoint.data["username"] + username = nonsensitive(remote.kubernetes.configmap.endpoint.data["username"]) password = remote.kubernetes.secret.credentials.data["password"] } } @@ -164,4 +164,4 @@ prometheus.remote_write "default" { ``` This example assumes that the Secret and ConfigMap have already been created, and that the appropriate field names -exist in their data. \ No newline at end of file +exist in their data. From 54b5e78278e3cc0b99b05186d3ec554773ec971b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:33:37 +0100 Subject: [PATCH 05/14] Update `make docs` procedure (#5701) * Update `make docs` procedure * Use versioned action to update `make-docs` procedure https://github.com/grafana/writers-toolkit/blob/main/update-make-docs/action.yml Signed-off-by: Jack Baldry --------- Signed-off-by: Jack Baldry Co-authored-by: grafanabot Co-authored-by: Jack Baldry --- .github/workflows/update-make-docs.yml | 23 ++++------------------- docs/make-docs | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/workflows/update-make-docs.yml b/.github/workflows/update-make-docs.yml index f2ae7dbb7781..188fd6bd80d1 100644 --- a/.github/workflows/update-make-docs.yml +++ b/.github/workflows/update-make-docs.yml @@ -2,26 +2,11 @@ name: Update `make docs` procedure on: schedule: - cron: '0 7 * * 1-5' + workflow_dispatch: jobs: main: + if: github.repository == 'grafana/agent' runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Update procedure - if: github.repository != 'grafana/writers-toolkit' - run: | - BRANCH=update-make-docs - git checkout -b "${BRANCH}" - curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk - curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs - if git diff --exit-code; then exit 0; fi - git add . - git config --local user.email "bot@grafana.com" - git config --local user.name "grafanabot" - git commit -m "Update \`make docs\` procedure" - git push -v origin "refs/heads/${BRANCH}" - gh pr create --fill || true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 + - uses: grafana/writers-toolkit/update-make-docs@update-make-docs/v1 diff --git a/docs/make-docs b/docs/make-docs index badc36a470f1..751e22f4fd48 100755 --- a/docs/make-docs +++ b/docs/make-docs @@ -38,7 +38,7 @@ # # - Imperfect implementation of container name. # -# Faciliates running `make vale` and `make docs` at once. +# Facilitates running `make vale` and `make docs` at once. # Container names are convenient for recognition in `docker ps` but the current implementation has more downsides than upsides. # # - Forced platform specification now that multiple architecture images exist. From e257a569dcc041651fa2989c670441cade720844 Mon Sep 17 00:00:00 2001 From: Erik Baranowski <39704712+erikbaranowski@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:00:44 -0500 Subject: [PATCH 06/14] Converter static v2 3rd set of integrations (#5698) * wire up blackbox exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up cadvisor integration v2 for converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up cloudwatch exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up consul exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up dnsmasq exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up elasticsearch exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up gcp exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up github exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up kafka exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up memcached exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up mongodb exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up mssql exporter for integrations v2 exporter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up mysql exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up node exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up oracledb exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up postgres exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up process exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up redis exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up snmp exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up snowflake exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up squid exporter for integration v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up statsd exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * wire up windows exporter for integrations v2 converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * fix up windows test after running it in local windows --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --- .../internal/build/blackbox_exporter.go | 28 +- .../staticconvert/internal/build/builder.go | 95 +++-- .../internal/build/cadvisor_exporter.go | 13 +- .../internal/build/cloudwatch_exporter.go | 14 +- .../internal/build/consul_exporter.go | 14 +- .../internal/build/dnsmasq_exporter.go | 14 +- .../internal/build/elasticsearch_exporter.go | 14 +- .../internal/build/gcp_exporter.go | 14 +- .../internal/build/github_exporter.go | 14 +- .../internal/build/kafka_exporter.go | 14 +- .../internal/build/memcached_exporter.go | 13 +- .../internal/build/mongodb_exporter.go | 14 +- .../internal/build/mssql_exporter.go | 14 +- .../internal/build/mysqld_exporter.go | 14 +- .../internal/build/node_exporter.go | 11 +- .../internal/build/oracledb_exporter.go | 14 +- .../internal/build/postgres_exporter.go | 14 +- .../internal/build/process_exporter.go | 14 +- .../internal/build/redis_exporter.go | 14 +- .../internal/build/snmp_exporter.go | 60 ++- .../internal/build/snowflake_exporter.go | 14 +- .../internal/build/squid_exporter.go | 14 +- .../internal/build/statsd_exporter.go | 13 +- .../internal/build/windows_exporter.go | 14 +- .../staticconvert/staticconvert_test.go | 1 + .../testdata-v2/integrations_v2.river | 386 ++++++++++++++++++ .../testdata-v2/integrations_v2.yaml | 175 +++++++- .../testdata-v2_windows/integrations_v2.diags | 1 + .../testdata-v2_windows/integrations_v2.river | 24 ++ .../testdata-v2_windows/integrations_v2.yaml | 11 + .../staticconvert/testdata/integrations.river | 4 +- converter/internal/staticconvert/validate.go | 25 ++ .../v2/blackbox_exporter/blackbox_exporter.go | 20 +- 33 files changed, 824 insertions(+), 294 deletions(-) create mode 100644 converter/internal/staticconvert/testdata-v2_windows/integrations_v2.diags create mode 100644 converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river create mode 100644 converter/internal/staticconvert/testdata-v2_windows/integrations_v2.yaml diff --git a/converter/internal/staticconvert/internal/build/blackbox_exporter.go b/converter/internal/staticconvert/internal/build/blackbox_exporter.go index 5ab772e8ee60..5282f9440b34 100644 --- a/converter/internal/staticconvert/internal/build/blackbox_exporter.go +++ b/converter/internal/staticconvert/internal/build/blackbox_exporter.go @@ -1,26 +1,19 @@ package build import ( - "fmt" "time" "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/blackbox" "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/blackbox_exporter" + blackbox_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/blackbox_exporter" "github.com/grafana/river/rivertypes" ) func (b *IntegrationsConfigBuilder) appendBlackboxExporter(config *blackbox_exporter.Config) discovery.Exports { args := toBlackboxExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "blackbox"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.blackbox.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), nil, "blackbox") } func toBlackboxExporter(config *blackbox_exporter.Config) *blackbox.Arguments { @@ -35,6 +28,23 @@ func toBlackboxExporter(config *blackbox_exporter.Config) *blackbox.Arguments { } } +func (b *IntegrationsConfigBuilder) appendBlackboxExporterV2(config *blackbox_exporter_v2.Config) discovery.Exports { + args := toBlackboxExporterV2(config) + return b.appendExporterBlock(args, config.Name(), config.Common.InstanceKey, "blackbox") +} + +func toBlackboxExporterV2(config *blackbox_exporter_v2.Config) *blackbox.Arguments { + return &blackbox.Arguments{ + ConfigFile: config.BlackboxConfigFile, + Config: rivertypes.OptionalSecret{ + IsSecret: false, + Value: string(config.BlackboxConfig), + }, + Targets: toBlackboxTargets(config.BlackboxTargets), + ProbeTimeoutOffset: time.Duration(config.ProbeTimeoutOffset), + } +} + func toBlackboxTargets(blackboxTargets []blackbox_exporter.BlackboxTarget) blackbox.TargetBlock { var targetBlock blackbox.TargetBlock diff --git a/converter/internal/staticconvert/internal/build/builder.go b/converter/internal/staticconvert/internal/build/builder.go index 5a0c19a90f3a..07a2b7a000ce 100644 --- a/converter/internal/staticconvert/internal/build/builder.go +++ b/converter/internal/staticconvert/internal/build/builder.go @@ -39,8 +39,10 @@ import ( "github.com/grafana/agent/pkg/integrations/statsd_exporter" agent_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/agent" apache_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/apache_http" + blackbox_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/blackbox_exporter" common_v2 "github.com/grafana/agent/pkg/integrations/v2/common" "github.com/grafana/agent/pkg/integrations/v2/metricsutils" + snmp_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/snmp_exporter" "github.com/grafana/agent/pkg/integrations/windows_exporter" "github.com/grafana/river/scanner" "github.com/grafana/river/token/builder" @@ -105,53 +107,53 @@ func (b *IntegrationsConfigBuilder) appendV1Integrations() { case *apache_http.Config: exports = b.appendApacheExporter(itg) case *node_exporter.Config: - exports = b.appendNodeExporter(itg) + exports = b.appendNodeExporter(itg, nil) case *blackbox_exporter.Config: exports = b.appendBlackboxExporter(itg) case *cloudwatch_exporter.Config: - exports = b.appendCloudwatchExporter(itg) + exports = b.appendCloudwatchExporter(itg, nil) case *consul_exporter.Config: - exports = b.appendConsulExporter(itg) + exports = b.appendConsulExporter(itg, nil) case *dnsmasq_exporter.Config: - exports = b.appendDnsmasqExporter(itg) + exports = b.appendDnsmasqExporter(itg, nil) case *elasticsearch_exporter.Config: - exports = b.appendElasticsearchExporter(itg) + exports = b.appendElasticsearchExporter(itg, nil) case *gcp_exporter.Config: - exports = b.appendGcpExporter(itg) + exports = b.appendGcpExporter(itg, nil) case *github_exporter.Config: - exports = b.appendGithubExporter(itg) + exports = b.appendGithubExporter(itg, nil) case *kafka_exporter.Config: - exports = b.appendKafkaExporter(itg) + exports = b.appendKafkaExporter(itg, nil) case *memcached_exporter.Config: - exports = b.appendMemcachedExporter(itg) + exports = b.appendMemcachedExporter(itg, nil) case *mongodb_exporter.Config: - exports = b.appendMongodbExporter(itg) + exports = b.appendMongodbExporter(itg, nil) case *mssql_exporter.Config: - exports = b.appendMssqlExporter(itg) + exports = b.appendMssqlExporter(itg, nil) case *mysqld_exporter.Config: - exports = b.appendMysqldExporter(itg) + exports = b.appendMysqldExporter(itg, nil) case *oracledb_exporter.Config: - exports = b.appendOracledbExporter(itg) + exports = b.appendOracledbExporter(itg, nil) case *postgres_exporter.Config: - exports = b.appendPostgresExporter(itg) + exports = b.appendPostgresExporter(itg, nil) case *process_exporter.Config: - exports = b.appendProcessExporter(itg) + exports = b.appendProcessExporter(itg, nil) case *redis_exporter.Config: - exports = b.appendRedisExporter(itg) + exports = b.appendRedisExporter(itg, nil) case *snmp_exporter.Config: exports = b.appendSnmpExporter(itg) case *snowflake_exporter.Config: - exports = b.appendSnowflakeExporter(itg) + exports = b.appendSnowflakeExporter(itg, nil) case *squid_exporter.Config: - exports = b.appendSquidExporter(itg) + exports = b.appendSquidExporter(itg, nil) case *statsd_exporter.Config: - exports = b.appendStatsdExporter(itg) + exports = b.appendStatsdExporter(itg, nil) case *windows_exporter.Config: - exports = b.appendWindowsExporter(itg) + exports = b.appendWindowsExporter(itg, nil) case *azure_exporter.Config: exports = b.appendAzureExporter(itg, nil) case *cadvisor.Config: - exports = b.appendCadvisorExporter(itg) + exports = b.appendCadvisorExporter(itg, nil) } if len(exports.Targets) > 0 { @@ -205,11 +207,59 @@ func (b *IntegrationsConfigBuilder) appendV2Integrations() { case *apache_exporter_v2.Config: exports = b.appendApacheExporterV2(itg) commonConfig = itg.Common + case *blackbox_exporter_v2.Config: + exports = b.appendBlackboxExporterV2(itg) + commonConfig = itg.Common + case *snmp_exporter_v2.Config: + exports = b.appendSnmpExporterV2(itg) + commonConfig = itg.Common case *metricsutils.ConfigShim: commonConfig = itg.Common switch v1_itg := itg.Orig.(type) { case *azure_exporter.Config: exports = b.appendAzureExporter(v1_itg, itg.Common.InstanceKey) + case *cadvisor.Config: + exports = b.appendCadvisorExporter(v1_itg, itg.Common.InstanceKey) + case *cloudwatch_exporter.Config: + exports = b.appendCloudwatchExporter(v1_itg, itg.Common.InstanceKey) + case *consul_exporter.Config: + exports = b.appendConsulExporter(v1_itg, itg.Common.InstanceKey) + case *dnsmasq_exporter.Config: + exports = b.appendDnsmasqExporter(v1_itg, itg.Common.InstanceKey) + case *elasticsearch_exporter.Config: + exports = b.appendElasticsearchExporter(v1_itg, itg.Common.InstanceKey) + case *gcp_exporter.Config: + exports = b.appendGcpExporter(v1_itg, itg.Common.InstanceKey) + case *github_exporter.Config: + exports = b.appendGithubExporter(v1_itg, itg.Common.InstanceKey) + case *kafka_exporter.Config: + exports = b.appendKafkaExporter(v1_itg, itg.Common.InstanceKey) + case *memcached_exporter.Config: + exports = b.appendMemcachedExporter(v1_itg, itg.Common.InstanceKey) + case *mongodb_exporter.Config: + exports = b.appendMongodbExporter(v1_itg, itg.Common.InstanceKey) + case *mssql_exporter.Config: + exports = b.appendMssqlExporter(v1_itg, itg.Common.InstanceKey) + case *mysqld_exporter.Config: + exports = b.appendMysqldExporter(v1_itg, itg.Common.InstanceKey) + case *node_exporter.Config: + exports = b.appendNodeExporter(v1_itg, itg.Common.InstanceKey) + case *oracledb_exporter.Config: + exports = b.appendOracledbExporter(v1_itg, itg.Common.InstanceKey) + case *postgres_exporter.Config: + exports = b.appendPostgresExporter(v1_itg, itg.Common.InstanceKey) + case *process_exporter.Config: + exports = b.appendProcessExporter(v1_itg, itg.Common.InstanceKey) + case *redis_exporter.Config: + exports = b.appendRedisExporter(v1_itg, itg.Common.InstanceKey) + case *snowflake_exporter.Config: + exports = b.appendSnowflakeExporter(v1_itg, itg.Common.InstanceKey) + case *squid_exporter.Config: + exports = b.appendSquidExporter(v1_itg, itg.Common.InstanceKey) + case *statsd_exporter.Config: + exports = b.appendStatsdExporter(v1_itg, itg.Common.InstanceKey) + case *windows_exporter.Config: + exports = b.appendWindowsExporter(v1_itg, itg.Common.InstanceKey) } } @@ -235,11 +285,10 @@ func (b *IntegrationsConfigBuilder) appendExporterV2(commonConfig *common_v2.Met commonConfig.ApplyDefaults(b.cfg.Integrations.ConfigV2.Metrics.Autoscrape) scrapeConfig := prom_config.DefaultScrapeConfig scrapeConfig.JobName = b.formatJobName(name, commonConfig.InstanceKey) - scrapeConfig.RelabelConfigs = commonConfig.Autoscrape.RelabelConfigs + scrapeConfig.RelabelConfigs = append(commonConfig.Autoscrape.RelabelConfigs, relabelConfigs...) scrapeConfig.MetricRelabelConfigs = commonConfig.Autoscrape.MetricRelabelConfigs scrapeConfig.ScrapeInterval = commonConfig.Autoscrape.ScrapeInterval scrapeConfig.ScrapeTimeout = commonConfig.Autoscrape.ScrapeTimeout - scrapeConfig.RelabelConfigs = relabelConfigs scrapeConfigs := []*prom_config.ScrapeConfig{&scrapeConfig} diff --git a/converter/internal/staticconvert/internal/build/cadvisor_exporter.go b/converter/internal/staticconvert/internal/build/cadvisor_exporter.go index 04d414c14cd0..dbedebfb2967 100644 --- a/converter/internal/staticconvert/internal/build/cadvisor_exporter.go +++ b/converter/internal/staticconvert/internal/build/cadvisor_exporter.go @@ -1,25 +1,16 @@ package build import ( - "fmt" "time" "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/cadvisor" - "github.com/grafana/agent/converter/internal/common" cadvisor_integration "github.com/grafana/agent/pkg/integrations/cadvisor" ) -func (b *IntegrationsConfigBuilder) appendCadvisorExporter(config *cadvisor_integration.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendCadvisorExporter(config *cadvisor_integration.Config, instanceKey *string) discovery.Exports { args := toCadvisorExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "cadvisor"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.cadvisor.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "cadvisor") } func toCadvisorExporter(config *cadvisor_integration.Config) *cadvisor.Arguments { diff --git a/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go b/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go index 2afdd0170756..0d13d8a1c53d 100644 --- a/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go +++ b/converter/internal/staticconvert/internal/build/cloudwatch_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/cloudwatch" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/cloudwatch_exporter" ) -func (b *IntegrationsConfigBuilder) appendCloudwatchExporter(config *cloudwatch_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendCloudwatchExporter(config *cloudwatch_exporter.Config, instanceKey *string) discovery.Exports { args := toCloudwatchExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "cloudwatch"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.cloudwatch.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "cloudwatch") } func toCloudwatchExporter(config *cloudwatch_exporter.Config) *cloudwatch.Arguments { diff --git a/converter/internal/staticconvert/internal/build/consul_exporter.go b/converter/internal/staticconvert/internal/build/consul_exporter.go index 3b6ba2f74018..89d0221ff400 100644 --- a/converter/internal/staticconvert/internal/build/consul_exporter.go +++ b/converter/internal/staticconvert/internal/build/consul_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/consul" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/consul_exporter" ) -func (b *IntegrationsConfigBuilder) appendConsulExporter(config *consul_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendConsulExporter(config *consul_exporter.Config, instanceKey *string) discovery.Exports { args := toConsulExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "consul"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.consul.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "consul") } func toConsulExporter(config *consul_exporter.Config) *consul.Arguments { diff --git a/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go b/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go index df46fe453987..fa2a5e43a9bf 100644 --- a/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go +++ b/converter/internal/staticconvert/internal/build/dnsmasq_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/dnsmasq" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/dnsmasq_exporter" ) -func (b *IntegrationsConfigBuilder) appendDnsmasqExporter(config *dnsmasq_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendDnsmasqExporter(config *dnsmasq_exporter.Config, instanceKey *string) discovery.Exports { args := toDnsmasqExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "dnsmasq"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.dnsmasq.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "dnsmasq") } func toDnsmasqExporter(config *dnsmasq_exporter.Config) *dnsmasq.Arguments { diff --git a/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go b/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go index 6d874048dba2..97022a1f182f 100644 --- a/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go +++ b/converter/internal/staticconvert/internal/build/elasticsearch_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/elasticsearch" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/elasticsearch_exporter" ) -func (b *IntegrationsConfigBuilder) appendElasticsearchExporter(config *elasticsearch_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendElasticsearchExporter(config *elasticsearch_exporter.Config, instanceKey *string) discovery.Exports { args := toElasticsearchExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "elasticsearch"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.elasticsearch.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "elasticsearch") } func toElasticsearchExporter(config *elasticsearch_exporter.Config) *elasticsearch.Arguments { diff --git a/converter/internal/staticconvert/internal/build/gcp_exporter.go b/converter/internal/staticconvert/internal/build/gcp_exporter.go index 954b67943210..a864c416fae7 100644 --- a/converter/internal/staticconvert/internal/build/gcp_exporter.go +++ b/converter/internal/staticconvert/internal/build/gcp_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/gcp" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/gcp_exporter" ) -func (b *IntegrationsConfigBuilder) appendGcpExporter(config *gcp_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendGcpExporter(config *gcp_exporter.Config, instanceKey *string) discovery.Exports { args := toGcpExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "gcp"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.gcp.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "gcp") } func toGcpExporter(config *gcp_exporter.Config) *gcp.Arguments { diff --git a/converter/internal/staticconvert/internal/build/github_exporter.go b/converter/internal/staticconvert/internal/build/github_exporter.go index d2b228de38a0..4fcc4d4e0e10 100644 --- a/converter/internal/staticconvert/internal/build/github_exporter.go +++ b/converter/internal/staticconvert/internal/build/github_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/github" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/github_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendGithubExporter(config *github_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendGithubExporter(config *github_exporter.Config, instanceKey *string) discovery.Exports { args := toGithubExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "github"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.github.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "github") } func toGithubExporter(config *github_exporter.Config) *github.Arguments { diff --git a/converter/internal/staticconvert/internal/build/kafka_exporter.go b/converter/internal/staticconvert/internal/build/kafka_exporter.go index cf47bba409ff..25310e35a5f4 100644 --- a/converter/internal/staticconvert/internal/build/kafka_exporter.go +++ b/converter/internal/staticconvert/internal/build/kafka_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/kafka" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/kafka_exporter" ) -func (b *IntegrationsConfigBuilder) appendKafkaExporter(config *kafka_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendKafkaExporter(config *kafka_exporter.Config, instanceKey *string) discovery.Exports { args := toKafkaExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "kafka"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.kafka.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "kafka") } func toKafkaExporter(config *kafka_exporter.Config) *kafka.Arguments { diff --git a/converter/internal/staticconvert/internal/build/memcached_exporter.go b/converter/internal/staticconvert/internal/build/memcached_exporter.go index a9f179c04b4a..e43afdb7d4c0 100644 --- a/converter/internal/staticconvert/internal/build/memcached_exporter.go +++ b/converter/internal/staticconvert/internal/build/memcached_exporter.go @@ -1,24 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/memcached" "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/memcached_exporter" ) -func (b *IntegrationsConfigBuilder) appendMemcachedExporter(config *memcached_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendMemcachedExporter(config *memcached_exporter.Config, instanceKey *string) discovery.Exports { args := toMemcachedExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "memcached"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.memcached.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "memcached") } func toMemcachedExporter(config *memcached_exporter.Config) *memcached.Arguments { diff --git a/converter/internal/staticconvert/internal/build/mongodb_exporter.go b/converter/internal/staticconvert/internal/build/mongodb_exporter.go index 88b2e075be92..59e7da771809 100644 --- a/converter/internal/staticconvert/internal/build/mongodb_exporter.go +++ b/converter/internal/staticconvert/internal/build/mongodb_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/mongodb" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/mongodb_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendMongodbExporter(config *mongodb_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendMongodbExporter(config *mongodb_exporter.Config, instanceKey *string) discovery.Exports { args := toMongodbExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "mongodb"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.mongodb.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "mongodb") } func toMongodbExporter(config *mongodb_exporter.Config) *mongodb.Arguments { diff --git a/converter/internal/staticconvert/internal/build/mssql_exporter.go b/converter/internal/staticconvert/internal/build/mssql_exporter.go index 8615d6c74182..f6154a65c913 100644 --- a/converter/internal/staticconvert/internal/build/mssql_exporter.go +++ b/converter/internal/staticconvert/internal/build/mssql_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/mssql" - "github.com/grafana/agent/converter/internal/common" mssql_exporter "github.com/grafana/agent/pkg/integrations/mssql" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendMssqlExporter(config *mssql_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendMssqlExporter(config *mssql_exporter.Config, instanceKey *string) discovery.Exports { args := toMssqlExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "mssql"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.mssql.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "mssql") } func toMssqlExporter(config *mssql_exporter.Config) *mssql.Arguments { diff --git a/converter/internal/staticconvert/internal/build/mysqld_exporter.go b/converter/internal/staticconvert/internal/build/mysqld_exporter.go index 52d6670be9dd..51b3a20a8dcc 100644 --- a/converter/internal/staticconvert/internal/build/mysqld_exporter.go +++ b/converter/internal/staticconvert/internal/build/mysqld_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/mysql" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/mysqld_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendMysqldExporter(config *mysqld_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendMysqldExporter(config *mysqld_exporter.Config, instanceKey *string) discovery.Exports { args := toMysqldExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "mysql"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.mysql.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "mysql") } func toMysqldExporter(config *mysqld_exporter.Config) *mysql.Arguments { diff --git a/converter/internal/staticconvert/internal/build/node_exporter.go b/converter/internal/staticconvert/internal/build/node_exporter.go index 9fad26b460ff..3e896d3b1013 100644 --- a/converter/internal/staticconvert/internal/build/node_exporter.go +++ b/converter/internal/staticconvert/internal/build/node_exporter.go @@ -3,19 +3,12 @@ package build import ( "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/unix" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/node_exporter" ) -func (b *IntegrationsConfigBuilder) appendNodeExporter(config *node_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendNodeExporter(config *node_exporter.Config, instanceKey *string) discovery.Exports { args := toNodeExporter(config) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "unix"}, - "default", - args, - )) - - return common.NewDiscoveryExports("prometheus.exporter.unix.default.targets") + return b.appendExporterBlock(args, config.Name(), instanceKey, "unix") } func toNodeExporter(config *node_exporter.Config) *unix.Arguments { diff --git a/converter/internal/staticconvert/internal/build/oracledb_exporter.go b/converter/internal/staticconvert/internal/build/oracledb_exporter.go index e1ad64c2404a..c786bd3b2d5d 100644 --- a/converter/internal/staticconvert/internal/build/oracledb_exporter.go +++ b/converter/internal/staticconvert/internal/build/oracledb_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/oracledb" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/oracledb_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendOracledbExporter(config *oracledb_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendOracledbExporter(config *oracledb_exporter.Config, instanceKey *string) discovery.Exports { args := toOracledbExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "oracledb"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.oracledb.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "oracledb") } func toOracledbExporter(config *oracledb_exporter.Config) *oracledb.Arguments { diff --git a/converter/internal/staticconvert/internal/build/postgres_exporter.go b/converter/internal/staticconvert/internal/build/postgres_exporter.go index 863999bdadb8..2fe110311011 100644 --- a/converter/internal/staticconvert/internal/build/postgres_exporter.go +++ b/converter/internal/staticconvert/internal/build/postgres_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/postgres" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/postgres_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendPostgresExporter(config *postgres_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendPostgresExporter(config *postgres_exporter.Config, instanceKey *string) discovery.Exports { args := toPostgresExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "postgres"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.postgres.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "postgres") } func toPostgresExporter(config *postgres_exporter.Config) *postgres.Arguments { diff --git a/converter/internal/staticconvert/internal/build/process_exporter.go b/converter/internal/staticconvert/internal/build/process_exporter.go index 2172865c2c0c..1224deca7849 100644 --- a/converter/internal/staticconvert/internal/build/process_exporter.go +++ b/converter/internal/staticconvert/internal/build/process_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/process" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/process_exporter" ) -func (b *IntegrationsConfigBuilder) appendProcessExporter(config *process_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendProcessExporter(config *process_exporter.Config, instanceKey *string) discovery.Exports { args := toProcessExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "process"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.process.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "process") } func toProcessExporter(config *process_exporter.Config) *process.Arguments { diff --git a/converter/internal/staticconvert/internal/build/redis_exporter.go b/converter/internal/staticconvert/internal/build/redis_exporter.go index dc87a0293723..56e497807b9e 100644 --- a/converter/internal/staticconvert/internal/build/redis_exporter.go +++ b/converter/internal/staticconvert/internal/build/redis_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/redis" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/redis_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendRedisExporter(config *redis_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendRedisExporter(config *redis_exporter.Config, instanceKey *string) discovery.Exports { args := toRedisExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "redis"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.redis.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "redis") } func toRedisExporter(config *redis_exporter.Config) *redis.Arguments { diff --git a/converter/internal/staticconvert/internal/build/snmp_exporter.go b/converter/internal/staticconvert/internal/build/snmp_exporter.go index 6d03c27cce69..9b56c2fbd89b 100644 --- a/converter/internal/staticconvert/internal/build/snmp_exporter.go +++ b/converter/internal/staticconvert/internal/build/snmp_exporter.go @@ -1,26 +1,18 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/snmp" "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/snmp_exporter" + snmp_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/snmp_exporter" "github.com/grafana/river/rivertypes" snmp_config "github.com/prometheus/snmp_exporter/config" ) func (b *IntegrationsConfigBuilder) appendSnmpExporter(config *snmp_exporter.Config) discovery.Exports { args := toSnmpExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "snmp"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.snmp.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), nil, "snmp") } func toSnmpExporter(config *snmp_exporter.Config) *snmp.Arguments { @@ -65,3 +57,51 @@ func toSnmpExporter(config *snmp_exporter.Config) *snmp.Arguments { }, } } + +func (b *IntegrationsConfigBuilder) appendSnmpExporterV2(config *snmp_exporter_v2.Config) discovery.Exports { + args := toSnmpExporterV2(config) + return b.appendExporterBlock(args, config.Name(), config.Common.InstanceKey, "snmp") +} + +func toSnmpExporterV2(config *snmp_exporter_v2.Config) *snmp.Arguments { + targets := make([]snmp.SNMPTarget, len(config.SnmpTargets)) + for i, t := range config.SnmpTargets { + targets[i] = snmp.SNMPTarget{ + Name: common.SanitizeIdentifierPanics(t.Name), + Target: t.Target, + Module: t.Module, + Auth: t.Auth, + WalkParams: t.WalkParams, + } + } + + walkParams := make([]snmp.WalkParam, len(config.WalkParams)) + index := 0 + for name, p := range config.WalkParams { + retries := 0 + if p.Retries != nil { + retries = *p.Retries + } + + walkParams[index] = snmp.WalkParam{ + Name: common.SanitizeIdentifierPanics(name), + MaxRepetitions: p.MaxRepetitions, + Retries: retries, + Timeout: p.Timeout, + UseUnconnectedUDPSocket: p.UseUnconnectedUDPSocket, + } + index++ + } + + return &snmp.Arguments{ + ConfigFile: config.SnmpConfigFile, + Config: rivertypes.OptionalSecret{}, + Targets: targets, + WalkParams: walkParams, + ConfigStruct: snmp_config.Config{ + Auths: config.SnmpConfig.Auths, + Modules: config.SnmpConfig.Modules, + Version: config.SnmpConfig.Version, + }, + } +} diff --git a/converter/internal/staticconvert/internal/build/snowflake_exporter.go b/converter/internal/staticconvert/internal/build/snowflake_exporter.go index 34f605564c35..ed0f10ff1c1e 100644 --- a/converter/internal/staticconvert/internal/build/snowflake_exporter.go +++ b/converter/internal/staticconvert/internal/build/snowflake_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/snowflake" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/snowflake_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendSnowflakeExporter(config *snowflake_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendSnowflakeExporter(config *snowflake_exporter.Config, instanceKey *string) discovery.Exports { args := toSnowflakeExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "snowflake"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.snowflake.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "snowflake") } func toSnowflakeExporter(config *snowflake_exporter.Config) *snowflake.Arguments { diff --git a/converter/internal/staticconvert/internal/build/squid_exporter.go b/converter/internal/staticconvert/internal/build/squid_exporter.go index c275b0dd04a6..4283f4ebe0f9 100644 --- a/converter/internal/staticconvert/internal/build/squid_exporter.go +++ b/converter/internal/staticconvert/internal/build/squid_exporter.go @@ -1,25 +1,15 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/squid" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/squid_exporter" "github.com/grafana/river/rivertypes" ) -func (b *IntegrationsConfigBuilder) appendSquidExporter(config *squid_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendSquidExporter(config *squid_exporter.Config, instanceKey *string) discovery.Exports { args := toSquidExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "squid"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.squid.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "squid") } func toSquidExporter(config *squid_exporter.Config) *squid.Arguments { diff --git a/converter/internal/staticconvert/internal/build/statsd_exporter.go b/converter/internal/staticconvert/internal/build/statsd_exporter.go index 719ce2baf73b..3756a876b8a6 100644 --- a/converter/internal/staticconvert/internal/build/statsd_exporter.go +++ b/converter/internal/staticconvert/internal/build/statsd_exporter.go @@ -1,29 +1,20 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/statsd" "github.com/grafana/agent/converter/diag" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/statsd_exporter" ) -func (b *IntegrationsConfigBuilder) appendStatsdExporter(config *statsd_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendStatsdExporter(config *statsd_exporter.Config, instanceKey *string) discovery.Exports { args := toStatsdExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "statsd"}, - compLabel, - args, - )) if config.MappingConfig != nil { b.diags.Add(diag.SeverityLevelError, "mapping_config is not supported in statsd_exporter integrations config") } - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.statsd.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "statsd") } func toStatsdExporter(config *statsd_exporter.Config) *statsd.Arguments { diff --git a/converter/internal/staticconvert/internal/build/windows_exporter.go b/converter/internal/staticconvert/internal/build/windows_exporter.go index bfd9fb771155..100a8761ccfc 100644 --- a/converter/internal/staticconvert/internal/build/windows_exporter.go +++ b/converter/internal/staticconvert/internal/build/windows_exporter.go @@ -1,24 +1,14 @@ package build import ( - "fmt" - "github.com/grafana/agent/component/discovery" "github.com/grafana/agent/component/prometheus/exporter/windows" - "github.com/grafana/agent/converter/internal/common" "github.com/grafana/agent/pkg/integrations/windows_exporter" ) -func (b *IntegrationsConfigBuilder) appendWindowsExporter(config *windows_exporter.Config) discovery.Exports { +func (b *IntegrationsConfigBuilder) appendWindowsExporter(config *windows_exporter.Config, instanceKey *string) discovery.Exports { args := toWindowsExporter(config) - compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name()) - b.f.Body().AppendBlock(common.NewBlockWithOverride( - []string{"prometheus", "exporter", "windows"}, - compLabel, - args, - )) - - return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.windows.%s.targets", compLabel)) + return b.appendExporterBlock(args, config.Name(), instanceKey, "windows") } func toWindowsExporter(config *windows_exporter.Config) *windows.Arguments { diff --git a/converter/internal/staticconvert/staticconvert_test.go b/converter/internal/staticconvert/staticconvert_test.go index d283164e4453..f85e880b37d8 100644 --- a/converter/internal/staticconvert/staticconvert_test.go +++ b/converter/internal/staticconvert/staticconvert_test.go @@ -15,5 +15,6 @@ func TestConvert(t *testing.T) { if runtime.GOOS == "windows" { test_common.TestDirectory(t, "testdata_windows", ".yaml", true, []string{}, staticconvert.Convert) + test_common.TestDirectory(t, "testdata-v2_windows", ".yaml", true, []string{"-enable-features", "integrations-next"}, staticconvert.Convert) } } diff --git a/converter/internal/staticconvert/testdata-v2/integrations_v2.river b/converter/internal/staticconvert/testdata-v2/integrations_v2.river index c0e2acba450b..f3d134cdc79a 100644 --- a/converter/internal/staticconvert/testdata-v2/integrations_v2.river +++ b/converter/internal/staticconvert/testdata-v2/integrations_v2.river @@ -33,6 +33,354 @@ prometheus.scrape "integrations_azure2" { job_name = "integrations/azure2" } +prometheus.exporter.cadvisor "integrations_cadvisor" { + store_container_labels = false +} + +prometheus.scrape "integrations_cadvisor" { + targets = prometheus.exporter.cadvisor.integrations_cadvisor.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/cadvisor" +} + +prometheus.exporter.cloudwatch "integrations_cloudwatch_exporter" { + sts_region = "us-east-2" + fips_disabled = false + + discovery { + regions = ["us-east-2"] + custom_tags = {} + search_tags = {} + type = "AWS/EC2" + + metric { + name = "CPUUtilization" + statistics = ["Average"] + period = "5m0s" + nil_to_zero = false + } + + metric { + name = "NetworkPacketsIn" + statistics = ["Average"] + period = "5m0s" + } + nil_to_zero = true + } + + static "single_ec2_instance" { + regions = ["us-east-2"] + custom_tags = {} + namespace = "AWS/EC2" + dimensions = { + InstanceId = "i-0e43cee369aa44b52", + } + + metric { + name = "CPUUtilization" + statistics = ["Average"] + period = "5m0s" + nil_to_zero = false + } + + metric { + name = "NetworkPacketsIn" + statistics = ["Average"] + period = "5m0s" + } + nil_to_zero = true + } + + decoupled_scraping { } +} + +prometheus.scrape "integrations_cloudwatch" { + targets = prometheus.exporter.cloudwatch.integrations_cloudwatch_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/cloudwatch" +} + +prometheus.exporter.consul "integrations_consul_exporter" { } + +prometheus.scrape "integrations_consul" { + targets = prometheus.exporter.consul.integrations_consul_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/consul" +} + +prometheus.exporter.dnsmasq "integrations_dnsmasq_exporter" { + address = "dnsmasq-a:53" +} + +discovery.relabel "integrations_dnsmasq" { + targets = prometheus.exporter.dnsmasq.integrations_dnsmasq_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "instance" + replacement = "dnsmasq-a" + } +} + +prometheus.scrape "integrations_dnsmasq" { + targets = discovery.relabel.integrations_dnsmasq.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/dnsmasq" +} + +prometheus.exporter.elasticsearch "integrations_elasticsearch_exporter" { } + +prometheus.scrape "integrations_elasticsearch" { + targets = prometheus.exporter.elasticsearch.integrations_elasticsearch_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/elasticsearch" +} + +prometheus.exporter.gcp "integrations_gcp_exporter" { + project_ids = [""] + metrics_prefixes = ["loadbalancing.googleapis.com/https/request_bytes_count", "loadbalancing.googleapis.com/https/total_latencies"] + extra_filters = ["loadbalancing.googleapis.com:resource.labels.backend_target_name=\"sample-value\""] +} + +prometheus.scrape "integrations_gcp" { + targets = prometheus.exporter.gcp.integrations_gcp_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/gcp" +} + +prometheus.exporter.github "integrations_github_exporter" { + repositories = ["grafana/agent", "grafana/agent-modules"] + api_token = "ABCDEFGH-1234-ABCD-1234-ABCDEFGHIJKL" +} + +prometheus.scrape "integrations_github" { + targets = prometheus.exporter.github.integrations_github_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/github" +} + +prometheus.exporter.kafka "integrations_kafka_exporter" { } + +prometheus.scrape "integrations_kafka" { + targets = prometheus.exporter.kafka.integrations_kafka_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/kafka" +} + +prometheus.exporter.memcached "integrations_memcached_exporter" { + address = "memcached-a:53" +} + +discovery.relabel "integrations_memcached" { + targets = prometheus.exporter.memcached.integrations_memcached_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "instance" + replacement = "memcached-a" + } +} + +prometheus.scrape "integrations_memcached" { + targets = discovery.relabel.integrations_memcached.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/memcached" +} + +prometheus.exporter.mongodb "integrations_mongodb_exporter" { + mongodb_uri = "mongodb://mongodb-a:27017" + direct_connect = true +} + +discovery.relabel "integrations_mongodb" { + targets = prometheus.exporter.mongodb.integrations_mongodb_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "service_name" + replacement = "replicaset1-node1" + } + + rule { + source_labels = ["__address__"] + target_label = "mongodb_cluster" + replacement = "prod-cluster" + } +} + +prometheus.scrape "integrations_mongodb" { + targets = discovery.relabel.integrations_mongodb.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/mongodb" +} + +prometheus.exporter.mssql "integrations_mssql" { + connection_string = "sqlserver://:@:" +} + +prometheus.scrape "integrations_mssql" { + targets = prometheus.exporter.mssql.integrations_mssql.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/mssql" +} + +prometheus.exporter.mysql "integrations_mysqld_exporter" { + data_source_name = "root@(server-a:3306)/" +} + +discovery.relabel "integrations_mysql" { + targets = prometheus.exporter.mysql.integrations_mysqld_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "instance" + replacement = "server-a" + } +} + +prometheus.scrape "integrations_mysql" { + targets = discovery.relabel.integrations_mysql.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/mysql" +} + +prometheus.exporter.unix "integrations_node_exporter" { } + +discovery.relabel "integrations_node_exporter" { + targets = prometheus.exporter.unix.integrations_node_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "__param_id" + } + + rule { + source_labels = ["__param_id"] + target_label = "thermostat" + } + + rule { + target_label = "__address__" + replacement = "localhost:8099" + } +} + +prometheus.scrape "integrations_node_exporter" { + targets = discovery.relabel.integrations_node_exporter.output + forward_to = [prometheus.relabel.integrations_node_exporter.receiver] + job_name = "integrations/node_exporter" +} + +prometheus.relabel "integrations_node_exporter" { + forward_to = [prometheus.remote_write.metrics_default.receiver] + + rule { + source_labels = ["__metric_address1__"] + target_label = "__metric_param_target1" + } + + rule { + source_labels = ["__metric_address2__"] + target_label = "__metric_param_target2" + } +} + +prometheus.exporter.oracledb "integrations_oracledb" { + connection_string = "oracle://user:password@localhost:1521/orcl.localnet" +} + +prometheus.scrape "integrations_oracledb" { + targets = prometheus.exporter.oracledb.integrations_oracledb.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/oracledb" +} + +prometheus.exporter.postgres "integrations_postgres_exporter" { + data_source_names = ["postgres://postgres:password@localhost:5432/postgres?sslmode=disable"] +} + +discovery.relabel "integrations_postgres" { + targets = prometheus.exporter.postgres.integrations_postgres_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "instance" + replacement = "postgres-a" + } +} + +prometheus.scrape "integrations_postgres" { + targets = discovery.relabel.integrations_postgres.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/postgres" +} + +prometheus.exporter.process "integrations_process_exporter" { + matcher { + name = "{{.Comm}}" + cmdline = [".+"] + } +} + +prometheus.scrape "integrations_process" { + targets = prometheus.exporter.process.integrations_process_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/process" +} + +prometheus.exporter.redis "integrations_redis_exporter" { + redis_addr = "redis-2:6379" + export_key_values = false +} + +discovery.relabel "integrations_redis" { + targets = prometheus.exporter.redis.integrations_redis_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "instance" + replacement = "redis-2" + } +} + +prometheus.scrape "integrations_redis" { + targets = discovery.relabel.integrations_redis.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/redis" +} + +prometheus.exporter.snowflake "integrations_snowflake" { + account_name = "XXXXXXX-YYYYYYY" + username = "snowflake-user" + password = "snowflake-pass" + warehouse = "SNOWFLAKE_WAREHOUSE" +} + +prometheus.scrape "integrations_snowflake" { + targets = prometheus.exporter.snowflake.integrations_snowflake.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/snowflake" +} + +prometheus.exporter.squid "integrations_squid" { + address = "localhost:3128" +} + +prometheus.scrape "integrations_squid" { + targets = prometheus.exporter.squid.integrations_squid.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/squid" + scrape_timeout = "1m0s" +} + +prometheus.exporter.statsd "integrations_statsd_exporter" { } + +prometheus.scrape "integrations_statsd" { + targets = prometheus.exporter.statsd.integrations_statsd_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/statsd" +} + prometheus.exporter.agent "integrations_agent" { } discovery.relabel "integrations_agent" { @@ -90,3 +438,41 @@ prometheus.scrape "integrations_apache2" { forward_to = [prometheus.remote_write.metrics_default.receiver] job_name = "integrations/apache2" } + +prometheus.exporter.blackbox "integrations_blackbox" { + config = "modules:\n http_2xx:\n prober: http\n timeout: 5s\n http:\n method: POST\n headers:\n Content-Type: application/json\n body: '{}'\n preferred_ip_protocol: ip4\n" + + target "example" { + address = "http://example.com" + module = "http_2xx" + } + probe_timeout_offset = "0s" +} + +prometheus.scrape "integrations_blackbox" { + targets = prometheus.exporter.blackbox.integrations_blackbox.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/blackbox" +} + +prometheus.exporter.snmp "integrations_snmp" { + target "network_switch_1" { + address = "192.168.1.2" + module = "if_mib" + auth = "public" + walk_params = "public" + } + + target "network_router_2" { + address = "192.168.1.3" + module = "mikrotik" + auth = "private" + walk_params = "private" + } +} + +prometheus.scrape "integrations_snmp" { + targets = prometheus.exporter.snmp.integrations_snmp.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/snmp" +} diff --git a/converter/internal/staticconvert/testdata-v2/integrations_v2.yaml b/converter/internal/staticconvert/testdata-v2/integrations_v2.yaml index 057609597a56..d533977c6a9f 100644 --- a/converter/internal/staticconvert/testdata-v2/integrations_v2.yaml +++ b/converter/internal/staticconvert/testdata-v2/integrations_v2.yaml @@ -31,4 +31,177 @@ integrations: - "subId" resource_type: "Microsoft.Dashboard/grafana" metrics: - - "HttpRequestCount" \ No newline at end of file + - "HttpRequestCount" + blackbox: + blackbox_targets: + - name: example + address: http://example.com + module: http_2xx + blackbox_config: + modules: + http_2xx: + prober: http + timeout: 5s + http: + method: POST + headers: + Content-Type: application/json + body: '{}' + preferred_ip_protocol: "ip4" + cadvisor: + store_container_labels: false + cloudwatch_configs: + - sts_region: us-east-2 + discovery: + jobs: + - type: AWS/EC2 + regions: + - us-east-2 + nil_to_zero: true + metrics: + - name: CPUUtilization + period: 5m + statistics: + - Average + nil_to_zero: false + - name: NetworkPacketsIn + period: 5m + statistics: + - Average + static: + - name: single_ec2_instance + regions: + - us-east-2 + namespace: AWS/EC2 + dimensions: + - name: InstanceId + value: i-0e43cee369aa44b52 + nil_to_zero: true + metrics: + - name: CPUUtilization + period: 5m + statistics: + - Average + nil_to_zero: false + - name: NetworkPacketsIn + period: 5m + statistics: + - Average + consul_configs: + - autoscrape: + metrics_instance: "default" + dnsmasq_configs: + - dnsmasq_address: dnsmasq-a:53 + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: instance + replacement: dnsmasq-a + elasticsearch_configs: + - autoscrape: + metrics_instance: "default" + gcp_configs: + - project_ids: + - + metrics_prefixes: + - loadbalancing.googleapis.com/https/request_bytes_count + - loadbalancing.googleapis.com/https/total_latencies + extra_filters: + - loadbalancing.googleapis.com:resource.labels.backend_target_name="sample-value" + github_configs: + - api_token: ABCDEFGH-1234-ABCD-1234-ABCDEFGHIJKL + repositories: + - grafana/agent + - grafana/agent-modules + kafka_configs: + - autoscrape: + metrics_instance: "default" + memcached_configs: + - memcached_address: memcached-a:53 + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: instance + replacement: memcached-a + mongodb_configs: + - mongodb_uri: mongodb://mongodb-a:27017 + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: service_name + replacement: 'replicaset1-node1' + - source_labels: [__address__] + target_label: mongodb_cluster + replacement: 'prod-cluster' + mssql_configs: + - connection_string: sqlserver://:@: + mysql_configs: + - data_source_name: root@(server-a:3306)/ + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: instance + replacement: server-a + node_exporter: + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: __param_id + - source_labels: [__param_id] + target_label: thermostat + - target_label: __address__ + replacement: localhost:8099 + metric_relabel_configs: + - source_labels: [__metric_address1__] + target_label: __metric_param_target1 + - source_labels: [__metric_address2__] + target_label: __metric_param_target2 + oracledb_configs: + - connection_string: oracle://user:password@localhost:1521/orcl.localnet + postgres_configs: + - data_source_names: + - postgres://postgres:password@localhost:5432/postgres?sslmode=disable + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: instance + replacement: postgres-a + process: + process_names: + - name: "{{.Comm}}" + cmdline: + - '.+' + redis_configs: + - redis_addr: "redis-2:6379" + export_key_values: false + autoscrape: + relabel_configs: + - source_labels: [__address__] + target_label: instance + replacement: redis-2 + snmp: + snmp_targets: + - name: network_switch_1 + address: 192.168.1.2 + module: if_mib + walk_params: public + auth: public + - name: network_router_2 + address: 192.168.1.3 + module: mikrotik + walk_params: private + auth: private + snowflake_configs: + - account_name: XXXXXXX-YYYYYYY + username: snowflake-user + password: snowflake-pass + warehouse: SNOWFLAKE_WAREHOUSE + role: ACCOUNTADMIN + squid_configs: + - address: localhost:3128 + autoscrape: + scrape_interval: 1m + scrape_timeout: 1m + statsd: + autoscrape: + metrics_instance: "default" \ No newline at end of file diff --git a/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.diags b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.diags new file mode 100644 index 000000000000..a4a05d1a3b58 --- /dev/null +++ b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.diags @@ -0,0 +1 @@ +(Warning) Please review your agent command line flags and ensure they are set in your Flow mode config file where necessary. \ No newline at end of file diff --git a/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river new file mode 100644 index 000000000000..e01818b3faad --- /dev/null +++ b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river @@ -0,0 +1,24 @@ +prometheus.remote_write "metrics_default" { + endpoint { + name = "default-8be96f" + url = "http://localhost:9009/api/prom/push" + + queue_config { } + + metadata_config { } + } +} + +prometheus.exporter.windows "integrations_windows_exporter" { + exchange { } + + network { + exclude = ".+" + } +} + +prometheus.scrape "integrations_windows" { + targets = prometheus.exporter.windows.integrations_windows_exporter.targets + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/windows" +} diff --git a/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.yaml b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.yaml new file mode 100644 index 000000000000..da2e8b44c3c7 --- /dev/null +++ b/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.yaml @@ -0,0 +1,11 @@ +metrics: + global: + remote_write: + - url: http://localhost:9009/api/prom/push + configs: + - name: default + +integrations: + windows: + autoscrape: + metrics_instance: "default" \ No newline at end of file diff --git a/converter/internal/staticconvert/testdata/integrations.river b/converter/internal/staticconvert/testdata/integrations.river index 274fd0e737e2..1fc2e1867c1e 100644 --- a/converter/internal/staticconvert/testdata/integrations.river +++ b/converter/internal/staticconvert/testdata/integrations.river @@ -387,10 +387,10 @@ prometheus.scrape "integrations_mysqld_exporter" { } } -prometheus.exporter.unix "default" { } +prometheus.exporter.unix "integrations_node_exporter" { } discovery.relabel "integrations_node_exporter" { - targets = prometheus.exporter.unix.default.targets + targets = prometheus.exporter.unix.integrations_node_exporter.targets rule { source_labels = ["__address__"] diff --git a/converter/internal/staticconvert/validate.go b/converter/internal/staticconvert/validate.go index b79760a69b49..eed0b8c57717 100644 --- a/converter/internal/staticconvert/validate.go +++ b/converter/internal/staticconvert/validate.go @@ -35,7 +35,9 @@ import ( v2 "github.com/grafana/agent/pkg/integrations/v2" agent_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/agent" apache_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/apache_http" + blackbox_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/blackbox_exporter" "github.com/grafana/agent/pkg/integrations/v2/metricsutils" + snmp_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/snmp_exporter" "github.com/grafana/agent/pkg/integrations/windows_exporter" "github.com/grafana/agent/pkg/logs" "github.com/grafana/agent/pkg/metrics" @@ -164,9 +166,32 @@ func validateIntegrationsV2(integrationsConfig *v2.SubsystemOptions) diag.Diagno switch itg := integration.(type) { case *agent_exporter_v2.Config: case *apache_exporter_v2.Config: + case *blackbox_exporter_v2.Config: + case *snmp_exporter_v2.Config: case *metricsutils.ConfigShim: switch v1_itg := itg.Orig.(type) { case *azure_exporter.Config: + case *cadvisor.Config: + case *cloudwatch_exporter.Config: + case *consul_exporter.Config: + case *dnsmasq_exporter.Config: + case *elasticsearch_exporter.Config: + case *gcp_exporter.Config: + case *github_exporter.Config: + case *kafka_exporter.Config: + case *memcached_exporter.Config: + case *mongodb_exporter.Config: + case *mssql_exporter.Config: + case *mysqld_exporter.Config: + case *node_exporter.Config: + case *oracledb_exporter.Config: + case *postgres_exporter.Config: + case *process_exporter.Config: + case *redis_exporter.Config: + case *snowflake_exporter.Config: + case *squid_exporter.Config: + case *statsd_exporter.Config: + case *windows_exporter.Config: default: diags.Add(diag.SeverityLevelError, fmt.Sprintf("The converter does not support converting the provided %s integration.", v1_itg.Name())) } diff --git a/pkg/integrations/v2/blackbox_exporter/blackbox_exporter.go b/pkg/integrations/v2/blackbox_exporter/blackbox_exporter.go index 5c21c35447c3..5c2791aaaae1 100644 --- a/pkg/integrations/v2/blackbox_exporter/blackbox_exporter.go +++ b/pkg/integrations/v2/blackbox_exporter/blackbox_exporter.go @@ -5,7 +5,9 @@ import ( "github.com/grafana/agent/pkg/integrations/blackbox_exporter" integrations_v2 "github.com/grafana/agent/pkg/integrations/v2" "github.com/grafana/agent/pkg/integrations/v2/common" + "github.com/grafana/agent/pkg/util" blackbox_config "github.com/prometheus/blackbox_exporter/config" + "gopkg.in/yaml.v3" ) // DefaultConfig holds the default settings for the blackbox_exporter integration. @@ -18,7 +20,7 @@ var DefaultConfig = Config{ type Config struct { BlackboxConfigFile string `yaml:"config_file,omitempty"` BlackboxTargets []blackbox_exporter.BlackboxTarget `yaml:"blackbox_targets"` - BlackboxConfig blackbox_config.Config `yaml:"blackbox_config,omitempty"` + BlackboxConfig util.RawYAML `yaml:"blackbox_config,omitempty"` ProbeTimeoutOffset float64 `yaml:"probe_timeout_offset,omitempty"` Common common.MetricsConfig `yaml:",inline"` @@ -30,7 +32,13 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error { *c = DefaultConfig type plain Config - return unmarshal((*plain)(c)) + err := unmarshal((*plain)(c)) + if err != nil { + return err + } + + var blackbox_config blackbox_config.Config + return yaml.Unmarshal(c.BlackboxConfig, &blackbox_config) } // Name returns the name of the integration. @@ -58,7 +66,13 @@ func init() { // NewIntegration creates a new blackbox integration. func (c *Config) NewIntegration(log log.Logger, globals integrations_v2.Globals) (integrations_v2.Integration, error) { - modules, err := blackbox_exporter.LoadBlackboxConfig(log, c.BlackboxConfigFile, c.BlackboxTargets, &c.BlackboxConfig) + var blackbox_config blackbox_config.Config + err := yaml.Unmarshal(c.BlackboxConfig, &blackbox_config) + if err != nil { + return nil, err + } + + modules, err := blackbox_exporter.LoadBlackboxConfig(log, c.BlackboxConfigFile, c.BlackboxTargets, &blackbox_config) if err != nil { return nil, err } From 3a2d6d566b7e870023ad7d8539b9bfc74c07eef0 Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Mon, 6 Nov 2023 19:31:05 +0200 Subject: [PATCH 07/14] Update code references for v0.37.4 (#5718) Signed-off-by: Paschalis Tsilias --- CHANGELOG.md | 15 ++++++++++----- docs/sources/_index.md | 2 +- pkg/operator/defaults.go | 2 +- production/kubernetes/agent-bare.yaml | 2 +- production/kubernetes/agent-loki.yaml | 2 +- production/kubernetes/agent-traces.yaml | 2 +- production/kubernetes/build/lib/version.libsonnet | 2 +- .../build/templates/operator/main.jsonnet | 4 ++-- production/kubernetes/install-bare.sh | 2 +- production/operator/templates/agent-operator.yaml | 4 ++-- production/tanka/grafana-agent/v1/main.libsonnet | 4 ++-- .../grafana-agent/v2/internal/base.libsonnet | 4 ++-- .../grafana-agent/v2/internal/syncer.libsonnet | 2 +- tools/gen-versioned-files/agent-version.txt | 2 +- 14 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fbef786b1b1..fabedfa99040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,9 +77,6 @@ Main (unreleased) - The `loki.source.docker` component now allows connecting to Docker daemons over HTTP(S) and setting up TLS credentials. (@tpaschalis) -- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, - which configures whether to add type and unit suffixes to metrics names. (@mar4uk) - - Added an `exclude_event_message` option to `loki.source.windowsevent` in flow mode, which excludes the human-friendly event message from Windows event logs. (@ptodev) @@ -132,10 +129,18 @@ Main (unreleased) - Fixed a bug where UDP syslog messages were never processed (@joshuapare) -- Fix a bug where reloading the configuration of a `loki.write` component lead - to a panic. (@tpaschalis) +v0.37.4 (2023-11-06) +----------------- + +### Enhancements +- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, + which configures whether to add type and unit suffixes to metrics names. (@mar4uk) +### Bugfixes + +- Fix a bug where reloading the configuration of a `loki.write` component lead + to a panic. (@tpaschalis) v0.37.3 (2023-10-26) ----------------- diff --git a/docs/sources/_index.md b/docs/sources/_index.md index cc9dc89efea9..c46dfe04feea 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -8,7 +8,7 @@ title: Grafana Agent description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector weight: 350 cascade: - AGENT_RELEASE: v0.37.3 + AGENT_RELEASE: v0.37.4 OTEL_VERSION: v0.87.0 --- diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index e9907c4a4ae5..68842b412f42 100644 --- a/pkg/operator/defaults.go +++ b/pkg/operator/defaults.go @@ -2,7 +2,7 @@ package operator // Supported versions of the Grafana Agent. var ( - DefaultAgentVersion = "v0.37.3" + DefaultAgentVersion = "v0.37.4" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 668d2b286a73..0ca2da3bc58f 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -83,7 +83,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.37.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index dabcbb9f03b4..4eeb798a00d8 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -65,7 +65,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.37.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index ee15687e834c..7c2835846b0a 100644 --- a/production/kubernetes/agent-traces.yaml +++ b/production/kubernetes/agent-traces.yaml @@ -114,7 +114,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.37.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index b9571fb91726..be3865408074 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.37.3' +'grafana/agent:v0.37.4' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index e92dfa9ae4d7..dda322bac503 100644 --- a/production/kubernetes/build/templates/operator/main.jsonnet +++ b/production/kubernetes/build/templates/operator/main.jsonnet @@ -23,8 +23,8 @@ local ksm = import 'kube-state-metrics/kube-state-metrics.libsonnet'; local this = self, _images:: { - agent: 'grafana/agent:v0.37.3', - agent_operator: 'grafana/agent-operator:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agent_operator: 'grafana/agent-operator:v0.37.4', ksm: 'registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0', }, diff --git a/production/kubernetes/install-bare.sh b/production/kubernetes/install-bare.sh index ea25968e6bd3..93cc7120af23 100644 --- a/production/kubernetes/install-bare.sh +++ b/production/kubernetes/install-bare.sh @@ -25,7 +25,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.37.3 +MANIFEST_BRANCH=v0.37.4 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml} NAMESPACE=${NAMESPACE:-default} diff --git a/production/operator/templates/agent-operator.yaml b/production/operator/templates/agent-operator.yaml index 863585a29b89..797ce35fa972 100644 --- a/production/operator/templates/agent-operator.yaml +++ b/production/operator/templates/agent-operator.yaml @@ -372,7 +372,7 @@ spec: containers: - args: - --kubelet-service=default/kubelet - image: grafana/agent-operator:v0.37.3 + image: grafana/agent-operator:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent-operator serviceAccount: grafana-agent-operator @@ -436,7 +436,7 @@ metadata: name: grafana-agent namespace: ${NAMESPACE} spec: - image: grafana/agent:v0.37.3 + image: grafana/agent:v0.37.4 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index c21bb98e03c5..8ff06ab1bf5b 100644 --- a/production/tanka/grafana-agent/v1/main.libsonnet +++ b/production/tanka/grafana-agent/v1/main.libsonnet @@ -15,8 +15,8 @@ local service = k.core.v1.service; (import './lib/traces.libsonnet') + { _images:: { - agent: 'grafana/agent:v0.37.3', - agentctl: 'grafana/agentctl:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agentctl: 'grafana/agentctl:v0.37.4', }, // new creates a new DaemonSet deployment of the grafana-agent. By default, diff --git a/production/tanka/grafana-agent/v2/internal/base.libsonnet b/production/tanka/grafana-agent/v2/internal/base.libsonnet index 16840b40aace..53921bf64aaf 100644 --- a/production/tanka/grafana-agent/v2/internal/base.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/base.libsonnet @@ -11,8 +11,8 @@ function(name='grafana-agent', namespace='') { local this = self, _images:: { - agent: 'grafana/agent:v0.37.3', - agentctl: 'grafana/agentctl:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agentctl: 'grafana/agentctl:v0.37.4', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 35bb6f40a00e..689b14fd87b3 100644 --- a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet @@ -14,7 +14,7 @@ function( ) { local _config = { api: error 'api must be set', - image: 'grafana/agentctl:v0.37.3', + image: 'grafana/agentctl:v0.37.4', schedule: '*/5 * * * *', configs: [], } + config, diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt index 7c49ad6429e3..f3d8baac63b3 100644 --- a/tools/gen-versioned-files/agent-version.txt +++ b/tools/gen-versioned-files/agent-version.txt @@ -1 +1 @@ -v0.37.3 +v0.37.4 From 1dbb46c62ad2fd26da05b89dfa18d8b9ab5b91fe Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Tue, 7 Nov 2023 11:43:07 +0200 Subject: [PATCH 08/14] helm: update agent version to v0.37.4 (#5727) Signed-off-by: Paschalis Tsilias --- operations/helm/charts/grafana-agent/CHANGELOG.md | 10 ++++++++-- operations/helm/charts/grafana-agent/Chart.yaml | 4 ++-- operations/helm/charts/grafana-agent/README.md | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../templates/controllers/deployment.yaml | 2 +- .../templates/controllers/deployment.yaml | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- .../grafana-agent/templates/controllers/daemonset.yaml | 2 +- 26 files changed, 34 insertions(+), 28 deletions(-) diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md index b5197eadc370..a07f6c76f0f0 100644 --- a/operations/helm/charts/grafana-agent/CHANGELOG.md +++ b/operations/helm/charts/grafana-agent/CHANGELOG.md @@ -10,10 +10,16 @@ internal API changes are not present. Unreleased ---------- +0.27.1 (2023-11-07) +---------- + ### Enhancements -- Expose the `ui-path-prefix` flag on the Helm chart (@mlcdf) -- Expose controller `extraAnnotations` on the Helm chart (@mcanevet) +- Expose the `ui-path-prefix` flag on the Helm chart. (@mlcdf) + +- Expose controller `extraAnnotations` on the Helm chart. (@mcanevet) + +- Update Grafana Agent version to v0.37.4. (@tpaschalis) 0.27.1 (2023-10-26) ---------- diff --git a/operations/helm/charts/grafana-agent/Chart.yaml b/operations/helm/charts/grafana-agent/Chart.yaml index 18fc351f6e6b..d73883aeae7d 100644 --- a/operations/helm/charts/grafana-agent/Chart.yaml +++ b/operations/helm/charts/grafana-agent/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: grafana-agent description: 'Grafana Agent' type: application -version: 0.27.1 -appVersion: 'v0.37.3' +version: 0.27.2 +appVersion: 'v0.37.4' dependencies: - name: crds diff --git a/operations/helm/charts/grafana-agent/README.md b/operations/helm/charts/grafana-agent/README.md index ccb539ff0e36..f85c05a0b40b 100644 --- a/operations/helm/charts/grafana-agent/README.md +++ b/operations/helm/charts/grafana-agent/README.md @@ -1,6 +1,6 @@ # Grafana Agent Helm chart -![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.27.1](https://img.shields.io/badge/Version-0.27.1-informational?style=flat-square) ![AppVersion: v0.37.3](https://img.shields.io/badge/AppVersion-v0.37.3-informational?style=flat-square) +![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.27.2](https://img.shields.io/badge/Version-0.27.2-informational?style=flat-square) ![AppVersion: v0.37.4](https://img.shields.io/badge/AppVersion-v0.37.4-informational?style=flat-square) Helm chart for deploying [Grafana Agent][] to Kubernetes. diff --git a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml index 110ea280064e..1aca2fb93859 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml index 46b03f1562f5..f19ed25ad63b 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml index d3b59975bedd..f7d69461630e 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml index 90261f803345..0038338c8e15 100644 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml index a015962dbbbf..33115f481940 100644 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml index 39edcec78ecd..17238227bbe4 100644 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml index b8b2bd70f459..56f4e29353a8 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml @@ -27,7 +27,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml index df52fc53f9e9..57ffe8a5b38d 100644 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml index 90261f803345..0038338c8e15 100644 --- a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml index 90261f803345..0038338c8e15 100644 --- a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml index 90261f803345..0038338c8e15 100644 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml index 60a3b77ef02a..af9f8733bfa3 100644 --- a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml index 919fa19bca02..b3acab2c314f 100644 --- a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml index 9d51abfff613..b375f5c2d740 100644 --- a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml index a5e83acc381c..b949dab97850 100644 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml index 2b9e24e7ad4b..1a4310f118dc 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml index 36efcdd0db4a..23c984e2bd59 100644 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml @@ -30,7 +30,7 @@ spec: - name: global-cred containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml index 6b93b0748552..fb0c5bccfba3 100644 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: quay.io/grafana/agent:v0.37.3 + image: quay.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml index 48dcdd113d53..00b72a087f56 100644 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml @@ -43,7 +43,7 @@ spec: name: geoip containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml index 05300bfee656..c9bbe3a6d165 100644 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml @@ -27,7 +27,7 @@ spec: - name: local-cred containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml index 6b93b0748552..fb0c5bccfba3 100644 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: quay.io/grafana/agent:v0.37.3 + image: quay.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml index 97f65910a123..d38ffc899ae0 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - run diff --git a/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml index ccdaf9fa8ab6..afd7d674720b 100644 --- a/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: grafana-agent containers: - name: grafana-agent - image: docker.io/grafana/agent:v0.37.3 + image: docker.io/grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent args: - -config.file=/etc/agent/config.yaml From b9787dc6c95e8a82791e1166e6464c8a88d7f7a4 Mon Sep 17 00:00:00 2001 From: Pablo <2617411+thepalbi@users.noreply.github.com> Date: Tue, 7 Nov 2023 10:21:58 -0300 Subject: [PATCH 09/14] Added last read/wrote timestamp metrics to loki.write (#5699) --- component/common/loki/client/client.go | 29 +++++---------- component/common/loki/client/manager.go | 3 +- component/common/loki/client/metrics.go | 37 +++++++++++++++++++ component/common/loki/client/queue_client.go | 25 +++++++++---- .../common/loki/client/queue_client_test.go | 6 +-- component/common/loki/wal/watcher_metrics.go | 27 +++++--------- component/common/loki/wal/writer.go | 11 ++++++ pkg/util/metrics.go | 16 ++++++++ 8 files changed, 106 insertions(+), 48 deletions(-) create mode 100644 component/common/loki/client/metrics.go create mode 100644 pkg/util/metrics.go diff --git a/component/common/loki/client/client.go b/component/common/loki/client/client.go index 36839dbcffa3..964b6c98513b 100644 --- a/component/common/loki/client/client.go +++ b/component/common/loki/client/client.go @@ -21,6 +21,7 @@ import ( "github.com/grafana/agent/component/common/loki" "github.com/grafana/agent/pkg/build" + "github.com/grafana/agent/pkg/util" lokiutil "github.com/grafana/loki/pkg/util" ) @@ -116,30 +117,20 @@ func NewMetrics(reg prometheus.Registerer) *Metrics { } if reg != nil { - m.encodedBytes = mustRegisterOrGet(reg, m.encodedBytes).(*prometheus.CounterVec) - m.sentBytes = mustRegisterOrGet(reg, m.sentBytes).(*prometheus.CounterVec) - m.droppedBytes = mustRegisterOrGet(reg, m.droppedBytes).(*prometheus.CounterVec) - m.sentEntries = mustRegisterOrGet(reg, m.sentEntries).(*prometheus.CounterVec) - m.droppedEntries = mustRegisterOrGet(reg, m.droppedEntries).(*prometheus.CounterVec) - m.mutatedEntries = mustRegisterOrGet(reg, m.mutatedEntries).(*prometheus.CounterVec) - m.mutatedBytes = mustRegisterOrGet(reg, m.mutatedBytes).(*prometheus.CounterVec) - m.requestDuration = mustRegisterOrGet(reg, m.requestDuration).(*prometheus.HistogramVec) - m.batchRetries = mustRegisterOrGet(reg, m.batchRetries).(*prometheus.CounterVec) + m.encodedBytes = util.MustRegisterOrGet(reg, m.encodedBytes).(*prometheus.CounterVec) + m.sentBytes = util.MustRegisterOrGet(reg, m.sentBytes).(*prometheus.CounterVec) + m.droppedBytes = util.MustRegisterOrGet(reg, m.droppedBytes).(*prometheus.CounterVec) + m.sentEntries = util.MustRegisterOrGet(reg, m.sentEntries).(*prometheus.CounterVec) + m.droppedEntries = util.MustRegisterOrGet(reg, m.droppedEntries).(*prometheus.CounterVec) + m.mutatedEntries = util.MustRegisterOrGet(reg, m.mutatedEntries).(*prometheus.CounterVec) + m.mutatedBytes = util.MustRegisterOrGet(reg, m.mutatedBytes).(*prometheus.CounterVec) + m.requestDuration = util.MustRegisterOrGet(reg, m.requestDuration).(*prometheus.HistogramVec) + m.batchRetries = util.MustRegisterOrGet(reg, m.batchRetries).(*prometheus.CounterVec) } return &m } -func mustRegisterOrGet(reg prometheus.Registerer, c prometheus.Collector) prometheus.Collector { - if err := reg.Register(c); err != nil { - if are, ok := err.(prometheus.AlreadyRegisteredError); ok { - return are.ExistingCollector - } - panic(err) - } - return c -} - // Client pushes entries to Loki and can be stopped type Client interface { loki.EntryHandler diff --git a/component/common/loki/client/manager.go b/component/common/loki/client/manager.go index 290ddcc0f951..6683e9e5772b 100644 --- a/component/common/loki/client/manager.go +++ b/component/common/loki/client/manager.go @@ -70,6 +70,7 @@ func NewManager(metrics *Metrics, logger log.Logger, limits limit.Config, reg pr walWatcherMetrics := wal.NewWatcherMetrics(reg) walMarkerMetrics := internal.NewMarkerMetrics(reg) + queueClientMetrics := NewQueueClientMetrics(reg) if len(clientCfgs) == 0 { return nil, fmt.Errorf("at least one client config must be provided") @@ -98,7 +99,7 @@ func NewManager(metrics *Metrics, logger log.Logger, limits limit.Config, reg pr } markerHandler := internal.NewMarkerHandler(markerFileHandler, walCfg.MaxSegmentAge, logger, walMarkerMetrics.WithCurriedId(clientName)) - queue, err := NewQueue(metrics, cfg, limits.MaxStreams, limits.MaxLineSize.Val(), limits.MaxLineSizeTruncate, logger, markerHandler) + queue, err := NewQueue(metrics, queueClientMetrics.CurryWithId(clientName), cfg, limits.MaxStreams, limits.MaxLineSize.Val(), limits.MaxLineSizeTruncate, logger, markerHandler) if err != nil { return nil, fmt.Errorf("error starting queue client: %w", err) } diff --git a/component/common/loki/client/metrics.go b/component/common/loki/client/metrics.go new file mode 100644 index 000000000000..6d32bf1ce459 --- /dev/null +++ b/component/common/loki/client/metrics.go @@ -0,0 +1,37 @@ +package client + +import ( + "github.com/grafana/agent/pkg/util" + "github.com/prometheus/client_golang/prometheus" +) + +type QueueClientMetrics struct { + lastReadTimestamp *prometheus.GaugeVec +} + +func NewQueueClientMetrics(reg prometheus.Registerer) *QueueClientMetrics { + m := &QueueClientMetrics{ + lastReadTimestamp: prometheus.NewGaugeVec( + prometheus.GaugeOpts{ + Namespace: "loki_write", + Name: "last_read_timestamp", + Help: "Latest timestamp read from the WAL", + }, + []string{"id"}, + ), + } + + if reg != nil { + m.lastReadTimestamp = util.MustRegisterOrGet(reg, m.lastReadTimestamp).(*prometheus.GaugeVec) + } + + return m +} + +func (m *QueueClientMetrics) CurryWithId(id string) *QueueClientMetrics { + return &QueueClientMetrics{ + lastReadTimestamp: m.lastReadTimestamp.MustCurryWith(map[string]string{ + "id": id, + }), + } +} diff --git a/component/common/loki/client/queue_client.go b/component/common/loki/client/queue_client.go index 458839db60dd..dc8ed469fba3 100644 --- a/component/common/loki/client/queue_client.go +++ b/component/common/loki/client/queue_client.go @@ -150,10 +150,11 @@ func (q *queue) closeNow() { // which allows it to be injected in the wal.Watcher as a destination where to write read series and entries. As the watcher // reads from the WAL, batches are created and dispatched onto a send queue when ready to be sent. type queueClient struct { - metrics *Metrics - logger log.Logger - cfg Config - client *http.Client + metrics *Metrics + qcMetrics *QueueClientMetrics + logger log.Logger + cfg Config + client *http.Client batches map[string]*batch batchesMtx sync.Mutex @@ -180,14 +181,14 @@ type queueClient struct { } // NewQueue creates a new queueClient. -func NewQueue(metrics *Metrics, cfg Config, maxStreams, maxLineSize int, maxLineSizeTruncate bool, logger log.Logger, markerHandler MarkerHandler) (StoppableWriteTo, error) { +func NewQueue(metrics *Metrics, queueClientMetrics *QueueClientMetrics, cfg Config, maxStreams, maxLineSize int, maxLineSizeTruncate bool, logger log.Logger, markerHandler MarkerHandler) (StoppableWriteTo, error) { if cfg.StreamLagLabels.String() != "" { return nil, fmt.Errorf("client config stream_lag_labels is deprecated and the associated metric has been removed, stream_lag_labels: %+v", cfg.StreamLagLabels.String()) } - return newQueueClient(metrics, cfg, maxStreams, maxLineSize, maxLineSizeTruncate, logger, markerHandler) + return newQueueClient(metrics, queueClientMetrics, cfg, maxStreams, maxLineSize, maxLineSizeTruncate, logger, markerHandler) } -func newQueueClient(metrics *Metrics, cfg Config, maxStreams, maxLineSize int, maxLineSizeTruncate bool, logger log.Logger, markerHandler MarkerHandler) (*queueClient, error) { +func newQueueClient(metrics *Metrics, qcMetrics *QueueClientMetrics, cfg Config, maxStreams, maxLineSize int, maxLineSizeTruncate bool, logger log.Logger, markerHandler MarkerHandler) (*queueClient, error) { if cfg.URL.URL == nil { return nil, errors.New("client needs target URL") } @@ -198,6 +199,7 @@ func newQueueClient(metrics *Metrics, cfg Config, maxStreams, maxLineSize int, m logger: log.With(logger, "component", "client", "host", cfg.URL.Host), cfg: cfg, metrics: metrics, + qcMetrics: qcMetrics, drainTimeout: cfg.Queue.DrainTimeout, quit: make(chan struct{}), @@ -283,9 +285,13 @@ func (c *queueClient) AppendEntries(entries wal.RefEntries, segment int) error { c.seriesLock.RLock() l, ok := c.series[entries.Ref] c.seriesLock.RUnlock() + var maxSeenTimestamp int64 = -1 if ok { for _, e := range entries.Entries { c.appendSingleEntry(segment, l, e) + if e.Timestamp.Unix() > maxSeenTimestamp { + maxSeenTimestamp = e.Timestamp.Unix() + } } // count all enqueued appended entries as received from WAL c.markerHandler.UpdateReceivedData(segment, len(entries.Entries)) @@ -293,6 +299,11 @@ func (c *queueClient) AppendEntries(entries wal.RefEntries, segment int) error { // TODO(thepalbi): Add metric here level.Debug(c.logger).Log("msg", "series for entry not found") } + + // It's safe to assume that upon an AppendEntries call, there will always be at least + // one entry. + c.qcMetrics.lastReadTimestamp.WithLabelValues().Set(float64(maxSeenTimestamp)) + return nil } diff --git a/component/common/loki/client/queue_client_test.go b/component/common/loki/client/queue_client_test.go index a23804d44634..cf59f49e1b7a 100644 --- a/component/common/loki/client/queue_client_test.go +++ b/component/common/loki/client/queue_client_test.go @@ -135,8 +135,7 @@ func TestQueueClient(t *testing.T) { logger := log.NewLogfmtLogger(os.Stdout) - m := NewMetrics(reg) - qc, err := NewQueue(m, cfg, 0, 0, false, logger, nilMarkerHandler{}) + qc, err := NewQueue(NewMetrics(reg), NewQueueClientMetrics(reg).CurryWithId("test"), cfg, 0, 0, false, logger, nilMarkerHandler{}) require.NoError(t, err) //labels := model.LabelSet{"app": "test"} @@ -281,8 +280,7 @@ func runQueueClientBenchCase(b *testing.B, bc testCase, mhFactory func(t *testin logger := log.NewLogfmtLogger(os.Stdout) - m := NewMetrics(reg) - qc, err := NewQueue(m, cfg, 0, 0, false, logger, mhFactory(b)) + qc, err := NewQueue(NewMetrics(reg), NewQueueClientMetrics(reg).CurryWithId("test"), cfg, 0, 0, false, logger, mhFactory(b)) require.NoError(b, err) //labels := model.LabelSet{"app": "test"} diff --git a/component/common/loki/wal/watcher_metrics.go b/component/common/loki/wal/watcher_metrics.go index 4064f8b22aac..ce8052fd442d 100644 --- a/component/common/loki/wal/watcher_metrics.go +++ b/component/common/loki/wal/watcher_metrics.go @@ -1,6 +1,9 @@ package wal -import "github.com/prometheus/client_golang/prometheus" +import ( + "github.com/grafana/agent/pkg/util" + "github.com/prometheus/client_golang/prometheus" +) type WatcherMetrics struct { recordsRead *prometheus.CounterVec @@ -80,23 +83,13 @@ func NewWatcherMetrics(reg prometheus.Registerer) *WatcherMetrics { } if reg != nil { - m.recordsRead = mustRegisterOrGet(reg, m.recordsRead).(*prometheus.CounterVec) - m.recordDecodeFails = mustRegisterOrGet(reg, m.recordDecodeFails).(*prometheus.CounterVec) - m.droppedWriteNotifications = mustRegisterOrGet(reg, m.droppedWriteNotifications).(*prometheus.CounterVec) - m.segmentRead = mustRegisterOrGet(reg, m.segmentRead).(*prometheus.CounterVec) - m.currentSegment = mustRegisterOrGet(reg, m.currentSegment).(*prometheus.GaugeVec) - m.watchersRunning = mustRegisterOrGet(reg, m.watchersRunning).(*prometheus.GaugeVec) + m.recordsRead = util.MustRegisterOrGet(reg, m.recordsRead).(*prometheus.CounterVec) + m.recordDecodeFails = util.MustRegisterOrGet(reg, m.recordDecodeFails).(*prometheus.CounterVec) + m.droppedWriteNotifications = util.MustRegisterOrGet(reg, m.droppedWriteNotifications).(*prometheus.CounterVec) + m.segmentRead = util.MustRegisterOrGet(reg, m.segmentRead).(*prometheus.CounterVec) + m.currentSegment = util.MustRegisterOrGet(reg, m.currentSegment).(*prometheus.GaugeVec) + m.watchersRunning = util.MustRegisterOrGet(reg, m.watchersRunning).(*prometheus.GaugeVec) } return m } - -func mustRegisterOrGet(reg prometheus.Registerer, c prometheus.Collector) prometheus.Collector { - if err := reg.Register(c); err != nil { - if are, ok := err.(prometheus.AlreadyRegisteredError); ok { - return are.ExistingCollector - } - panic(err) - } - return c -} diff --git a/component/common/loki/wal/writer.go b/component/common/loki/wal/writer.go index 929199529c5d..e71773d944d6 100644 --- a/component/common/loki/wal/writer.go +++ b/component/common/loki/wal/writer.go @@ -59,6 +59,7 @@ type Writer struct { reclaimedOldSegmentsSpaceCounter *prometheus.CounterVec lastReclaimedSegment *prometheus.GaugeVec + lastWrittenTimestamp *prometheus.GaugeVec closeCleaner chan struct{} } @@ -96,10 +97,17 @@ func NewWriter(walCfg Config, logger log.Logger, reg prometheus.Registerer) (*Wr Name: "last_reclaimed_segment", Help: "Last reclaimed segment number", }, []string{}) + wrt.lastWrittenTimestamp = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Namespace: "loki_write", + Subsystem: "wal_writer", + Name: "last_written_timestamp", + Help: "Latest timestamp that was written to the WAL", + }, []string{}) if reg != nil { _ = reg.Register(wrt.reclaimedOldSegmentsSpaceCounter) _ = reg.Register(wrt.lastReclaimedSegment) + _ = reg.Register(wrt.lastWrittenTimestamp) } wrt.start(walCfg.MaxSegmentAge) @@ -118,6 +126,9 @@ func (wrt *Writer) start(maxSegmentAge time.Duration) { continue } + // emit metric with latest written timestamp, to be able to track delay from writer to watcher + wrt.lastWrittenTimestamp.WithLabelValues().Set(float64(e.Timestamp.Unix())) + wrt.writeSubscribersLock.RLock() for _, s := range wrt.writeSubscribers { s.NotifyWrite() diff --git a/pkg/util/metrics.go b/pkg/util/metrics.go new file mode 100644 index 000000000000..850b535fe8fb --- /dev/null +++ b/pkg/util/metrics.go @@ -0,0 +1,16 @@ +package util + +import "github.com/prometheus/client_golang/prometheus" + +// MustRegisterOrGet will attempt to register the supplied collector into the register. If it's already +// registered, it will return that one. +// In case that the register procedure fails with something other than already registered, this will panic. +func MustRegisterOrGet(reg prometheus.Registerer, c prometheus.Collector) prometheus.Collector { + if err := reg.Register(c); err != nil { + if are, ok := err.(prometheus.AlreadyRegisteredError); ok { + return are.ExistingCollector + } + panic(err) + } + return c +} From 49f1bd1bc6186b09caf5f8382efea06a7acfe40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tudur=C3=AD?= Date: Tue, 7 Nov 2023 18:28:43 +0100 Subject: [PATCH 10/14] Clarify blackbox exporter documentation (#5719) --- .../prometheus/exporter/blackbox/blackbox.go | 6 +++++- .../exporter/blackbox/blackbox_test.go | 16 +++++++++++++--- .../components/prometheus.exporter.blackbox.md | 8 +++++++- .../integrations/blackbox-config.md | 1 + .../blackbox_exporter/blackbox_exporter.go | 4 ++++ 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/component/prometheus/exporter/blackbox/blackbox.go b/component/prometheus/exporter/blackbox/blackbox.go index 223ac8cb8837..206ac1f1d12b 100644 --- a/component/prometheus/exporter/blackbox/blackbox.go +++ b/component/prometheus/exporter/blackbox/blackbox.go @@ -106,10 +106,14 @@ func (a *Arguments) Validate() error { return errors.New("config and config_file are mutually exclusive") } + if a.ConfigFile == "" && a.Config.Value == "" { + return errors.New("config or config_file must be set") + } + var blackboxConfig blackbox_config.Config err := yaml.UnmarshalStrict([]byte(a.Config.Value), &blackboxConfig) if err != nil { - return fmt.Errorf("invalid backbox_exporter config: %s", err) + return fmt.Errorf("invalid blackbox_exporter config: %s", err) } return nil diff --git a/component/prometheus/exporter/blackbox/blackbox_test.go b/component/prometheus/exporter/blackbox/blackbox_test.go index 1b3e169a3661..6a4e9dab0d15 100644 --- a/component/prometheus/exporter/blackbox/blackbox_test.go +++ b/component/prometheus/exporter/blackbox/blackbox_test.go @@ -106,7 +106,7 @@ func TestUnmarshalRiverWithInlineConfigYaml(t *testing.T) { require.Contains(t, "http_2xx", args.Targets[1].Module) } -func TestUnmarshalRiverWithInvalidInlineConfig(t *testing.T) { +func TestUnmarshalRiverWithInvalidConfig(t *testing.T) { var tests = []struct { testname string cfg string @@ -122,7 +122,7 @@ func TestUnmarshalRiverWithInvalidInlineConfig(t *testing.T) { module = "http_2xx" } `, - `invalid backbox_exporter config: yaml: line 1: did not find expected ',' or '}'`, + `invalid blackbox_exporter config: yaml: line 1: did not find expected ',' or '}'`, }, { "Invalid property", @@ -134,7 +134,7 @@ func TestUnmarshalRiverWithInvalidInlineConfig(t *testing.T) { module = "http_2xx" } `, - "invalid backbox_exporter config: yaml: unmarshal errors:\n line 1: field module not found in type config.plain", + "invalid blackbox_exporter config: yaml: unmarshal errors:\n line 1: field module not found in type config.plain", }, { "Define config and config_file", @@ -149,6 +149,16 @@ func TestUnmarshalRiverWithInvalidInlineConfig(t *testing.T) { `, `config and config_file are mutually exclusive`, }, + { + "Define neither config nor config_file", + ` + target "target_a" { + address = "http://example.com" + module = "http_2xx" + } + `, + `config or config_file must be set`, + }, } for _, tt := range tests { t.Run(tt.testname, func(t *testing.T) { diff --git a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md index 4cd6e5effcc3..40cd6db39e0a 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md @@ -17,6 +17,9 @@ The `prometheus.exporter.blackbox` component embeds ```river prometheus.exporter.blackbox "LABEL" { + target "example" { + address = "EXAMPLE_ADDRESS" + } } ``` @@ -31,6 +34,7 @@ Omitted fields take their default values. | `config` | `string` or `secret` | blackbox_exporter configuration as inline string. | | no | | `probe_timeout_offset` | `duration` | Offset in seconds to subtract from timeout when probing targets. | `"0.5s"` | no | +Either `config_file` or `config` must be specified. The `config_file` argument points to a YAML file defining which blackbox_exporter modules to use. The `config` argument must be a YAML document as string defining which blackbox_exporter modules to use. `config` is typically loaded by using the exports of another component. For example, @@ -90,7 +94,9 @@ debug metrics. ### Collect metrics using a blackbox exporter config file This example uses a [`prometheus.scrape` component][scrape] to collect metrics -from `prometheus.exporter.blackbox`. It adds an extra label, `env="dev"`, to the metrics emitted by the `grafana` target. The `example` target does not have any added labels. +from `prometheus.exporter.blackbox`. It adds an extra label, `env="dev"`, to the metrics emitted by the `grafana` target. The `example` target does not have any added labels. + +The `config_file` argument is used to define which `blackbox_exporter` modules to use. You can use the [blackbox example config file](https://github.com/prometheus/blackbox_exporter/blob/master/example.yml). ```river prometheus.exporter.blackbox "example" { diff --git a/docs/sources/static/configuration/integrations/blackbox-config.md b/docs/sources/static/configuration/integrations/blackbox-config.md index b7911fdecd0b..755416ab565a 100644 --- a/docs/sources/static/configuration/integrations/blackbox-config.md +++ b/docs/sources/static/configuration/integrations/blackbox-config.md @@ -91,6 +91,7 @@ Full reference of options: [config_file: | default = ""] # Embedded blackbox configuration. You can specify your modules here instead of an external config file. + # config_file or blackbox_config must be specified. # See https://github.com/prometheus/blackbox_exporter/blob/master/CONFIGURATION.md for more details how to specify your blackbox modules. blackbox_config: [- ... ] diff --git a/pkg/integrations/blackbox_exporter/blackbox_exporter.go b/pkg/integrations/blackbox_exporter/blackbox_exporter.go index 510df3a8d0ec..36634a5231cc 100644 --- a/pkg/integrations/blackbox_exporter/blackbox_exporter.go +++ b/pkg/integrations/blackbox_exporter/blackbox_exporter.go @@ -104,6 +104,10 @@ func LoadBlackboxConfig(log log.Logger, configFile string, targets []BlackboxTar // New creates a new blackbox_exporter integration func New(log log.Logger, c *Config) (integrations.Integration, error) { + if c.BlackboxConfigFile == "" && c.BlackboxConfig == nil { + return nil, fmt.Errorf("failed to load blackbox config; no config file or config block provided") + } + var blackbox_config blackbox_config.Config err := yaml.Unmarshal(c.BlackboxConfig, &blackbox_config) if err != nil { From fd7e8dec6934a917f82a4218b58bdecc1c780fd0 Mon Sep 17 00:00:00 2001 From: Pablo <2617411+thepalbi@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:33:47 -0300 Subject: [PATCH 11/14] Add locking to loki.write sink + nits (#5694) * Address PR comments * added bench * add locking to loki.write sink * adding changelog * imports order * fix changelog * remove unused client write to * added missing entry * typos * add missing changelog entry * remove duplicate entry --- CHANGELOG.md | 4 + .../common/loki/client/client_writeto.go | 78 ------ .../common/loki/client/client_writeto_test.go | 247 ------------------ .../loki/client/internal/marker_encoding.go | 2 +- component/common/loki/wal/watcher_test.go | 7 +- component/loki/write/write.go | 3 + component/loki/write/write_test.go | 104 +++++++- pkg/flow/componenttest/context.go | 2 +- pkg/util/test_logger.go | 2 +- 9 files changed, 112 insertions(+), 337 deletions(-) delete mode 100644 component/common/loki/client/client_writeto.go delete mode 100644 component/common/loki/client/client_writeto_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index fabedfa99040..4533ecedec3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,8 @@ Main (unreleased) - Grafana Agent Operator: `config-reloader` container no longer runs as root. (@rootmout) +- Added support for replaying not sent data for `loki.write` when WAL is enabled. (@thepalbi) + ### Bugfixes - Fixed an issue where `loki.process` validation for stage `metric.counter` was @@ -129,6 +131,8 @@ Main (unreleased) - Fixed a bug where UDP syslog messages were never processed (@joshuapare) +- Updating configuration for `loki.write` no longer drops data. (@thepalbi) + v0.37.4 (2023-11-06) ----------------- diff --git a/component/common/loki/client/client_writeto.go b/component/common/loki/client/client_writeto.go deleted file mode 100644 index 355b060286ef..000000000000 --- a/component/common/loki/client/client_writeto.go +++ /dev/null @@ -1,78 +0,0 @@ -package client - -import ( - "fmt" - "sync" - - "github.com/go-kit/log" - "github.com/grafana/agent/pkg/flow/logging/level" - "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/tsdb/chunks" - "github.com/prometheus/prometheus/tsdb/record" - - "github.com/grafana/agent/component/common/loki" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/util" -) - -// clientWriteTo implements a wal.WriteTo that re-builds entries with the stored series, and the received entries. After, -// sends each to the provided Client channel. -type clientWriteTo struct { - series map[chunks.HeadSeriesRef]model.LabelSet - seriesSegment map[chunks.HeadSeriesRef]int - seriesLock sync.RWMutex - - logger log.Logger - toClient chan<- loki.Entry -} - -// newClientWriteTo creates a new clientWriteTo -func newClientWriteTo(toClient chan<- loki.Entry, logger log.Logger) *clientWriteTo { - return &clientWriteTo{ - series: make(map[chunks.HeadSeriesRef]model.LabelSet), - seriesSegment: make(map[chunks.HeadSeriesRef]int), - toClient: toClient, - logger: logger, - } -} - -func (c *clientWriteTo) StoreSeries(series []record.RefSeries, segment int) { - c.seriesLock.Lock() - defer c.seriesLock.Unlock() - for _, seriesRec := range series { - c.seriesSegment[seriesRec.Ref] = segment - labels := util.MapToModelLabelSet(seriesRec.Labels.Map()) - c.series[seriesRec.Ref] = labels - } -} - -// SeriesReset will delete all cache entries that were last seen in segments numbered equal or lower than segmentNum -func (c *clientWriteTo) SeriesReset(segmentNum int) { - c.seriesLock.Lock() - defer c.seriesLock.Unlock() - for k, v := range c.seriesSegment { - if v <= segmentNum { - level.Debug(c.logger).Log("msg", fmt.Sprintf("reclaiming series under segment %d", segmentNum)) - delete(c.seriesSegment, k) - delete(c.series, k) - } - } -} - -func (c *clientWriteTo) AppendEntries(entries wal.RefEntries, _ int) error { - var entry loki.Entry - c.seriesLock.RLock() - l, ok := c.series[entries.Ref] - c.seriesLock.RUnlock() - if ok { - entry.Labels = l - for _, e := range entries.Entries { - entry.Entry = e - c.toClient <- entry - } - } else { - // TODO(thepalbi): Add metric here - level.Debug(c.logger).Log("msg", "series for entry not found") - } - return nil -} diff --git a/component/common/loki/client/client_writeto_test.go b/component/common/loki/client/client_writeto_test.go deleted file mode 100644 index 1ad7929b58ad..000000000000 --- a/component/common/loki/client/client_writeto_test.go +++ /dev/null @@ -1,247 +0,0 @@ -package client - -import ( - "fmt" - "math/rand" - "os" - "sync" - "testing" - "time" - - "go.uber.org/atomic" - - "github.com/go-kit/log" - "github.com/grafana/agent/pkg/flow/logging/level" - "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/model/labels" - "github.com/prometheus/prometheus/tsdb/chunks" - "github.com/prometheus/prometheus/tsdb/record" - "github.com/stretchr/testify/require" - - "github.com/grafana/agent/component/common/loki" - "github.com/grafana/agent/component/common/loki/utils" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" -) - -func TestClientWriter_LogEntriesAreReconstructedAndForwardedCorrectly(t *testing.T) { - logger := level.NewFilter(log.NewLogfmtLogger(os.Stdout), level.AllowDebug()) - ch := make(chan loki.Entry) - defer close(ch) - - var receivedEntries = utils.NewSyncSlice[loki.Entry]() - - go func() { - for e := range ch { - receivedEntries.Append(e) - } - }() - - var lines = []string{ - "some entry", - "some other entry", - "this is a song", - "about entries", - "I'm in a starbucks", - } - - writeTo := newClientWriteTo(ch, logger) - testAppLabelsRef := chunks.HeadSeriesRef(1) - writeTo.StoreSeries([]record.RefSeries{ - { - Ref: testAppLabelsRef, - Labels: []labels.Label{ - { - Name: "app", - Value: "test", - }, - }, - }, - }, 1) - - for _, line := range lines { - _ = writeTo.AppendEntries(wal.RefEntries{ - Ref: testAppLabelsRef, - Entries: []logproto.Entry{ - { - Timestamp: time.Now(), - Line: line, - }, - }, - }, 0) - } - - require.Eventually(t, func() bool { - return receivedEntries.Length() == len(lines) - }, time.Second*10, time.Second) - defer receivedEntries.DoneIterate() - for _, receivedEntry := range receivedEntries.StartIterate() { - require.Contains(t, lines, receivedEntry.Line, "entry line was not expected") - require.Equal(t, model.LabelValue("test"), receivedEntry.Labels["app"]) - } -} - -func TestClientWriter_LogEntriesWithoutMatchingSeriesAreIgnored(t *testing.T) { - logger := level.NewFilter(log.NewLogfmtLogger(os.Stdout), level.AllowDebug()) - ch := make(chan loki.Entry) - defer close(ch) - - var receivedEntries = utils.NewSyncSlice[loki.Entry]() - - go func() { - for e := range ch { - receivedEntries.Append(e) - } - }() - - var lines = []string{ - "some entry", - "some other entry", - "this is a song", - "about entries", - "I'm in a starbucks", - } - - writeTo := newClientWriteTo(ch, logger) - testAppLabelsRef := chunks.HeadSeriesRef(1) - writeTo.StoreSeries([]record.RefSeries{ - { - Ref: testAppLabelsRef, - Labels: []labels.Label{ - { - Name: "app", - Value: "test", - }, - }, - }, - }, 1) - - for _, line := range lines { - _ = writeTo.AppendEntries(wal.RefEntries{ - Ref: chunks.HeadSeriesRef(61324), - Entries: []logproto.Entry{ - { - Timestamp: time.Now(), - Line: line, - }, - }, - }, 0) - } - - time.Sleep(time.Second * 2) - require.Equal(t, 0, receivedEntries.Length(), "no entry should have arrived") -} - -func BenchmarkClientWriteTo(b *testing.B) { - type testCase struct { - numWriters int - totalLines int - } - for _, tc := range []testCase{ - {numWriters: 5, totalLines: 1_000}, - {numWriters: 10, totalLines: 1_000}, - {numWriters: 5, totalLines: 10_000}, - {numWriters: 10, totalLines: 10_000}, - {numWriters: 5, totalLines: 100_000}, - {numWriters: 10, totalLines: 100_000}, - {numWriters: 10, totalLines: 1_000_000}, - } { - b.Run(fmt.Sprintf("num writers %d, with %d lines written in total", tc.numWriters, tc.totalLines), - func(b *testing.B) { - require.True(b, tc.totalLines%tc.numWriters == 0, "total lines must be divisible by num of writers") - for n := 0; n < b.N; n++ { - bench(tc.numWriters, tc.totalLines, b) - } - }) - } -} - -// bench is a single execution of the ClientWriteTo benchmark. During the execution of the benchmark, numWriters routines -// will run, writing totalLines in total. After the writers have finished, the execution will block until the number of -// expected written entries is reached, or it times out. -func bench(numWriters, totalLines int, b *testing.B) { - logger := level.NewFilter(log.NewLogfmtLogger(os.Stdout), level.AllowDebug()) - readerWG := sync.WaitGroup{} - ch := make(chan loki.Entry) - - b.Log("starting reader routine") - readerWG.Add(1) - var totalReceived atomic.Int64 - go func() { - defer readerWG.Done() - // discard received entries - for range ch { - totalReceived.Inc() - } - }() - - writeTo := newClientWriteTo(ch, logger) - - // spin up the numWriters routines - writersWG := sync.WaitGroup{} - for n := 0; n < numWriters; n++ { - writersWG.Add(1) - go func(n int) { - defer writersWG.Done() - b.Logf("starting writer routine %d", n) - // run as writing from segment n+w, and after finishing reset series up to n. That way we are only causing blocking, - // and not deleting actually used series - startWriter(numWriters+n, n, writeTo, totalLines/numWriters, record.RefSeries{ - Ref: chunks.HeadSeriesRef(n), - Labels: labels.Labels{ - {Name: "n", Value: fmt.Sprint(n)}, - }, - }, time.Millisecond*500) - }(n) - } - - b.Log("waiting for writers to finish") - writersWG.Wait() - - b.Log("waiting for reader to finish") - require.Eventually(b, func() bool { - var read = totalReceived.Load() - b.Logf("checking, value read: %d", read) - return read == int64(totalLines) - }, time.Second*10, time.Second) - close(ch) - readerWG.Wait() - require.Equal(b, int64(totalLines), totalReceived.Load(), "some lines where not read") -} - -// startWriter orchestrates each writer routine that bench launches. Each routine will execute the following actions: -// 1. Add some jitter to the whole routine execution by waiting between 0 and maxInitialSleep. -// 2. Store the series that all written entries will use. -// 3. Write the lines entries, adding a small jitter between 0 and 1 ms after each write operation. -// 4. After all are written, call a SeriesReset. This will block the entire series map and will hopefully block -// some other writing routine. -func startWriter(segmentNum, seriesToReset int, target *clientWriteTo, lines int, series record.RefSeries, maxInitialSleep time.Duration) { - randomSleepMax := func(max time.Duration) { - // random sleep to add some jitter - s := int64(rand.Uint64()) % int64(max) - time.Sleep(time.Duration(s)) - } - // random sleep to add some jitter - randomSleepMax(maxInitialSleep) - - // store series - target.StoreSeries([]record.RefSeries{series}, segmentNum) - - // write lines with that series - for i := 0; i < lines; i++ { - _ = target.AppendEntries(wal.RefEntries{ - Ref: series.Ref, - Entries: []logproto.Entry{ - { - Timestamp: time.Now(), - Line: fmt.Sprintf("%d - %d - hellooo", segmentNum, i), - }, - }, - }, 0) - // add some jitter between writes - randomSleepMax(time.Millisecond * 1) - } - - // reset segment - target.SeriesReset(seriesToReset) -} diff --git a/component/common/loki/client/internal/marker_encoding.go b/component/common/loki/client/internal/marker_encoding.go index 48415f421c7f..c3ed7dd5778f 100644 --- a/component/common/loki/client/internal/marker_encoding.go +++ b/component/common/loki/client/internal/marker_encoding.go @@ -15,7 +15,7 @@ var ( func EncodeMarkerV1(segment uint64) ([]byte, error) { // marker format v1 // marker [ 0 , 1 ] - HEADER, which is used to track version - // marker [ 2 , 9 ] - encoded unit 64 which is the content of the marker, the last "consumed" segment + // marker [ 2 , 9 ] - encoded uint64 which is the content of the marker, the last "consumed" segment // marker [ 10, 13 ] - CRC32 of the first 10 bytes of the marker, using IEEE polynomial bs := make([]byte, 14) // write header with marker format version diff --git a/component/common/loki/wal/watcher_test.go b/component/common/loki/wal/watcher_test.go index a24b7ff63049..97de19748dee 100644 --- a/component/common/loki/wal/watcher_test.go +++ b/component/common/loki/wal/watcher_test.go @@ -64,12 +64,9 @@ func (t *testWriteTo) AssertContainsLines(tst *testing.T, lines ...string) { } t.ReadEntries.DoneIterate() - allSeen := true - for _, wasSeen := range seen { - allSeen = allSeen && wasSeen + for line, wasSeen := range seen { + require.True(tst, wasSeen, "expected to have received line: %s", line) } - - require.True(tst, allSeen, "expected all entries to have been received") } // watcherTestResources contains all resources necessary to test an individual Watcher functionality diff --git a/component/loki/write/write.go b/component/loki/write/write.go index 45d4aa063ec3..a9d9c2730936 100644 --- a/component/loki/write/write.go +++ b/component/loki/write/write.go @@ -119,11 +119,14 @@ func (c *Component) Run(ctx context.Context) error { case <-ctx.Done(): return nil case entry := <-c.receiver.Chan(): + c.mut.RLock() select { case <-ctx.Done(): + c.mut.RUnlock() return nil case c.sink.Chan() <- entry: } + c.mut.RUnlock() } } } diff --git a/component/loki/write/write_test.go b/component/loki/write/write_test.go index 0e7c1a3165cb..642b53703e0c 100644 --- a/component/loki/write/write_test.go +++ b/component/loki/write/write_test.go @@ -10,18 +10,19 @@ import ( "testing" "time" - "github.com/prometheus/common/model" - "github.com/stretchr/testify/require" - "github.com/grafana/agent/component/common/loki" "github.com/grafana/agent/component/common/loki/wal" "github.com/grafana/agent/component/discovery" lsf "github.com/grafana/agent/component/loki/source/file" "github.com/grafana/agent/pkg/flow/componenttest" "github.com/grafana/agent/pkg/util" + "github.com/grafana/river" + "github.com/prometheus/common/model" + "github.com/stretchr/testify/require" + "go.uber.org/atomic" + "github.com/grafana/loki/pkg/logproto" loki_util "github.com/grafana/loki/pkg/util" - "github.com/grafana/river" ) func TestRiverConfig(t *testing.T) { @@ -304,3 +305,98 @@ func testMultipleEndpoint(t *testing.T, alterArgs func(arguments *Arguments)) { } } } + +type testCase struct { + linesCount int + seriesCount int +} + +func BenchmarkLokiWrite(b *testing.B) { + for name, tc := range map[string]testCase{ + "100 lines, single series": { + linesCount: 100, + seriesCount: 1, + }, + "100k lines, 100 series": { + linesCount: 100_000, + seriesCount: 100, + }, + } { + b.Run(name, func(b *testing.B) { + benchSingleEndpoint(b, tc, func(arguments *Arguments) {}) + }) + } +} + +func benchSingleEndpoint(b *testing.B, tc testCase, alterConfig func(arguments *Arguments)) { + // Set up the server that will receive the log entry, and expose it on ch. + var seenLines atomic.Int64 + ch := make(chan logproto.PushRequest) + + // just count seenLines for each entry received + go func() { + for pr := range ch { + count := 0 + for _, str := range pr.Streams { + count += len(str.Entries) + } + seenLines.Add(int64(count)) + } + }() + + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + var pushReq logproto.PushRequest + err := loki_util.ParseProtoReader(context.Background(), r.Body, int(r.ContentLength), math.MaxInt32, &pushReq, loki_util.RawSnappy) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + return + } + tenantHeader := r.Header.Get("X-Scope-OrgID") + require.Equal(b, tenantHeader, "tenant-1") + + ch <- pushReq + })) + defer srv.Close() + + // Set up the component Arguments. + cfg := fmt.Sprintf(` + endpoint { + url = "%s" + batch_wait = "10ms" + tenant_id = "tenant-1" + } + `, srv.URL) + var args Arguments + require.NoError(b, river.Unmarshal([]byte(cfg), &args)) + + alterConfig(&args) + + // Set up and start the component. + testComp, err := componenttest.NewControllerFromID(util.TestLogger(b), "loki.write") + require.NoError(b, err) + go func() { + err = testComp.Run(componenttest.TestContext(b), args) + require.NoError(b, err) + }() + require.NoError(b, testComp.WaitExports(time.Second)) + + // get exports from component + exports := testComp.Exports().(Exports) + + for i := 0; i < b.N; i++ { + for j := 0; j < tc.linesCount; j++ { + logEntry := loki.Entry{ + Labels: model.LabelSet{"foo": model.LabelValue(fmt.Sprintf("bar-%d", i%tc.seriesCount))}, + Entry: logproto.Entry{ + Timestamp: time.Now(), + Line: "very important log", + }, + } + exports.Receiver.Chan() <- logEntry + } + + require.Eventually(b, func() bool { + return int64(tc.linesCount) == seenLines.Load() + }, time.Minute, time.Second, "haven't seen expected number of lines") + } +} diff --git a/pkg/flow/componenttest/context.go b/pkg/flow/componenttest/context.go index b0ede0221b39..462787177324 100644 --- a/pkg/flow/componenttest/context.go +++ b/pkg/flow/componenttest/context.go @@ -6,7 +6,7 @@ import ( ) // TestContext returns a context which cancels itself when t finishes. -func TestContext(t *testing.T) context.Context { +func TestContext(t testing.TB) context.Context { ctx, cancel := context.WithCancel(context.Background()) t.Cleanup(cancel) return ctx diff --git a/pkg/util/test_logger.go b/pkg/util/test_logger.go index 150c5f14f9a6..739d178cba49 100644 --- a/pkg/util/test_logger.go +++ b/pkg/util/test_logger.go @@ -11,7 +11,7 @@ import ( ) // TestLogger generates a logger for a test. -func TestLogger(t *testing.T) log.Logger { +func TestLogger(t testing.TB) log.Logger { t.Helper() l := log.NewSyncLogger(log.NewLogfmtLogger(os.Stderr)) From 1d30d823e8ce4981f92e524e482aca6386c226fd Mon Sep 17 00:00:00 2001 From: William Dumont Date: Wed, 8 Nov 2023 11:13:39 +0100 Subject: [PATCH 12/14] integration-tests: prom metrics improvements (#5695) --- integration-tests/common/metric.go | 79 ++++++-- integration-tests/configs/mimir/mimir.yaml | 1 + integration-tests/configs/prom-gen/Dockerfile | 9 + integration-tests/configs/prom-gen/main.go | 179 ++++++++++++++++++ integration-tests/docker-compose.yaml | 12 +- .../tests/scrape-prom-metrics/config.river | 3 + .../scrape_prom_metrics_test.go | 54 +++++- 7 files changed, 316 insertions(+), 21 deletions(-) create mode 100644 integration-tests/configs/prom-gen/Dockerfile create mode 100644 integration-tests/configs/prom-gen/main.go diff --git a/integration-tests/common/metric.go b/integration-tests/common/metric.go index ea5622fe7fad..95990a042475 100644 --- a/integration-tests/common/metric.go +++ b/integration-tests/common/metric.go @@ -15,10 +15,28 @@ type MetricData struct { Result []MetricResult `json:"result"` } -// TODO: check for the type +type HistogramRawData struct { + Timestamp int64 + Data HistogramData +} + +type Bucket struct { + BoundaryRule float64 + LeftBoundary string + RightBoundary string + CountInBucket string +} + +type HistogramData struct { + Count string `json:"count"` + Sum string `json:"sum"` + Buckets []Bucket `json:"buckets"` +} + type MetricResult struct { - Metric Metric `json:"metric"` - Value Value `json:"value"` + Metric Metric `json:"metric"` + Value *Value `json:"value,omitempty"` + Histogram *HistogramRawData `json:"histogram,omitempty"` } type Value struct { @@ -26,6 +44,52 @@ type Value struct { Value string } +type Metric struct { + TestName string `json:"test_name"` + Name string `json:"__name__"` +} + +func (m *MetricResponse) Unmarshal(data []byte) error { + return json.Unmarshal(data, m) +} + +func (h *HistogramRawData) UnmarshalJSON(b []byte) error { + var arr []json.RawMessage + if err := json.Unmarshal(b, &arr); err != nil { + return err + } + if len(arr) != 2 { + return fmt.Errorf("expected 2 values in histogram raw data, got %d", len(arr)) + } + + if err := json.Unmarshal(arr[0], &h.Timestamp); err != nil { + return err + } + return json.Unmarshal(arr[1], &h.Data) +} + +func (b *Bucket) UnmarshalJSON(data []byte) error { + var raw []interface{} + if err := json.Unmarshal(data, &raw); err != nil { + return err + } + if len(raw) != 4 { + return fmt.Errorf("expected 4 values for bucket, got %d", len(raw)) + } + + if v, ok := raw[0].(float64); ok { + b.BoundaryRule = v + } else { + return fmt.Errorf("expected float64 for BoundaryRule, got %T", raw[0]) + } + + b.LeftBoundary, _ = raw[1].(string) + b.RightBoundary, _ = raw[2].(string) + b.CountInBucket, _ = raw[3].(string) + + return nil +} + func (v *Value) UnmarshalJSON(b []byte) error { var arr []interface{} if err := json.Unmarshal(b, &arr); err != nil { @@ -38,12 +102,3 @@ func (v *Value) UnmarshalJSON(b []byte) error { v.Value, _ = arr[1].(string) return nil } - -type Metric struct { - TestName string `json:"test_name"` - Name string `json:"__name__"` -} - -func (m *MetricResponse) Unmarshal(data []byte) error { - return json.Unmarshal(data, m) -} diff --git a/integration-tests/configs/mimir/mimir.yaml b/integration-tests/configs/mimir/mimir.yaml index e48447f24c3a..a6237eb750d5 100644 --- a/integration-tests/configs/mimir/mimir.yaml +++ b/integration-tests/configs/mimir/mimir.yaml @@ -61,3 +61,4 @@ ruler_storage: limits: ingestion_burst_size: 500000 ingestion_rate: 250000 + native_histograms_ingestion_enabled: true diff --git a/integration-tests/configs/prom-gen/Dockerfile b/integration-tests/configs/prom-gen/Dockerfile new file mode 100644 index 000000000000..7c395748689a --- /dev/null +++ b/integration-tests/configs/prom-gen/Dockerfile @@ -0,0 +1,9 @@ +FROM golang:1.21 as build +WORKDIR /app/ +COPY go.mod go.sum ./ +RUN go mod download +COPY ./integration-tests/configs/prom-gen/ ./ +RUN CGO_ENABLED=0 go build -o main main.go +FROM alpine:3.18 +COPY --from=build /app/main /app/main +CMD ["/app/main"] diff --git a/integration-tests/configs/prom-gen/main.go b/integration-tests/configs/prom-gen/main.go new file mode 100644 index 000000000000..a91e2939e681 --- /dev/null +++ b/integration-tests/configs/prom-gen/main.go @@ -0,0 +1,179 @@ +package main + +import ( + "context" + "flag" + "fmt" + "log" + "math/rand" + "net" + "net/http" + "time" + + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" +) + +const defaultPort = "9001" + +type Config struct { + ListenAddress string +} + +func (cfg *Config) RegisterFlags(f *flag.FlagSet) { + f.StringVar(&cfg.ListenAddress, "bind", fmt.Sprintf(":%s", defaultPort), "Bind address") +} + +func main() { + // Parse CLI flags. + cfg := &Config{} + cfg.RegisterFlags(flag.CommandLine) + flag.Parse() + + address, port := getAddressAndPort(cfg.ListenAddress) + listenAddress := fmt.Sprintf("%s:%s", address, port) + http.Handle("/metrics", promhttp.Handler()) + server := &http.Server{Addr: listenAddress, Handler: nil} + defer func() { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + + if err := server.Shutdown(ctx); err != nil { + log.Fatalf("Server shutdown error: %v", err) + } + }() + log.Printf("HTTP server on %s", listenAddress) + + go func() { log.Fatal(server.ListenAndServe()) }() + + labels := map[string]string{ + "address": address, + "port": port, + } + + go handleCounter(setupCounter(labels)) + go handleGaugeInput(setupGauge(labels)) + go handleHistogramInput(setupHistogram(labels)) + go handleHistogramInput(setupNativeHistogram(labels)) + go handleSummary(setupSummary(labels)) + stopChan := make(chan struct{}) + <-stopChan +} + +// getAddressAndPort always defines a non empty address and port +// +// The Go http server can use empty to mean any, but we want +// something meaningful in the metric labels. +func getAddressAndPort(listenAddress string) (string, string) { + address, port, error := net.SplitHostPort(listenAddress) + if error != nil { + log.Fatal(error) + } + if address == "" { + address = "0.0.0.0" + } + if port == "" { + port = defaultPort + } + + return address, port +} + +func setupGauge(labels map[string]string) prometheus.Gauge { + gauge := prometheus.NewGauge( + prometheus.GaugeOpts{ + Namespace: "golang", + Name: "gauge", + ConstLabels: labels, + }) + prometheus.MustRegister(gauge) + return gauge +} + +func handleGaugeInput(gauge prometheus.Gauge) { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + + for range ticker.C { + newValue := rand.Float64() * 100 + gauge.Set(newValue) + } +} + +func setupNativeHistogram(labels map[string]string) prometheus.Histogram { + nativeHistogram := prometheus.NewHistogram( + prometheus.HistogramOpts{ + Namespace: "golang", + Name: "native_histogram", + ConstLabels: labels, + NativeHistogramBucketFactor: 1.1, + NativeHistogramMaxBucketNumber: 100, + NativeHistogramMinResetDuration: 1 * time.Hour, + }) + prometheus.MustRegister(nativeHistogram) + return nativeHistogram +} + +func setupHistogram(labels map[string]string) prometheus.Histogram { + histogram := prometheus.NewHistogram( + prometheus.HistogramOpts{ + Namespace: "golang", + Name: "histogram", + ConstLabels: labels, + Buckets: []float64{1, 10, 100, 1000}, + }) + prometheus.MustRegister(histogram) + return histogram +} + +func handleHistogramInput(histogram prometheus.Histogram) { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + + for range ticker.C { + newValue := rand.Float64() * 1000 + histogram.Observe(newValue) + } +} + +func setupCounter(labels map[string]string) prometheus.Counter { + counter := prometheus.NewCounter( + prometheus.CounterOpts{ + Namespace: "golang", + Name: "counter", + ConstLabels: labels, + }) + prometheus.MustRegister(counter) + return counter +} + +func handleCounter(counter prometheus.Counter) { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + + for range ticker.C { + counter.Inc() + } +} + +func setupSummary(labels map[string]string) prometheus.Summary { + summary := prometheus.NewSummary( + prometheus.SummaryOpts{ + Namespace: "golang", + Name: "summary", + ConstLabels: labels, + Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}, + }) + prometheus.MustRegister(summary) + return summary +} + +func handleSummary(summary prometheus.Summary) { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + + for range ticker.C { + newValue := rand.Float64() * 1000 + summary.Observe(newValue) + } +} diff --git a/integration-tests/docker-compose.yaml b/integration-tests/docker-compose.yaml index 2aa98f9b1500..b576a425fa68 100644 --- a/integration-tests/docker-compose.yaml +++ b/integration-tests/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3" services: mimir: - image: grafana/mimir:2.9.0 + image: grafana/mimir:latest volumes: - ./configs/mimir:/etc/mimir-config entrypoint: @@ -52,11 +52,9 @@ services: depends_on: - otel-collector - avalanche: - image: quay.io/freshtracks.io/avalanche:latest - command: - - --metric-count=50 - - --series-interval=7200 - - --metric-interval=7200 + prom-gen: + build: + dockerfile: ./integration-tests/configs/prom-gen/Dockerfile + context: .. ports: - "9001:9001" \ No newline at end of file diff --git a/integration-tests/tests/scrape-prom-metrics/config.river b/integration-tests/tests/scrape-prom-metrics/config.river index 77fa88430977..cf546412a554 100644 --- a/integration-tests/tests/scrape-prom-metrics/config.river +++ b/integration-tests/tests/scrape-prom-metrics/config.river @@ -3,6 +3,8 @@ prometheus.scrape "scrape_prom_metrics" { {"__address__" = "localhost:9001"}, ] forward_to = [prometheus.remote_write.scrape_prom_metrics.receiver] + scrape_classic_histograms = true + enable_protobuf_negotiation = true scrape_interval = "1s" scrape_timeout = "500ms" } @@ -10,6 +12,7 @@ prometheus.scrape "scrape_prom_metrics" { prometheus.remote_write "scrape_prom_metrics" { endpoint { url = "http://localhost:9009/api/v1/push" + send_native_histograms = true metadata_config { send_interval = "1s" } diff --git a/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go b/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go index f6c99a08c132..f57e1ca37b3c 100644 --- a/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go +++ b/integration-tests/tests/scrape-prom-metrics/scrape_prom_metrics_test.go @@ -1,23 +1,73 @@ package main import ( + "fmt" "testing" "github.com/grafana/agent/integration-tests/common" "github.com/stretchr/testify/assert" ) -const query = "http://localhost:9009/prometheus/api/v1/query?query=avalanche_metric_mmmmm_0_0{test_name='scrape_prom_metrics'}" +const promURL = "http://localhost:9009/prometheus/api/v1/query?query=" + +func metricQuery(metricName string) string { + return fmt.Sprintf("%s%s{test_name='scrape_prom_metrics'}", promURL, metricName) +} func TestScrapePromMetrics(t *testing.T) { + tests := []struct { + query string + metric string + }{ + // TODO: better differentiate these metric types? + {metricQuery("golang_counter"), "golang_counter"}, + {metricQuery("golang_gauge"), "golang_gauge"}, + {metricQuery("golang_histogram_bucket"), "golang_histogram_bucket"}, + {metricQuery("golang_summary"), "golang_summary"}, + } + + for _, tt := range tests { + tt := tt + t.Run(tt.metric, func(t *testing.T) { + t.Parallel() + assertMetricData(t, tt.query, tt.metric) + }) + } + t.Run("golang_native_histogram", func(t *testing.T) { + t.Parallel() + assertHistogramData(t, metricQuery("golang_native_histogram"), "golang_native_histogram") + }) +} + +func assertHistogramData(t *testing.T, query string, expectedMetric string) { + var metricResponse common.MetricResponse + assert.EventuallyWithT(t, func(c *assert.CollectT) { + err := common.FetchDataFromURL(query, &metricResponse) + assert.NoError(c, err) + if assert.NotEmpty(c, metricResponse.Data.Result) { + assert.Equal(c, metricResponse.Data.Result[0].Metric.Name, expectedMetric) + assert.Equal(c, metricResponse.Data.Result[0].Metric.TestName, "scrape_prom_metrics") + if assert.NotNil(c, metricResponse.Data.Result[0].Histogram) { + histogram := metricResponse.Data.Result[0].Histogram + assert.NotEmpty(c, histogram.Data.Count) + assert.NotEmpty(c, histogram.Data.Sum) + assert.NotEmpty(c, histogram.Data.Buckets) + assert.Nil(c, metricResponse.Data.Result[0].Value) + } + } + }, common.DefaultTimeout, common.DefaultRetryInterval, "Histogram data did not satisfy the conditions within the time limit") +} + +func assertMetricData(t *testing.T, query, expectedMetric string) { var metricResponse common.MetricResponse assert.EventuallyWithT(t, func(c *assert.CollectT) { err := common.FetchDataFromURL(query, &metricResponse) assert.NoError(c, err) if assert.NotEmpty(c, metricResponse.Data.Result) { - assert.Equal(c, metricResponse.Data.Result[0].Metric.Name, "avalanche_metric_mmmmm_0_0") + assert.Equal(c, metricResponse.Data.Result[0].Metric.Name, expectedMetric) assert.Equal(c, metricResponse.Data.Result[0].Metric.TestName, "scrape_prom_metrics") assert.NotEmpty(c, metricResponse.Data.Result[0].Value.Value) + assert.Nil(c, metricResponse.Data.Result[0].Histogram) } }, common.DefaultTimeout, common.DefaultRetryInterval, "Data did not satisfy the conditions within the time limit") } From 90a03f920d19750c3cd33076631aec269624647a Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Wed, 8 Nov 2023 12:17:23 +0200 Subject: [PATCH 13/14] helm: fix the CHANGELOG header for v0.27.2 (#5736) Signed-off-by: Paschalis Tsilias --- operations/helm/charts/grafana-agent/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md index a07f6c76f0f0..f87918d883ce 100644 --- a/operations/helm/charts/grafana-agent/CHANGELOG.md +++ b/operations/helm/charts/grafana-agent/CHANGELOG.md @@ -10,7 +10,7 @@ internal API changes are not present. Unreleased ---------- -0.27.1 (2023-11-07) +0.27.2 (2023-11-07) ---------- ### Enhancements From 0961bf4e4897cf5e1a0541e6eb803896681b3331 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Wed, 8 Nov 2023 13:24:28 +0000 Subject: [PATCH 14/14] Add aliases in preparation for the move of Grafana Cloud agent documentation (#5731) * Roundtrip front matter through alias tool Signed-off-by: Jack Baldry * Add /docs/grafana-cloud/monitor-infrastructure/agent/ aliases to all pages Signed-off-by: Jack Baldry * Add /docs/grafana-cloud/send-data/agent/ aliases to all pages Signed-off-by: Jack Baldry * Regenerate the docs --------- Signed-off-by: Jack Baldry Co-authored-by: Clayton Cornell Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> --- docs/sources/_index.md | 1 + docs/sources/_index.md.t | 1 + docs/sources/about.md | 3 ++- docs/sources/data-collection.md | 3 ++- docs/sources/flow/_index.md | 4 +++- docs/sources/flow/concepts/_index.md | 3 ++- docs/sources/flow/concepts/clustering.md | 3 ++- docs/sources/flow/concepts/component_controller.md | 3 ++- docs/sources/flow/concepts/components.md | 3 ++- docs/sources/flow/concepts/configuration_language.md | 3 ++- docs/sources/flow/concepts/modules.md | 3 ++- docs/sources/flow/config-language/_index.md | 3 ++- docs/sources/flow/config-language/components.md | 3 ++- .../sources/flow/config-language/expressions/_index.md | 3 ++- .../flow/config-language/expressions/function_calls.md | 3 ++- .../flow/config-language/expressions/operators.md | 3 ++- .../config-language/expressions/referencing_exports.md | 3 ++- .../config-language/expressions/types_and_values.md | 3 ++- docs/sources/flow/config-language/files.md | 3 ++- docs/sources/flow/config-language/syntax.md | 3 ++- docs/sources/flow/getting-started/_index.md | 3 ++- .../flow/getting-started/collect-opentelemetry-data.md | 3 ++- .../flow/getting-started/collect-prometheus-metrics.md | 3 ++- .../flow/getting-started/configure-agent-clustering.md | 3 ++- .../distribute-prometheus-scrape-load.md | 3 ++- .../flow/getting-started/migrating-from-operator.md | 3 +++ .../flow/getting-started/migrating-from-prometheus.md | 3 ++- .../flow/getting-started/migrating-from-promtail.md | 3 ++- .../flow/getting-started/migrating-from-static.md | 4 +++- .../getting-started/opentelemetry-to-lgtm-stack.md | 4 +++- docs/sources/flow/monitoring/_index.md | 3 ++- docs/sources/flow/monitoring/component_metrics.md | 3 ++- docs/sources/flow/monitoring/controller_metrics.md | 3 ++- docs/sources/flow/monitoring/debugging.md | 3 ++- docs/sources/flow/reference/_index.md | 5 +++-- docs/sources/flow/reference/cli/_index.md | 5 ++--- docs/sources/flow/reference/cli/convert.md | 5 ++--- docs/sources/flow/reference/cli/fmt.md | 4 ++-- docs/sources/flow/reference/cli/run.md | 5 ++--- docs/sources/flow/reference/cli/tools.md | 4 ++-- docs/sources/flow/reference/components/_index.md | 3 ++- .../flow/reference/components/discovery.azure.md | 3 ++- .../flow/reference/components/discovery.consul.md | 3 ++- .../flow/reference/components/discovery.consulagent.md | 5 ++++- .../reference/components/discovery.digitalocean.md | 3 ++- .../sources/flow/reference/components/discovery.dns.md | 5 +++-- .../flow/reference/components/discovery.docker.md | 3 ++- .../flow/reference/components/discovery.dockerswarm.md | 9 +++++---- .../sources/flow/reference/components/discovery.ec2.md | 3 ++- .../flow/reference/components/discovery.eureka.md | 3 ++- .../flow/reference/components/discovery.file.md | 3 ++- .../sources/flow/reference/components/discovery.gce.md | 3 ++- .../flow/reference/components/discovery.hetzner.md | 3 ++- .../flow/reference/components/discovery.http.md | 3 ++- .../flow/reference/components/discovery.ionos.md | 3 ++- .../flow/reference/components/discovery.kubelet.md | 3 ++- .../flow/reference/components/discovery.kubernetes.md | 3 ++- .../flow/reference/components/discovery.kuma.md | 3 ++- .../flow/reference/components/discovery.lightsail.md | 3 ++- .../flow/reference/components/discovery.linode.md | 5 ++++- .../flow/reference/components/discovery.marathon.md | 3 ++- .../flow/reference/components/discovery.nerve.md | 5 ++++- .../flow/reference/components/discovery.nomad.md | 3 ++- .../flow/reference/components/discovery.openstack.md | 3 ++- .../flow/reference/components/discovery.puppetdb.md | 3 ++- .../flow/reference/components/discovery.relabel.md | 3 ++- .../flow/reference/components/discovery.scaleway.md | 5 ++++- .../flow/reference/components/discovery.serverset.md | 5 ++++- .../flow/reference/components/discovery.triton.md | 3 ++- .../flow/reference/components/discovery.uyuni.md | 3 ++- .../sources/flow/reference/components/faro.receiver.md | 3 ++- docs/sources/flow/reference/components/local.file.md | 3 ++- .../flow/reference/components/local.file_match.md | 3 ++- docs/sources/flow/reference/components/loki.echo.md | 3 ++- docs/sources/flow/reference/components/loki.process.md | 3 ++- docs/sources/flow/reference/components/loki.relabel.md | 3 ++- .../flow/reference/components/loki.source.api.md | 3 ++- .../reference/components/loki.source.awsfirehose.md | 3 ++- .../components/loki.source.azure_event_hubs.md | 3 ++- .../reference/components/loki.source.cloudflare.md | 3 ++- .../flow/reference/components/loki.source.docker.md | 5 +++-- .../flow/reference/components/loki.source.file.md | 9 +++++---- .../flow/reference/components/loki.source.gcplog.md | 3 ++- .../flow/reference/components/loki.source.gelf.md | 3 ++- .../flow/reference/components/loki.source.heroku.md | 3 ++- .../flow/reference/components/loki.source.journal.md | 3 ++- .../flow/reference/components/loki.source.kafka.md | 3 ++- .../reference/components/loki.source.kubernetes.md | 3 ++- .../components/loki.source.kubernetes_events.md | 3 ++- .../flow/reference/components/loki.source.podlogs.md | 3 ++- .../flow/reference/components/loki.source.syslog.md | 3 ++- .../reference/components/loki.source.windowsevent.md | 3 ++- docs/sources/flow/reference/components/loki.write.md | 3 ++- .../reference/components/mimir.rules.kubernetes.md | 3 ++- docs/sources/flow/reference/components/module.file.md | 3 ++- docs/sources/flow/reference/components/module.git.md | 3 ++- docs/sources/flow/reference/components/module.http.md | 3 ++- .../sources/flow/reference/components/module.string.md | 3 ++- .../flow/reference/components/otelcol.auth.basic.md | 3 ++- .../flow/reference/components/otelcol.auth.bearer.md | 3 ++- .../flow/reference/components/otelcol.auth.headers.md | 3 ++- .../flow/reference/components/otelcol.auth.oauth2.md | 3 ++- .../flow/reference/components/otelcol.auth.sigv4.md | 3 ++- .../components/otelcol.connector.servicegraph.md | 5 ++++- .../reference/components/otelcol.connector.spanlogs.md | 3 ++- .../components/otelcol.connector.spanmetrics.md | 3 ++- .../components/otelcol.exporter.loadbalancing.md | 3 ++- .../reference/components/otelcol.exporter.logging.md | 3 ++- .../flow/reference/components/otelcol.exporter.loki.md | 3 ++- .../flow/reference/components/otelcol.exporter.otlp.md | 3 ++- .../reference/components/otelcol.exporter.otlphttp.md | 3 ++- .../components/otelcol.exporter.prometheus.md | 3 ++- .../otelcol.extension.jaeger_remote_sampling.md | 3 ++- .../components/otelcol.processor.attributes.md | 3 ++- .../reference/components/otelcol.processor.batch.md | 3 ++- .../components/otelcol.processor.discovery.md | 3 ++- .../reference/components/otelcol.processor.filter.md | 3 ++- .../components/otelcol.processor.k8sattributes.md | 3 ++- .../components/otelcol.processor.memory_limiter.md | 3 ++- .../otelcol.processor.probabilistic_sampler.md | 5 ++++- .../reference/components/otelcol.processor.span.md | 3 ++- .../components/otelcol.processor.tail_sampling.md | 3 ++- .../components/otelcol.processor.transform.md | 3 ++- .../reference/components/otelcol.receiver.jaeger.md | 3 ++- .../reference/components/otelcol.receiver.kafka.md | 3 ++- .../flow/reference/components/otelcol.receiver.loki.md | 3 ++- .../components/otelcol.receiver.opencensus.md | 3 ++- .../flow/reference/components/otelcol.receiver.otlp.md | 3 ++- .../components/otelcol.receiver.prometheus.md | 3 ++- .../reference/components/otelcol.receiver.zipkin.md | 3 ++- .../reference/components/prometheus.exporter.agent.md | 5 ++++- .../reference/components/prometheus.exporter.apache.md | 3 ++- .../reference/components/prometheus.exporter.azure.md | 9 +++++---- .../components/prometheus.exporter.blackbox.md | 3 ++- .../components/prometheus.exporter.cadvisor.md | 3 ++- .../components/prometheus.exporter.cloudwatch.md | 3 ++- .../reference/components/prometheus.exporter.consul.md | 3 ++- .../components/prometheus.exporter.dnsmasq.md | 3 ++- .../components/prometheus.exporter.elasticsearch.md | 3 ++- .../reference/components/prometheus.exporter.gcp.md | 3 ++- .../reference/components/prometheus.exporter.github.md | 3 ++- .../reference/components/prometheus.exporter.kafka.md | 3 ++- .../components/prometheus.exporter.memcached.md | 3 ++- .../components/prometheus.exporter.mongodb.md | 3 ++- .../reference/components/prometheus.exporter.mssql.md | 3 ++- .../reference/components/prometheus.exporter.mysql.md | 3 ++- .../components/prometheus.exporter.oracledb.md | 3 ++- .../components/prometheus.exporter.postgres.md | 3 ++- .../components/prometheus.exporter.process.md | 3 ++- .../reference/components/prometheus.exporter.redis.md | 3 ++- .../reference/components/prometheus.exporter.snmp.md | 3 ++- .../components/prometheus.exporter.snowflake.md | 3 ++- .../reference/components/prometheus.exporter.squid.md | 3 ++- .../reference/components/prometheus.exporter.statsd.md | 3 ++- .../reference/components/prometheus.exporter.unix.md | 3 ++- .../components/prometheus.exporter.vsphere.md | 3 ++- .../components/prometheus.exporter.windows.md | 3 ++- .../components/prometheus.operator.podmonitors.md | 3 ++- .../reference/components/prometheus.operator.probes.md | 3 ++- .../components/prometheus.operator.servicemonitors.md | 3 ++- .../reference/components/prometheus.receive_http.md | 3 ++- .../flow/reference/components/prometheus.relabel.md | 3 ++- .../reference/components/prometheus.remote_write.md | 3 ++- .../flow/reference/components/prometheus.scrape.md | 3 ++- .../flow/reference/components/pyroscope.ebpf.md | 9 +++++---- .../flow/reference/components/pyroscope.scrape.md | 3 ++- .../flow/reference/components/pyroscope.write.md | 3 ++- docs/sources/flow/reference/components/remote.http.md | 3 ++- .../components/remote.kubernetes.configmap.md | 5 ++++- .../reference/components/remote.kubernetes.secret.md | 5 ++++- docs/sources/flow/reference/components/remote.s3.md | 3 ++- docs/sources/flow/reference/components/remote.vault.md | 5 +++-- docs/sources/flow/reference/config-blocks/_index.md | 3 ++- docs/sources/flow/reference/config-blocks/argument.md | 5 +++-- docs/sources/flow/reference/config-blocks/export.md | 5 +++-- docs/sources/flow/reference/config-blocks/http.md | 5 +++-- docs/sources/flow/reference/config-blocks/logging.md | 5 +++-- docs/sources/flow/reference/config-blocks/tracing.md | 5 +++-- docs/sources/flow/reference/stdlib/_index.md | 4 +++- docs/sources/flow/reference/stdlib/coalesce.md | 3 ++- docs/sources/flow/reference/stdlib/concat.md | 3 ++- docs/sources/flow/reference/stdlib/constants.md | 3 ++- docs/sources/flow/reference/stdlib/env.md | 3 ++- docs/sources/flow/reference/stdlib/format.md | 3 ++- docs/sources/flow/reference/stdlib/join.md | 3 ++- docs/sources/flow/reference/stdlib/json_decode.md | 3 ++- docs/sources/flow/reference/stdlib/json_path.md | 3 ++- docs/sources/flow/reference/stdlib/nonsensitive.md | 3 ++- docs/sources/flow/reference/stdlib/replace.md | 3 ++- docs/sources/flow/reference/stdlib/split.md | 3 ++- docs/sources/flow/reference/stdlib/to_lower.md | 3 ++- docs/sources/flow/reference/stdlib/to_upper.md | 3 ++- docs/sources/flow/reference/stdlib/trim.md | 3 ++- docs/sources/flow/reference/stdlib/trim_prefix.md | 3 ++- docs/sources/flow/reference/stdlib/trim_space.md | 3 ++- docs/sources/flow/reference/stdlib/trim_suffix.md | 3 ++- docs/sources/flow/release-notes.md | 1 + docs/sources/flow/setup/_index.md | 1 + docs/sources/flow/setup/configure/_index.md | 1 + .../flow/setup/configure/configure-kubernetes.md | 1 + docs/sources/flow/setup/configure/configure-linux.md | 1 + docs/sources/flow/setup/configure/configure-macos.md | 1 + docs/sources/flow/setup/configure/configure-windows.md | 1 + docs/sources/flow/setup/deploy-agent.md | 1 + docs/sources/flow/setup/install/_index.md | 3 ++- docs/sources/flow/setup/install/binary.md | 1 + docs/sources/flow/setup/install/docker.md | 1 + docs/sources/flow/setup/install/kubernetes.md | 1 + docs/sources/flow/setup/install/linux.md | 1 + docs/sources/flow/setup/install/macos.md | 1 + docs/sources/flow/setup/install/windows.md | 1 + docs/sources/flow/setup/start-agent.md | 1 + docs/sources/flow/tutorials/_index.md | 3 ++- docs/sources/flow/tutorials/chaining.md | 1 + .../flow/tutorials/collecting-prometheus-metrics.md | 1 + docs/sources/flow/tutorials/filtering-metrics.md | 1 + docs/sources/operator/_index.md | 5 +++-- docs/sources/operator/add-custom-scrape-jobs.md | 3 ++- docs/sources/operator/api.md | 1 + docs/sources/operator/architecture.md | 3 ++- .../operator/deploy-agent-operator-resources.md | 3 ++- docs/sources/operator/getting-started.md | 3 ++- docs/sources/operator/helm-getting-started.md | 3 ++- docs/sources/operator/operator-integrations.md | 3 ++- docs/sources/operator/release-notes.md | 5 ++--- docs/sources/shared/deploy-agent.md | 3 ++- .../flow/reference/components/authorization-block.md | 1 + .../shared/flow/reference/components/azuread-block.md | 1 + .../flow/reference/components/basic-auth-block.md | 1 + .../reference/components/exporter-component-exports.md | 1 + .../flow/reference/components/extract-field-block.md | 1 + .../flow/reference/components/field-filter-block.md | 2 ++ .../reference/components/http-client-config-block.md | 1 + .../reference/components/local-file-arguments-text.md | 1 + .../flow/reference/components/loki-server-grpc.md | 1 + .../flow/reference/components/loki-server-http.md | 1 + .../reference/components/managed_identity-block.md | 1 + .../reference/components/match-properties-block.md | 1 + .../shared/flow/reference/components/oauth2-block.md | 1 + .../reference/components/otelcol-compression-field.md | 3 ++- .../components/otelcol-debug-metrics-block.md | 1 + .../components/otelcol-filter-attribute-block.md | 1 + .../components/otelcol-filter-library-block.md | 1 + .../components/otelcol-filter-log-severity-block.md | 1 + .../components/otelcol-filter-regexp-block.md | 1 + .../components/otelcol-filter-resource-block.md | 1 + .../reference/components/otelcol-grpc-authority.md | 3 ++- .../reference/components/otelcol-grpc-balancer-name.md | 3 ++- .../flow/reference/components/otelcol-queue-block.md | 1 + .../flow/reference/components/otelcol-retry-block.md | 1 + .../reference/components/otelcol-tls-config-block.md | 1 + .../flow/reference/components/output-block-logs.md | 1 + .../flow/reference/components/output-block-metrics.md | 1 + .../flow/reference/components/output-block-traces.md | 1 + .../shared/flow/reference/components/output-block.md | 1 + .../flow/reference/components/prom-operator-scrape.md | 2 ++ .../flow/reference/components/rule-block-logs.md | 1 + .../shared/flow/reference/components/rule-block.md | 1 + .../shared/flow/reference/components/sigv4-block.md | 1 + .../flow/reference/components/tls-config-block.md | 1 + docs/sources/shared/flow/stability/beta.md | 1 + docs/sources/shared/flow/stability/experimental.md | 1 + docs/sources/shared/index.md | 5 ++++- docs/sources/shared/wal-data-retention.md | 1 + docs/sources/stability.md | 6 +++++- docs/sources/static/_index.md | 5 ++++- docs/sources/static/api/_index.md | 6 ++++-- docs/sources/static/configuration/_index.md | 4 +++- docs/sources/static/configuration/agent-management.md | 5 ++++- .../sources/static/configuration/create-config-file.md | 6 ++++-- docs/sources/static/configuration/flags.md | 4 +++- .../static/configuration/integrations/_index.md | 4 +++- .../integrations/apache-exporter-config.md | 4 +++- .../integrations/azure-exporter-config.md | 4 +++- .../configuration/integrations/blackbox-config.md | 4 +++- .../configuration/integrations/cadvisor-config.md | 4 +++- .../integrations/cloudwatch-exporter-config.md | 4 +++- .../integrations/consul-exporter-config.md | 4 +++- .../integrations/dnsmasq-exporter-config.md | 4 +++- .../integrations/elasticsearch-exporter-config.md | 4 +++- .../configuration/integrations/gcp-exporter-config.md | 4 +++- .../integrations/github-exporter-config.md | 4 +++- .../integrations/integrations-next/_index.md | 6 ++++-- .../integrations-next/app-agent-receiver-config.md | 4 +++- .../integrations/integrations-next/blackbox-config.md | 4 +++- .../integrations-next/eventhandler-config.md | 4 +++- .../integrations/integrations-next/snmp-config.md | 4 +++- .../integrations/integrations-next/vsphere-config.md | 6 ++++-- .../integrations/kafka-exporter-config.md | 4 +++- .../integrations/memcached-exporter-config.md | 4 +++- .../integrations/mongodb_exporter-config.md | 4 +++- .../static/configuration/integrations/mssql-config.md | 4 +++- .../integrations/mysqld-exporter-config.md | 4 +++- .../configuration/integrations/node-exporter-config.md | 4 +++- .../configuration/integrations/oracledb-config.md | 4 +++- .../integrations/postgres-exporter-config.md | 4 +++- .../integrations/process-exporter-config.md | 4 +++- .../integrations/redis-exporter-config.md | 4 +++- .../static/configuration/integrations/snmp-config.md | 4 +++- .../configuration/integrations/snowflake-config.md | 4 +++- .../static/configuration/integrations/squid-config.md | 4 +++- .../integrations/statsd-exporter-config.md | 4 +++- .../integrations/windows-exporter-config.md | 4 +++- docs/sources/static/configuration/logs-config.md | 6 ++++-- docs/sources/static/configuration/metrics-config.md | 6 ++++-- docs/sources/static/configuration/scraping-service.md | 8 +++++--- docs/sources/static/configuration/server-config.md | 4 +++- docs/sources/static/configuration/traces-config.md | 4 +++- docs/sources/static/operation-guide/_index.md | 4 +++- docs/sources/static/release-notes.md | 10 ++++++---- docs/sources/static/set-up/_index.md | 7 ++++--- docs/sources/static/set-up/deploy-agent.md | 6 ++++-- docs/sources/static/set-up/install/_index.md | 6 ++++-- .../static/set-up/install/install-agent-binary.md | 4 +++- .../static/set-up/install/install-agent-docker.md | 4 +++- .../static/set-up/install/install-agent-kubernetes.md | 5 ++++- .../static/set-up/install/install-agent-linux.md | 4 +++- .../static/set-up/install/install-agent-macos.md | 4 +++- .../static/set-up/install/install-agent-on-windows.md | 4 +++- docs/sources/static/set-up/quick-starts.md | 4 +++- docs/sources/static/set-up/start-agent.md | 6 ++++-- tools/gen-crd-docs/template/pkg.tpl | 1 + 322 files changed, 716 insertions(+), 313 deletions(-) diff --git a/docs/sources/_index.md b/docs/sources/_index.md index c46dfe04feea..36d97758b795 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/ - /docs/grafana-cloud/monitor-infrastructure/agent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/ +- /docs/grafana-cloud/send-data/agent/ canonical: https://grafana.com/docs/agent/latest/ title: Grafana Agent description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector diff --git a/docs/sources/_index.md.t b/docs/sources/_index.md.t index a8c7eb6fddf9..b14448733925 100644 --- a/docs/sources/_index.md.t +++ b/docs/sources/_index.md.t @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/ - /docs/grafana-cloud/monitor-infrastructure/agent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/ +- /docs/grafana-cloud/send-data/agent/ canonical: https://grafana.com/docs/agent/latest/ title: Grafana Agent description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector diff --git a/docs/sources/about.md b/docs/sources/about.md index 4684df62a529..4c15b43297b6 100644 --- a/docs/sources/about.md +++ b/docs/sources/about.md @@ -4,10 +4,11 @@ aliases: - /docs/grafana-cloud/agent/about/ - /docs/grafana-cloud/monitor-infrastructure/agent/about/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/about/ +- /docs/grafana-cloud/send-data/agent/about/ canonical: https://grafana.com/docs/agent/latest/about/ +description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector menuTitle: Introduction title: Introduction to Grafana Agent -description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector weight: 100 --- diff --git a/docs/sources/data-collection.md b/docs/sources/data-collection.md index 51060733b0ea..2ff7ec44f86e 100644 --- a/docs/sources/data-collection.md +++ b/docs/sources/data-collection.md @@ -4,10 +4,11 @@ aliases: - /docs/grafana-cloud/agent/data-collection/ - /docs/grafana-cloud/monitor-infrastructure/agent/data-collection/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/data-collection/ +- /docs/grafana-cloud/send-data/agent/data-collection/ canonical: https://grafana.com/docs/agent/latest/data-collection/ +description: Grafana Agent data collection menuTitle: Data collection title: Grafana Agent data collection -description: Grafana Agent data collection weight: 500 --- diff --git a/docs/sources/flow/_index.md b/docs/sources/flow/_index.md index 65909d624de0..aa434950db5c 100644 --- a/docs/sources/flow/_index.md +++ b/docs/sources/flow/_index.md @@ -3,9 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/ +- /docs/grafana-cloud/send-data/agent/flow/ canonical: https://grafana.com/docs/agent/latest/flow/ +description: Grafana Agent Flow is a component-based revision of Grafana Agent with + a focus on ease-of-use, debuggability, and adaptability title: Flow mode -description: Grafana Agent Flow is a component-based revision of Grafana Agent with a focus on ease-of-use, debuggability, and adaptability weight: 400 --- diff --git a/docs/sources/flow/concepts/_index.md b/docs/sources/flow/concepts/_index.md index 0eaca30934ac..5e6174c09845 100644 --- a/docs/sources/flow/concepts/_index.md +++ b/docs/sources/flow/concepts/_index.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/ -title: Concepts description: Learn about the Grafana Agent flow mode concepts +title: Concepts weight: 100 --- diff --git a/docs/sources/flow/concepts/clustering.md b/docs/sources/flow/concepts/clustering.md index 9dac5fedbcc8..6b0726c2439b 100644 --- a/docs/sources/flow/concepts/clustering.md +++ b/docs/sources/flow/concepts/clustering.md @@ -3,12 +3,13 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/clustering/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/clustering/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/clustering/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/clustering/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/clustering/ +description: Learn about Grafana Agent clustering concepts labels: stage: beta menuTitle: Clustering title: Clustering (beta) -description: Learn about Grafana Agent clustering concepts weight: 500 --- diff --git a/docs/sources/flow/concepts/component_controller.md b/docs/sources/flow/concepts/component_controller.md index 887d427b8c90..08b8a6afa452 100644 --- a/docs/sources/flow/concepts/component_controller.md +++ b/docs/sources/flow/concepts/component_controller.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/component_controller/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/component_controller/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/component_controller/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/component_controller/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/component_controller/ -title: Component controller description: Learn about the component controller +title: Component controller weight: 200 --- diff --git a/docs/sources/flow/concepts/components.md b/docs/sources/flow/concepts/components.md index 4d3f273c73af..b66416d9d62c 100644 --- a/docs/sources/flow/concepts/components.md +++ b/docs/sources/flow/concepts/components.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/components/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/components/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/components/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/components/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/components/ -title: Components description: Learn about components +title: Components weight: 100 --- diff --git a/docs/sources/flow/concepts/configuration_language.md b/docs/sources/flow/concepts/configuration_language.md index 55671679714e..77b42df3293f 100644 --- a/docs/sources/flow/concepts/configuration_language.md +++ b/docs/sources/flow/concepts/configuration_language.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/configuration_language/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/configuration_language/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/configuration_language/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/configuration_language/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/configuration_language/ -title: Configuration language concepts description: Learn about configuration language concepts +title: Configuration language concepts weight: 400 --- diff --git a/docs/sources/flow/concepts/modules.md b/docs/sources/flow/concepts/modules.md index 77cae3170d36..191159c9f0bf 100644 --- a/docs/sources/flow/concepts/modules.md +++ b/docs/sources/flow/concepts/modules.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/concepts/modules/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/modules/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/modules/ +- /docs/grafana-cloud/send-data/agent/flow/concepts/modules/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/modules/ -title: Modules description: Learn about modules +title: Modules weight: 300 --- diff --git a/docs/sources/flow/config-language/_index.md b/docs/sources/flow/config-language/_index.md index a363b2977642..845005fe9f7f 100644 --- a/docs/sources/flow/config-language/_index.md +++ b/docs/sources/flow/config-language/_index.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/ - configuration-language/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/ -title: Configuration language description: Learn about the configuration language +title: Configuration language weight: 400 --- diff --git a/docs/sources/flow/config-language/components.md b/docs/sources/flow/config-language/components.md index 2e04643e1d53..be675572aa7e 100644 --- a/docs/sources/flow/config-language/components.md +++ b/docs/sources/flow/config-language/components.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/components/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/components/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/components/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/components/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/components/ -title: Components configuration language description: Learn about the components configuration language +title: Components configuration language weight: 300 --- diff --git a/docs/sources/flow/config-language/expressions/_index.md b/docs/sources/flow/config-language/expressions/_index.md index 5693e91ceeb7..7fc1363432a7 100644 --- a/docs/sources/flow/config-language/expressions/_index.md +++ b/docs/sources/flow/config-language/expressions/_index.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/expressions/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/expressions/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/expressions/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/expressions/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/ -title: Expressions description: Learn about expressions +title: Expressions weight: 400 --- diff --git a/docs/sources/flow/config-language/expressions/function_calls.md b/docs/sources/flow/config-language/expressions/function_calls.md index 77fab0d2df53..d8a6ade75048 100644 --- a/docs/sources/flow/config-language/expressions/function_calls.md +++ b/docs/sources/flow/config-language/expressions/function_calls.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/expressions/function_calls/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/expressions/function_calls/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/expressions/function_calls/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/expressions/function_calls/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/function_calls/ -title: Function calls description: Learn about function calls +title: Function calls weight: 400 --- diff --git a/docs/sources/flow/config-language/expressions/operators.md b/docs/sources/flow/config-language/expressions/operators.md index c9c724952d81..73ef1868688a 100644 --- a/docs/sources/flow/config-language/expressions/operators.md +++ b/docs/sources/flow/config-language/expressions/operators.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/expressions/operators/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/expressions/operators/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/expressions/operators/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/expressions/operators/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/operators/ -title: Operators description: Learn about operators +title: Operators weight: 300 --- diff --git a/docs/sources/flow/config-language/expressions/referencing_exports.md b/docs/sources/flow/config-language/expressions/referencing_exports.md index 3a23508a63a6..ed35c3ec7f88 100644 --- a/docs/sources/flow/config-language/expressions/referencing_exports.md +++ b/docs/sources/flow/config-language/expressions/referencing_exports.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/expressions/referencing_exports/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/expressions/referencing_exports/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/expressions/referencing_exports/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/expressions/referencing_exports/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/referencing_exports/ -title: Referencing component exports description: Learn about referencing component exports +title: Referencing component exports weight: 200 --- diff --git a/docs/sources/flow/config-language/expressions/types_and_values.md b/docs/sources/flow/config-language/expressions/types_and_values.md index 764be479661c..3bba23836638 100644 --- a/docs/sources/flow/config-language/expressions/types_and_values.md +++ b/docs/sources/flow/config-language/expressions/types_and_values.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/expressions/types_and_values/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/expressions/types_and_values/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/expressions/types_and_values/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/expressions/types_and_values/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/types_and_values/ -title: Types and values description: Learn about the River types and values +title: Types and values weight: 100 --- diff --git a/docs/sources/flow/config-language/files.md b/docs/sources/flow/config-language/files.md index 9e62da529231..39d6f5a144b3 100644 --- a/docs/sources/flow/config-language/files.md +++ b/docs/sources/flow/config-language/files.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/files/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/files/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/files/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/files/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/files/ -title: Files description: Learn about River files +title: Files weight: 100 --- diff --git a/docs/sources/flow/config-language/syntax.md b/docs/sources/flow/config-language/syntax.md index 5e21a5e37c1f..ee2eebed9b65 100644 --- a/docs/sources/flow/config-language/syntax.md +++ b/docs/sources/flow/config-language/syntax.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/config-language/syntax/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/config-language/syntax/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/config-language/syntax/ +- /docs/grafana-cloud/send-data/agent/flow/config-language/syntax/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/syntax/ -title: Syntax description: Learn about the River syntax +title: Syntax weight: 200 --- diff --git a/docs/sources/flow/getting-started/_index.md b/docs/sources/flow/getting-started/_index.md index 79d34abe6f92..cbb1b02ea445 100644 --- a/docs/sources/flow/getting-started/_index.md +++ b/docs/sources/flow/getting-started/_index.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/ - getting_started/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/ +description: Learn how to use Grafana Agent in flow mode menuTitle: Get started title: Get started with Grafana Agent in flow mode -description: Learn how to use Grafana Agent in flow mode weight: 200 --- diff --git a/docs/sources/flow/getting-started/collect-opentelemetry-data.md b/docs/sources/flow/getting-started/collect-opentelemetry-data.md index ecf484271d37..6d32c28dac4f 100644 --- a/docs/sources/flow/getting-started/collect-opentelemetry-data.md +++ b/docs/sources/flow/getting-started/collect-opentelemetry-data.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/collect-opentelemetry-data/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/collect-opentelemetry-data/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/collect-opentelemetry-data/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/collect-opentelemetry-data/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/collect-opentelemetry-data/ -title: Collect OpenTelemetry data description: Learn how to collect OpenTelemetry data +title: Collect OpenTelemetry data weight: 300 --- diff --git a/docs/sources/flow/getting-started/collect-prometheus-metrics.md b/docs/sources/flow/getting-started/collect-prometheus-metrics.md index b7bed5f92fe1..9cfbd468ce2a 100644 --- a/docs/sources/flow/getting-started/collect-prometheus-metrics.md +++ b/docs/sources/flow/getting-started/collect-prometheus-metrics.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/collect-prometheus-metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/collect-prometheus-metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/collect-prometheus-metrics/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/collect-prometheus-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/collect-prometheus-metrics/ -title: Collect and forward Prometheus metrics description: Learn how to collect and forward Prometheus metrics +title: Collect and forward Prometheus metrics weight: 200 --- diff --git a/docs/sources/flow/getting-started/configure-agent-clustering.md b/docs/sources/flow/getting-started/configure-agent-clustering.md index af7085b9d1f1..22d9cdd1942f 100644 --- a/docs/sources/flow/getting-started/configure-agent-clustering.md +++ b/docs/sources/flow/getting-started/configure-agent-clustering.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/configure-agent-clustering/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/configure-agent-clustering/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/configure-agent-clustering/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/configure-agent-clustering/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/configure-agent-clustering/ +description: Learn how to configure Grafana Agent clustering in an existing installation menuTitle: Configure Grafana Agent clustering title: Configure Grafana Agent clustering in an existing installation -description: Learn how to configure Grafana Agent clustering in an existing installation weight: 400 --- diff --git a/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md b/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md index b3319b72e193..5317150fdc95 100644 --- a/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md +++ b/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/distribute-prometheus-scrape-load/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/distribute-prometheus-scrape-load/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/distribute-prometheus-scrape-load/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/distribute-prometheus-scrape-load/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/distribute-prometheus-scrape-load/ +description: Learn how to distribute your Prometheus metrics scrape load menuTitle: Distribute Prometheus metrics scrape load title: Distribute Prometheus metrics scrape load -description: Learn how to distribute your Prometheus metrics scrape load weight: 500 --- diff --git a/docs/sources/flow/getting-started/migrating-from-operator.md b/docs/sources/flow/getting-started/migrating-from-operator.md index da62154488cb..9262930f4abf 100644 --- a/docs/sources/flow/getting-started/migrating-from-operator.md +++ b/docs/sources/flow/getting-started/migrating-from-operator.md @@ -1,4 +1,7 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/migrating-from-operator/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/migrating-from-operator/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-operator/ description: Migrating from Grafana Agent Operator to Grafana Agent Flow menuTitle: Migrate from Operator diff --git a/docs/sources/flow/getting-started/migrating-from-prometheus.md b/docs/sources/flow/getting-started/migrating-from-prometheus.md index 14e32241f83b..e6abc8f334db 100644 --- a/docs/sources/flow/getting-started/migrating-from-prometheus.md +++ b/docs/sources/flow/getting-started/migrating-from-prometheus.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/migrating-from-prometheus/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/migrating-from-prometheus/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/migrating-from-prometheus/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/migrating-from-prometheus/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-prometheus/ +description: Learn how to migrate from Prometheus to Grafana Agent Flow menuTitle: Migrate from Prometheus title: Migrate from Prometheus to Grafana Agent Flow -description: Learn how to migrate from Prometheus to Grafana Agent Flow weight: 320 --- diff --git a/docs/sources/flow/getting-started/migrating-from-promtail.md b/docs/sources/flow/getting-started/migrating-from-promtail.md index 7fbe1b109d16..09cf44a7bd39 100644 --- a/docs/sources/flow/getting-started/migrating-from-promtail.md +++ b/docs/sources/flow/getting-started/migrating-from-promtail.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/migrating-from-promtail/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/migrating-from-promtail/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/migrating-from-promtail/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/migrating-from-promtail/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-promtail/ +description: Learn how to migrate from Promtail to Grafana Agent Flow menuTitle: Migrate from Promtail title: Migrate from Promtail to Grafana Agent Flow -description: Learn how to migrate from Promtail to Grafana Agent Flow weight: 330 --- diff --git a/docs/sources/flow/getting-started/migrating-from-static.md b/docs/sources/flow/getting-started/migrating-from-static.md index 0b1f0bedd2d0..ff201deec463 100644 --- a/docs/sources/flow/getting-started/migrating-from-static.md +++ b/docs/sources/flow/getting-started/migrating-from-static.md @@ -3,8 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/migrating-from-static/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/migrating-from-static/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/migrating-from-static/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/migrating-from-static/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-static/ -description: Learn how to migrate your configuration from Grafana Agent Static mode to Flow mode +description: Learn how to migrate your configuration from Grafana Agent Static mode + to Flow mode menuTitle: Migrate from Static mode to Flow mode title: Migrate Grafana Agent from Static mode to Flow mode weight: 340 diff --git a/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md b/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md index 76764fb7276c..e0ac3996e04b 100644 --- a/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md +++ b/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md @@ -3,9 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/getting-started/opentelemetry-to-lgtm-stack/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/getting-started/opentelemetry-to-lgtm-stack/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/getting-started/opentelemetry-to-lgtm-stack/ +- /docs/grafana-cloud/send-data/agent/flow/getting-started/opentelemetry-to-lgtm-stack/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/opentelemetry-to-lgtm-stack/ +description: Learn how to collect OpenTelemetry data and forward it to the Grafana + stack title: OpenTelemetry to Grafana stack -description: Learn how to collect OpenTelemetry data and forward it to the Grafana stack weight: 350 --- diff --git a/docs/sources/flow/monitoring/_index.md b/docs/sources/flow/monitoring/_index.md index 41e5cffca7c8..184bd46b7a35 100644 --- a/docs/sources/flow/monitoring/_index.md +++ b/docs/sources/flow/monitoring/_index.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/monitoring/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/monitoring/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/monitoring/ +- /docs/grafana-cloud/send-data/agent/flow/monitoring/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/ -title: Monitoring Grafana Agent Flow description: Learn about monitoring Grafana Agent Flow +title: Monitoring Grafana Agent Flow weight: 500 --- diff --git a/docs/sources/flow/monitoring/component_metrics.md b/docs/sources/flow/monitoring/component_metrics.md index ba9762647f4a..7b94337bd2b7 100644 --- a/docs/sources/flow/monitoring/component_metrics.md +++ b/docs/sources/flow/monitoring/component_metrics.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/monitoring/component_metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/monitoring/component_metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/monitoring/component_metrics/ +- /docs/grafana-cloud/send-data/agent/flow/monitoring/component_metrics/ - component-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/component_metrics/ -title: Component metrics description: Learn about component metrics +title: Component metrics weight: 200 --- diff --git a/docs/sources/flow/monitoring/controller_metrics.md b/docs/sources/flow/monitoring/controller_metrics.md index f45b114724cb..03a05b0991eb 100644 --- a/docs/sources/flow/monitoring/controller_metrics.md +++ b/docs/sources/flow/monitoring/controller_metrics.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/monitoring/controller_metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/monitoring/controller_metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/monitoring/controller_metrics/ +- /docs/grafana-cloud/send-data/agent/flow/monitoring/controller_metrics/ - controller-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/controller_metrics/ -title: Controller metrics description: Learn about controller metrics +title: Controller metrics weight: 100 --- diff --git a/docs/sources/flow/monitoring/debugging.md b/docs/sources/flow/monitoring/debugging.md index cffa6f5ffb5d..423319addeb6 100644 --- a/docs/sources/flow/monitoring/debugging.md +++ b/docs/sources/flow/monitoring/debugging.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/monitoring/debugging/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/monitoring/debugging/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/monitoring/debugging/ +- /docs/grafana-cloud/send-data/agent/flow/monitoring/debugging/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/debugging/ -title: Debugging description: Learn about debugging +title: Debugging weight: 300 --- diff --git a/docs/sources/flow/reference/_index.md b/docs/sources/flow/reference/_index.md index e130628f0033..65ca0dac4a64 100644 --- a/docs/sources/flow/reference/_index.md +++ b/docs/sources/flow/reference/_index.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/ +- /docs/grafana-cloud/send-data/agent/flow/reference/ canonical: https://grafana.com/docs/agent/latest/flow/reference/ -title: Grafana Agent Flow Reference -menuTitle: Reference description: The reference-level documentaiton for Grafana Agent +menuTitle: Reference +title: Grafana Agent Flow Reference weight: 600 --- diff --git a/docs/sources/flow/reference/cli/_index.md b/docs/sources/flow/reference/cli/_index.md index e48a3f703623..556ee99f96d2 100644 --- a/docs/sources/flow/reference/cli/_index.md +++ b/docs/sources/flow/reference/cli/_index.md @@ -3,12 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/cli/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/cli/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/cli/ +- /docs/grafana-cloud/send-data/agent/flow/reference/cli/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/ -description: The Grafana Agent command line interface provides subcommands to perform - various operations. +description: Learn about the Grafana Agent command line interface menuTitle: Command-line interface title: The Grafana Agent command-line interface -description: Learn about the Grafana Agent command line interface weight: 100 --- diff --git a/docs/sources/flow/reference/cli/convert.md b/docs/sources/flow/reference/cli/convert.md index cd976f108784..483f21da6d29 100644 --- a/docs/sources/flow/reference/cli/convert.md +++ b/docs/sources/flow/reference/cli/convert.md @@ -3,14 +3,13 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/cli/convert/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/cli/convert/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/cli/convert/ +- /docs/grafana-cloud/send-data/agent/flow/reference/cli/convert/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/convert/ -description: The `convert` command converts supported configuration formats to River - format. +description: Learn about the convert command labels: stage: beta menuTitle: convert title: The convert command -description: Learn about the convert command weight: 100 --- diff --git a/docs/sources/flow/reference/cli/fmt.md b/docs/sources/flow/reference/cli/fmt.md index 18ae1fdddd41..0eb7d8635636 100644 --- a/docs/sources/flow/reference/cli/fmt.md +++ b/docs/sources/flow/reference/cli/fmt.md @@ -3,11 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/cli/fmt/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/cli/fmt/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/cli/fmt/ +- /docs/grafana-cloud/send-data/agent/flow/reference/cli/fmt/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/fmt/ -description: The `fmt` command formats a Grafana Agent configuration file. +description: Learn about the fmt command menuTitle: fmt title: The fmt command -description: Learn about the fmt command weight: 200 --- diff --git a/docs/sources/flow/reference/cli/run.md b/docs/sources/flow/reference/cli/run.md index 8b068b78ac3e..7eaf1285f916 100644 --- a/docs/sources/flow/reference/cli/run.md +++ b/docs/sources/flow/reference/cli/run.md @@ -3,12 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/cli/run/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/cli/run/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/cli/run/ +- /docs/grafana-cloud/send-data/agent/flow/reference/cli/run/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/run/ -description: The `run` command runs Grafana Agent in the foreground until an interrupt - is received. +description: Learn about the run command menuTitle: run title: The run command -description: Learn about the run command weight: 300 --- diff --git a/docs/sources/flow/reference/cli/tools.md b/docs/sources/flow/reference/cli/tools.md index ac888bda3fa6..5ee0409f084a 100644 --- a/docs/sources/flow/reference/cli/tools.md +++ b/docs/sources/flow/reference/cli/tools.md @@ -3,11 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/cli/tools/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/cli/tools/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/cli/tools/ +- /docs/grafana-cloud/send-data/agent/flow/reference/cli/tools/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/tools/ -description: Command line tools that read the WAL and provide statistical information. +description: Learn about the tools command menuTitle: tools title: The tools command -description: Learn about the tools command weight: 400 --- diff --git a/docs/sources/flow/reference/components/_index.md b/docs/sources/flow/reference/components/_index.md index 4acc33d412ec..74d21678c179 100644 --- a/docs/sources/flow/reference/components/_index.md +++ b/docs/sources/flow/reference/components/_index.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/ -title: Components reference description: Learn about the compenets in Grafana Agent +title: Components reference weight: 300 --- diff --git a/docs/sources/flow/reference/components/discovery.azure.md b/docs/sources/flow/reference/components/discovery.azure.md index 89e3df0d970e..5192299a1eeb 100644 --- a/docs/sources/flow/reference/components/discovery.azure.md +++ b/docs/sources/flow/reference/components/discovery.azure.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.azure/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.azure/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.azure/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.azure/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.azure/ -title: discovery.azure description: Learn about discovery.azure +title: discovery.azure --- # discovery.azure diff --git a/docs/sources/flow/reference/components/discovery.consul.md b/docs/sources/flow/reference/components/discovery.consul.md index 583b5497b550..884fa1fe602f 100644 --- a/docs/sources/flow/reference/components/discovery.consul.md +++ b/docs/sources/flow/reference/components/discovery.consul.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.consul/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.consul/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.consul/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.consul/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.consul/ -title: discovery.consul description: Learn about discovery.consul +title: discovery.consul --- # discovery.consul diff --git a/docs/sources/flow/reference/components/discovery.consulagent.md b/docs/sources/flow/reference/components/discovery.consulagent.md index 2fd4209a1979..6ff793d1933e 100644 --- a/docs/sources/flow/reference/components/discovery.consulagent.md +++ b/docs/sources/flow/reference/components/discovery.consulagent.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.consulagent/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.consulagent/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.consulagent/ -title: discovery.consulagent description: Learn about discovery.consulagent +title: discovery.consulagent --- # discovery.consulagent diff --git a/docs/sources/flow/reference/components/discovery.digitalocean.md b/docs/sources/flow/reference/components/discovery.digitalocean.md index b49c570e32d7..18b42714b421 100644 --- a/docs/sources/flow/reference/components/discovery.digitalocean.md +++ b/docs/sources/flow/reference/components/discovery.digitalocean.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.digitalocean/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.digitalocean/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.digitalocean/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.digitalocean/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.digitalocean/ -title: discovery.digitalocean description: Learn about discovery.digitalocean +title: discovery.digitalocean --- # discovery.digitalocean diff --git a/docs/sources/flow/reference/components/discovery.dns.md b/docs/sources/flow/reference/components/discovery.dns.md index 43497f6d3970..3a2615d5df29 100644 --- a/docs/sources/flow/reference/components/discovery.dns.md +++ b/docs/sources/flow/reference/components/discovery.dns.md @@ -1,12 +1,13 @@ --- aliases: -- /docs/agent/latest/flow/reference/components/discovery.dns +- /docs/agent/latest/flow/reference/components/discovery.dns/ - /docs/grafana-cloud/agent/flow/reference/components/discovery.dns/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.dns/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.dns/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.dns/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.dns/ -title: discovery.dns description: Learn about discovery.dns +title: discovery.dns --- # discovery.dns diff --git a/docs/sources/flow/reference/components/discovery.docker.md b/docs/sources/flow/reference/components/discovery.docker.md index 0501f64a81c1..076f00f75b21 100644 --- a/docs/sources/flow/reference/components/discovery.docker.md +++ b/docs/sources/flow/reference/components/discovery.docker.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.docker/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.docker/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.docker/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.docker/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.docker/ -title: discovery.docker description: Learn about discovery.docker +title: discovery.docker --- # discovery.docker diff --git a/docs/sources/flow/reference/components/discovery.dockerswarm.md b/docs/sources/flow/reference/components/discovery.dockerswarm.md index fbaa15c18a71..bf4eef2074e8 100644 --- a/docs/sources/flow/reference/components/discovery.dockerswarm.md +++ b/docs/sources/flow/reference/components/discovery.dockerswarm.md @@ -1,11 +1,12 @@ --- aliases: - - /docs/grafana-cloud/agent/flow/reference/components/discovery.dockerswarm/ - - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.dockerswarm/ - - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.dockerswarm/ +- /docs/grafana-cloud/agent/flow/reference/components/discovery.dockerswarm/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.dockerswarm/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.dockerswarm/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.dockerswarm/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.dockerswarm/ -title: discovery.dockerswarm description: Learn about discovery.dockerswarm +title: discovery.dockerswarm --- # discovery.dockerswarm diff --git a/docs/sources/flow/reference/components/discovery.ec2.md b/docs/sources/flow/reference/components/discovery.ec2.md index fd926e8c4a40..63a4cfc802f4 100644 --- a/docs/sources/flow/reference/components/discovery.ec2.md +++ b/docs/sources/flow/reference/components/discovery.ec2.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.ec2/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.ec2/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.ec2/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.ec2/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.ec2/ -title: discovery.ec2 description: Learn about discovery.ec2 +title: discovery.ec2 --- # discovery.ec2 diff --git a/docs/sources/flow/reference/components/discovery.eureka.md b/docs/sources/flow/reference/components/discovery.eureka.md index d1971de54442..b2f7e73ad85c 100644 --- a/docs/sources/flow/reference/components/discovery.eureka.md +++ b/docs/sources/flow/reference/components/discovery.eureka.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.eureka/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.eureka/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.eureka/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.eureka/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.eureka/ -title: discovery.eureka description: Learn about discovery.eureka +title: discovery.eureka --- # discovery.eureka diff --git a/docs/sources/flow/reference/components/discovery.file.md b/docs/sources/flow/reference/components/discovery.file.md index 168e529a468a..402406ee32fd 100644 --- a/docs/sources/flow/reference/components/discovery.file.md +++ b/docs/sources/flow/reference/components/discovery.file.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.file/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.file/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.file/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.file/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.file/ -title: discovery.file description: Learn about discovery.file +title: discovery.file --- # discovery.file diff --git a/docs/sources/flow/reference/components/discovery.gce.md b/docs/sources/flow/reference/components/discovery.gce.md index c15222c4763e..b7ca49aaf0e3 100644 --- a/docs/sources/flow/reference/components/discovery.gce.md +++ b/docs/sources/flow/reference/components/discovery.gce.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.gce/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.gce/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.gce/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.gce/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.gce/ -title: discovery.gce description: Learn about discovery.gce +title: discovery.gce --- # discovery.gce diff --git a/docs/sources/flow/reference/components/discovery.hetzner.md b/docs/sources/flow/reference/components/discovery.hetzner.md index 940589dbe576..1cf7f5c6ff72 100644 --- a/docs/sources/flow/reference/components/discovery.hetzner.md +++ b/docs/sources/flow/reference/components/discovery.hetzner.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.hetzner/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.hetzner/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.hetzner/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.hetzner/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.hetzner/ -title: discovery.hetzner description: Learn about discovery.hetzner +title: discovery.hetzner --- # discovery.hetzner diff --git a/docs/sources/flow/reference/components/discovery.http.md b/docs/sources/flow/reference/components/discovery.http.md index 6b2ed6a19d28..c8fd0aa348f4 100644 --- a/docs/sources/flow/reference/components/discovery.http.md +++ b/docs/sources/flow/reference/components/discovery.http.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.http/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.http/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.http/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.http/ -title: discovery.http description: Learn about discovery.http +title: discovery.http --- # discovery.http diff --git a/docs/sources/flow/reference/components/discovery.ionos.md b/docs/sources/flow/reference/components/discovery.ionos.md index 23f774a02bbb..0017b5ea95e8 100644 --- a/docs/sources/flow/reference/components/discovery.ionos.md +++ b/docs/sources/flow/reference/components/discovery.ionos.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.ionos/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.ionos/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.ionos/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.ionos/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.ionos/ -title: discovery.ionos description: Learn about discovery.ionos +title: discovery.ionos --- # discovery.ionos diff --git a/docs/sources/flow/reference/components/discovery.kubelet.md b/docs/sources/flow/reference/components/discovery.kubelet.md index 158e71aa7c7e..a99fdffa9739 100644 --- a/docs/sources/flow/reference/components/discovery.kubelet.md +++ b/docs/sources/flow/reference/components/discovery.kubelet.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.kubelet/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.kubelet/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.kubelet/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.kubelet/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kubelet/ +description: Learn about discovery.kubelet labels: stage: beta title: discovery.kubelet -description: Learn about discovery.kubelet --- # discovery.kubelet diff --git a/docs/sources/flow/reference/components/discovery.kubernetes.md b/docs/sources/flow/reference/components/discovery.kubernetes.md index da691c9f17b8..5b8cd870af6e 100644 --- a/docs/sources/flow/reference/components/discovery.kubernetes.md +++ b/docs/sources/flow/reference/components/discovery.kubernetes.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.kubernetes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.kubernetes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kubernetes/ -title: discovery.kubernetes description: Learn about discovery.kubernetes +title: discovery.kubernetes --- # discovery.kubernetes diff --git a/docs/sources/flow/reference/components/discovery.kuma.md b/docs/sources/flow/reference/components/discovery.kuma.md index 682edaca51f3..6e799a6147a8 100644 --- a/docs/sources/flow/reference/components/discovery.kuma.md +++ b/docs/sources/flow/reference/components/discovery.kuma.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.kuma/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.kuma/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.kuma/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.kuma/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kuma/ -title: discovery.kuma description: Learn about discovery.kuma +title: discovery.kuma --- # discovery.kuma diff --git a/docs/sources/flow/reference/components/discovery.lightsail.md b/docs/sources/flow/reference/components/discovery.lightsail.md index 3b1c98fa9ce3..a2b47841217d 100644 --- a/docs/sources/flow/reference/components/discovery.lightsail.md +++ b/docs/sources/flow/reference/components/discovery.lightsail.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.lightsail/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.lightsail/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.lightsail/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.lightsail/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.lightsail/ -title: discovery.lightsail description: Learn about discovery.lightsail +title: discovery.lightsail --- # discovery.lightsail diff --git a/docs/sources/flow/reference/components/discovery.linode.md b/docs/sources/flow/reference/components/discovery.linode.md index 92433a6cccf6..5bad40f86174 100644 --- a/docs/sources/flow/reference/components/discovery.linode.md +++ b/docs/sources/flow/reference/components/discovery.linode.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.linode/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.linode/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.linode/ -title: discovery.linode description: Learn about discovery.linode +title: discovery.linode --- # discovery.linode diff --git a/docs/sources/flow/reference/components/discovery.marathon.md b/docs/sources/flow/reference/components/discovery.marathon.md index 03588dbe2d3a..194e8ca24107 100644 --- a/docs/sources/flow/reference/components/discovery.marathon.md +++ b/docs/sources/flow/reference/components/discovery.marathon.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.marathon/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.marathon/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.marathon/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.marathon/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.marathon/ -title: discovery.marathon description: Learn about discovery.marathon +title: discovery.marathon --- # discovery.marathon diff --git a/docs/sources/flow/reference/components/discovery.nerve.md b/docs/sources/flow/reference/components/discovery.nerve.md index 2f39e6feeac1..e9cd8afcbd60 100644 --- a/docs/sources/flow/reference/components/discovery.nerve.md +++ b/docs/sources/flow/reference/components/discovery.nerve.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.nerve/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.nerve/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.nerve/ -title: discovery.nerve description: Learn about discovery.nerve +title: discovery.nerve --- # discovery.nerve diff --git a/docs/sources/flow/reference/components/discovery.nomad.md b/docs/sources/flow/reference/components/discovery.nomad.md index 4797465ae9fb..7df1466081fb 100644 --- a/docs/sources/flow/reference/components/discovery.nomad.md +++ b/docs/sources/flow/reference/components/discovery.nomad.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.nomad/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.nomad/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.nomad/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.nomad/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.nomad/ -title: discovery.nomad description: Learn about discovery.nomad +title: discovery.nomad --- # discovery.nomad diff --git a/docs/sources/flow/reference/components/discovery.openstack.md b/docs/sources/flow/reference/components/discovery.openstack.md index fea582d7f5cd..984fbf2fa4b4 100644 --- a/docs/sources/flow/reference/components/discovery.openstack.md +++ b/docs/sources/flow/reference/components/discovery.openstack.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.openstack/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.openstack/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.openstack/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.openstack/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.openstack/ -title: discovery.openstack description: Learn about discovery.openstack +title: discovery.openstack --- # discovery.openstack diff --git a/docs/sources/flow/reference/components/discovery.puppetdb.md b/docs/sources/flow/reference/components/discovery.puppetdb.md index fd910de40590..3886b7d79726 100644 --- a/docs/sources/flow/reference/components/discovery.puppetdb.md +++ b/docs/sources/flow/reference/components/discovery.puppetdb.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.puppetdb/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.puppetdb/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.puppetdb/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.puppetdb/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.puppetdb/ -title: discovery.puppetdb description: Learn about discovery.puppetdb +title: discovery.puppetdb --- # discovery.puppetdb diff --git a/docs/sources/flow/reference/components/discovery.relabel.md b/docs/sources/flow/reference/components/discovery.relabel.md index 7e7b42b5381c..71b71fea5ef5 100644 --- a/docs/sources/flow/reference/components/discovery.relabel.md +++ b/docs/sources/flow/reference/components/discovery.relabel.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.relabel/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.relabel/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.relabel/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.relabel/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.relabel/ -title: discovery.relabel description: Learn about discovery.relabel +title: discovery.relabel --- # discovery.relabel diff --git a/docs/sources/flow/reference/components/discovery.scaleway.md b/docs/sources/flow/reference/components/discovery.scaleway.md index 699658c51007..59263435ab1f 100644 --- a/docs/sources/flow/reference/components/discovery.scaleway.md +++ b/docs/sources/flow/reference/components/discovery.scaleway.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.scaleway/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.scaleway/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.scaleway/ -title: discovery.scaleway description: Learn about discovery.scaleway +title: discovery.scaleway --- # discovery.scaleway diff --git a/docs/sources/flow/reference/components/discovery.serverset.md b/docs/sources/flow/reference/components/discovery.serverset.md index 9b56697fdcf6..c0ab1f130b6d 100644 --- a/docs/sources/flow/reference/components/discovery.serverset.md +++ b/docs/sources/flow/reference/components/discovery.serverset.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.serverset/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.serverset/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.serverset/ -title: discovery.serverset description: Learn about discovery.serverset +title: discovery.serverset --- # discovery.serverset diff --git a/docs/sources/flow/reference/components/discovery.triton.md b/docs/sources/flow/reference/components/discovery.triton.md index 4a6817968ea0..1b449010aef5 100644 --- a/docs/sources/flow/reference/components/discovery.triton.md +++ b/docs/sources/flow/reference/components/discovery.triton.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.triton/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.triton/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.triton/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.triton/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.triton/ -title: discovery.triton description: Learn about discovery.triton +title: discovery.triton --- # discovery.triton diff --git a/docs/sources/flow/reference/components/discovery.uyuni.md b/docs/sources/flow/reference/components/discovery.uyuni.md index 6be45ab5f7e3..5f6d415b472e 100644 --- a/docs/sources/flow/reference/components/discovery.uyuni.md +++ b/docs/sources/flow/reference/components/discovery.uyuni.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/discovery.uyuni/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/discovery.uyuni/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/discovery.uyuni/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/discovery.uyuni/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.uyuni/ -title: discovery.uyuni description: Learn about discovery.uyuni +title: discovery.uyuni --- # discovery.uyuni diff --git a/docs/sources/flow/reference/components/faro.receiver.md b/docs/sources/flow/reference/components/faro.receiver.md index 2bc7c8e38ffe..99d23c2b0842 100644 --- a/docs/sources/flow/reference/components/faro.receiver.md +++ b/docs/sources/flow/reference/components/faro.receiver.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/faro.receiver/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/faro.receiver/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/faro.receiver/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/faro.receiver/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/faro.receiver/ -title: faro.receiver description: Learn about the faro.receiver +title: faro.receiver --- # faro.receiver diff --git a/docs/sources/flow/reference/components/local.file.md b/docs/sources/flow/reference/components/local.file.md index 5494f4104e6a..0199a088a71c 100644 --- a/docs/sources/flow/reference/components/local.file.md +++ b/docs/sources/flow/reference/components/local.file.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/local.file/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/local.file/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/local.file/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/local.file/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/local.file/ -title: local.file description: Learn about local.file +title: local.file --- # local.file diff --git a/docs/sources/flow/reference/components/local.file_match.md b/docs/sources/flow/reference/components/local.file_match.md index 0ab8a05e988f..72be1310a749 100644 --- a/docs/sources/flow/reference/components/local.file_match.md +++ b/docs/sources/flow/reference/components/local.file_match.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/local.file_match/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/local.file_match/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/local.file_match/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/local.file_match/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/local.file_match/ -title: local.file_match description: Learn about local.file_match +title: local.file_match --- # local.file_match diff --git a/docs/sources/flow/reference/components/loki.echo.md b/docs/sources/flow/reference/components/loki.echo.md index 205af6899d7c..4499bf3efde7 100644 --- a/docs/sources/flow/reference/components/loki.echo.md +++ b/docs/sources/flow/reference/components/loki.echo.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.echo/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.echo/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.echo/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.echo/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.echo/ +description: Learn about loki.echo labels: stage: beta title: loki.echo -description: Learn about loki.echo --- # loki.echo diff --git a/docs/sources/flow/reference/components/loki.process.md b/docs/sources/flow/reference/components/loki.process.md index f21104263026..0387bb3c0af8 100644 --- a/docs/sources/flow/reference/components/loki.process.md +++ b/docs/sources/flow/reference/components/loki.process.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.process/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.process/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.process/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.process/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/ -title: loki.process description: Learn about loki.process +title: loki.process --- # loki.process diff --git a/docs/sources/flow/reference/components/loki.relabel.md b/docs/sources/flow/reference/components/loki.relabel.md index 4ce55943284e..14425715d3b2 100644 --- a/docs/sources/flow/reference/components/loki.relabel.md +++ b/docs/sources/flow/reference/components/loki.relabel.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.relabel/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.relabel/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.relabel/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.relabel/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.relabel/ -title: loki.relabel description: Learn about loki.relabel +title: loki.relabel --- # loki.relabel diff --git a/docs/sources/flow/reference/components/loki.source.api.md b/docs/sources/flow/reference/components/loki.source.api.md index 8fddd8a3cdb1..966589bd64a1 100644 --- a/docs/sources/flow/reference/components/loki.source.api.md +++ b/docs/sources/flow/reference/components/loki.source.api.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.api/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.api/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.api/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.api/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.api/ -title: loki.source.api description: Learn about loki.source.api +title: loki.source.api --- # loki.source.api diff --git a/docs/sources/flow/reference/components/loki.source.awsfirehose.md b/docs/sources/flow/reference/components/loki.source.awsfirehose.md index d0e2a9f175db..b080adcaced9 100644 --- a/docs/sources/flow/reference/components/loki.source.awsfirehose.md +++ b/docs/sources/flow/reference/components/loki.source.awsfirehose.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.awsfirehose/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.awsfirehose/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.awsfirehose/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.awsfirehose/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.awsfirehose/ -title: loki.source.awsfirehose description: Learn about loki.source.awsfirehose +title: loki.source.awsfirehose --- # loki.source.awsfirehose diff --git a/docs/sources/flow/reference/components/loki.source.azure_event_hubs.md b/docs/sources/flow/reference/components/loki.source.azure_event_hubs.md index 67755dc05a51..a90320e069ef 100644 --- a/docs/sources/flow/reference/components/loki.source.azure_event_hubs.md +++ b/docs/sources/flow/reference/components/loki.source.azure_event_hubs.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.azure_event_hubs/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.azure_event_hubs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.azure_event_hubs/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.azure_event_hubs/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.azure_event_hubs/ -title: loki.source.azure_event_hubs description: Learn about loki.source.azure_event_hubs +title: loki.source.azure_event_hubs --- # loki.source.azure_event_hubs diff --git a/docs/sources/flow/reference/components/loki.source.cloudflare.md b/docs/sources/flow/reference/components/loki.source.cloudflare.md index a24508a7b236..33d1bf0015a5 100644 --- a/docs/sources/flow/reference/components/loki.source.cloudflare.md +++ b/docs/sources/flow/reference/components/loki.source.cloudflare.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.cloudflare/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.cloudflare/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.cloudflare/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.cloudflare/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.cloudflare/ -title: loki.source.cloudflare description: Learn about loki.source.cloudflare +title: loki.source.cloudflare --- # loki.source.cloudflare diff --git a/docs/sources/flow/reference/components/loki.source.docker.md b/docs/sources/flow/reference/components/loki.source.docker.md index 82ffff474b44..0bb11ddecb17 100644 --- a/docs/sources/flow/reference/components/loki.source.docker.md +++ b/docs/sources/flow/reference/components/loki.source.docker.md @@ -1,12 +1,13 @@ --- aliases: -- /docs/agent/latest/flow/reference/components/loki.source.docker +- /docs/agent/latest/flow/reference/components/loki.source.docker/ - /docs/grafana-cloud/agent/flow/reference/components/loki.source.docker/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.docker/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.docker/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.docker/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.docker/ -title: loki.source.docker description: Learn about loki.source.docker +title: loki.source.docker --- # loki.source.docker diff --git a/docs/sources/flow/reference/components/loki.source.file.md b/docs/sources/flow/reference/components/loki.source.file.md index 812e5c92c7fc..2e9c8d9f333b 100644 --- a/docs/sources/flow/reference/components/loki.source.file.md +++ b/docs/sources/flow/reference/components/loki.source.file.md @@ -1,11 +1,12 @@ --- aliases: - - /docs/grafana-cloud/agent/flow/reference/components/loki.source.file/ - - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.file/ - - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.file/ +- /docs/grafana-cloud/agent/flow/reference/components/loki.source.file/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.file/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.file/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.file/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.file/ -title: loki.source.file description: Learn about loki.source.file +title: loki.source.file --- # loki.source.file diff --git a/docs/sources/flow/reference/components/loki.source.gcplog.md b/docs/sources/flow/reference/components/loki.source.gcplog.md index c29e1e7c340a..3379a43c32a9 100644 --- a/docs/sources/flow/reference/components/loki.source.gcplog.md +++ b/docs/sources/flow/reference/components/loki.source.gcplog.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.gcplog/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.gcplog/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.gcplog/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.gcplog/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.gcplog/ -title: loki.source.gcplog description: Learn about loki.source.gcplog +title: loki.source.gcplog --- # loki.source.gcplog diff --git a/docs/sources/flow/reference/components/loki.source.gelf.md b/docs/sources/flow/reference/components/loki.source.gelf.md index 0ef04bcc084f..e8544fe0248f 100644 --- a/docs/sources/flow/reference/components/loki.source.gelf.md +++ b/docs/sources/flow/reference/components/loki.source.gelf.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.gelf/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.gelf/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.gelf/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.gelf/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.gelf/ -title: loki.source.gelf description: Learn about loki.source.gelf +title: loki.source.gelf --- # loki.source.gelf diff --git a/docs/sources/flow/reference/components/loki.source.heroku.md b/docs/sources/flow/reference/components/loki.source.heroku.md index 6fe1065afdaf..f98b00312062 100644 --- a/docs/sources/flow/reference/components/loki.source.heroku.md +++ b/docs/sources/flow/reference/components/loki.source.heroku.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.heroku/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.heroku/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.heroku/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.heroku/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.heroku/ -title: loki.source.heroku description: Learn about loki.source.heroku +title: loki.source.heroku --- # loki.source.heroku diff --git a/docs/sources/flow/reference/components/loki.source.journal.md b/docs/sources/flow/reference/components/loki.source.journal.md index 4b8c6941b130..26a1922b7aeb 100644 --- a/docs/sources/flow/reference/components/loki.source.journal.md +++ b/docs/sources/flow/reference/components/loki.source.journal.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.journal/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.journal/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.journal/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.journal/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.journal/ -title: loki.source.journal description: Learn about loki.source.journal +title: loki.source.journal --- # loki.source.journal diff --git a/docs/sources/flow/reference/components/loki.source.kafka.md b/docs/sources/flow/reference/components/loki.source.kafka.md index a93e870cdabd..4110177d7d09 100644 --- a/docs/sources/flow/reference/components/loki.source.kafka.md +++ b/docs/sources/flow/reference/components/loki.source.kafka.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.kafka/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.kafka/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.kafka/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.kafka/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kafka/ -title: loki.source.kafka description: Learn about loki.source.kafka +title: loki.source.kafka --- # loki.source.kafka diff --git a/docs/sources/flow/reference/components/loki.source.kubernetes.md b/docs/sources/flow/reference/components/loki.source.kubernetes.md index 48db37ab6e70..cde01d3172bc 100644 --- a/docs/sources/flow/reference/components/loki.source.kubernetes.md +++ b/docs/sources/flow/reference/components/loki.source.kubernetes.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.kubernetes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.kubernetes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kubernetes/ +description: Learn about loki.source.kubernetes labels: stage: experimental title: loki.source.kubernetes -description: Learn about loki.source.kubernetes --- # loki.source.kubernetes diff --git a/docs/sources/flow/reference/components/loki.source.kubernetes_events.md b/docs/sources/flow/reference/components/loki.source.kubernetes_events.md index 68168544d994..9e7df1f037d9 100644 --- a/docs/sources/flow/reference/components/loki.source.kubernetes_events.md +++ b/docs/sources/flow/reference/components/loki.source.kubernetes_events.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.kubernetes_events/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.kubernetes_events/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.kubernetes_events/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.kubernetes_events/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kubernetes_events/ -title: loki.source.kubernetes_events description: Learn about loki.source.kubernetes_events +title: loki.source.kubernetes_events --- # loki.source.kubernetes_events diff --git a/docs/sources/flow/reference/components/loki.source.podlogs.md b/docs/sources/flow/reference/components/loki.source.podlogs.md index f5f1b00fbd73..9fd5ad109dcd 100644 --- a/docs/sources/flow/reference/components/loki.source.podlogs.md +++ b/docs/sources/flow/reference/components/loki.source.podlogs.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.podlogs/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.podlogs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.podlogs/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.podlogs/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.podlogs/ +description: Learn about loki.source.podlogs labels: stage: experimental title: loki.source.podlogs -description: Learn about loki.source.podlogs --- # loki.source.podlogs diff --git a/docs/sources/flow/reference/components/loki.source.syslog.md b/docs/sources/flow/reference/components/loki.source.syslog.md index ebb70010744b..3b91c152b8bc 100644 --- a/docs/sources/flow/reference/components/loki.source.syslog.md +++ b/docs/sources/flow/reference/components/loki.source.syslog.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.syslog/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.syslog/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.syslog/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.syslog/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.syslog/ -title: loki.source.syslog description: Learn about loki.source.syslog +title: loki.source.syslog --- # loki.source.syslog diff --git a/docs/sources/flow/reference/components/loki.source.windowsevent.md b/docs/sources/flow/reference/components/loki.source.windowsevent.md index bf2e0e2c1621..4c8faf4059f2 100644 --- a/docs/sources/flow/reference/components/loki.source.windowsevent.md +++ b/docs/sources/flow/reference/components/loki.source.windowsevent.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.source.windowsevent/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.source.windowsevent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.source.windowsevent/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.source.windowsevent/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.windowsevent/ -title: loki.source.windowsevent description: Learn about loki.windowsevent +title: loki.source.windowsevent --- # loki.source.windowsevent diff --git a/docs/sources/flow/reference/components/loki.write.md b/docs/sources/flow/reference/components/loki.write.md index 7246a66f6897..4dd21097b720 100644 --- a/docs/sources/flow/reference/components/loki.write.md +++ b/docs/sources/flow/reference/components/loki.write.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/loki.write/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/loki.write/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/loki.write/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/loki.write/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.write/ -title: loki.write description: Learn about loki.write +title: loki.write --- # loki.write diff --git a/docs/sources/flow/reference/components/mimir.rules.kubernetes.md b/docs/sources/flow/reference/components/mimir.rules.kubernetes.md index b87a8dc2e589..88bc56acc751 100644 --- a/docs/sources/flow/reference/components/mimir.rules.kubernetes.md +++ b/docs/sources/flow/reference/components/mimir.rules.kubernetes.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/mimir.rules.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/mimir.rules.kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/mimir.rules.kubernetes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/mimir.rules.kubernetes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/mimir.rules.kubernetes/ +description: Learn about mimir.rules.kubernetes labels: stage: beta title: mimir.rules.kubernetes -description: Learn about mimir.rules.kubernetes --- # mimir.rules.kubernetes diff --git a/docs/sources/flow/reference/components/module.file.md b/docs/sources/flow/reference/components/module.file.md index 41ea97532d1d..7e976cb5d861 100644 --- a/docs/sources/flow/reference/components/module.file.md +++ b/docs/sources/flow/reference/components/module.file.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/module.file/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/module.file/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/module.file/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/module.file/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.file/ +description: Learn about module.file labels: stage: beta title: module.file -description: Learn about module.file --- # module.file diff --git a/docs/sources/flow/reference/components/module.git.md b/docs/sources/flow/reference/components/module.git.md index 6f0867f5fdcc..21e9ad885486 100644 --- a/docs/sources/flow/reference/components/module.git.md +++ b/docs/sources/flow/reference/components/module.git.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/module.git/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/module.git/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/module.git/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/module.git/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.git/ +description: Learn about module.git labels: stage: beta title: module.git -description: Learn about module.git --- # module.git diff --git a/docs/sources/flow/reference/components/module.http.md b/docs/sources/flow/reference/components/module.http.md index d93d1c7d3e97..959fdb48418f 100644 --- a/docs/sources/flow/reference/components/module.http.md +++ b/docs/sources/flow/reference/components/module.http.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/module.http/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/module.http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/module.http/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/module.http/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.http/ +description: Learn about module.http labels: stage: beta title: module.http -description: Learn about module.http --- # module.http diff --git a/docs/sources/flow/reference/components/module.string.md b/docs/sources/flow/reference/components/module.string.md index 7b9284e2f4c1..497c320ceae8 100644 --- a/docs/sources/flow/reference/components/module.string.md +++ b/docs/sources/flow/reference/components/module.string.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/module.string/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/module.string/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/module.string/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/module.string/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.string/ +description: Learn about module.string labels: stage: beta title: module.string -description: Learn about module.string --- # module.string diff --git a/docs/sources/flow/reference/components/otelcol.auth.basic.md b/docs/sources/flow/reference/components/otelcol.auth.basic.md index 94906d4f87dc..885eb53f09fa 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.basic.md +++ b/docs/sources/flow/reference/components/otelcol.auth.basic.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.auth.basic/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.auth.basic/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.auth.basic/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.auth.basic/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.basic/ -title: otelcol.auth.basic description: Learn about otelcol.auth.basic +title: otelcol.auth.basic --- # otelcol.auth.basic diff --git a/docs/sources/flow/reference/components/otelcol.auth.bearer.md b/docs/sources/flow/reference/components/otelcol.auth.bearer.md index 9f3ba25c0c6a..718789603b49 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.bearer.md +++ b/docs/sources/flow/reference/components/otelcol.auth.bearer.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.auth.bearer/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.auth.bearer/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.auth.bearer/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.auth.bearer/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.bearer/ -title: otelcol.auth.bearer description: Learn about otelcol.auth.bearer +title: otelcol.auth.bearer --- # otelcol.auth.bearer diff --git a/docs/sources/flow/reference/components/otelcol.auth.headers.md b/docs/sources/flow/reference/components/otelcol.auth.headers.md index b07b9a79373e..dd2fdf647eae 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.headers.md +++ b/docs/sources/flow/reference/components/otelcol.auth.headers.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.auth.headers/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.auth.headers/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.auth.headers/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.auth.headers/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.headers/ -title: otelcol.auth.headers description: Learn about otelcol.auth.headers +title: otelcol.auth.headers --- # otelcol.auth.headers diff --git a/docs/sources/flow/reference/components/otelcol.auth.oauth2.md b/docs/sources/flow/reference/components/otelcol.auth.oauth2.md index b4f0cdd686e9..3ef5bc26880a 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.oauth2.md +++ b/docs/sources/flow/reference/components/otelcol.auth.oauth2.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.auth.oauth2/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.auth.oauth2/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.auth.oauth2/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.auth.oauth2/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.oauth2/ -title: otelcol.auth.oauth2 description: Learn about otelcol.auth.oauth2 +title: otelcol.auth.oauth2 --- # otelcol.auth.oauth2 diff --git a/docs/sources/flow/reference/components/otelcol.auth.sigv4.md b/docs/sources/flow/reference/components/otelcol.auth.sigv4.md index 1c21d0c5320f..e4fc91df2832 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.sigv4.md +++ b/docs/sources/flow/reference/components/otelcol.auth.sigv4.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.auth.sigv4/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.auth.sigv4/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.auth.sigv4/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.auth.sigv4/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.sigv4/ -title: otelcol.auth.sigv4 description: Learn about otelcol.auth.sigv4 +title: otelcol.auth.sigv4 --- # otelcol.auth.sigv4 diff --git a/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md b/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md index 7c87977142aa..6b8f71dbc648 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md +++ b/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md @@ -1,9 +1,12 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.connector.servicegraph/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.connector.servicegraph/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.servicegraph/ +description: Learn about otelcol.connector.servicegraph labels: stage: experimental title: otelcol.connector.servicegraph -description: Learn about otelcol.connector.servicegraph --- # otelcol.connector.servicegraph diff --git a/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md b/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md index 91e5332b0a98..99c28fc3b15f 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md +++ b/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.connector.spanlogs/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.connector.spanlogs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.connector.spanlogs/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.connector.spanlogs/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.spanlogs/ -title: otelcol.connector.spanlogs description: Learn about otelcol.connector.spanlogs +title: otelcol.connector.spanlogs --- # otelcol.connector.spanlogs diff --git a/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md b/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md index 9f210c14734e..029adcf45f60 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md +++ b/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.connector.spanmetrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.connector.spanmetrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.connector.spanmetrics/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.connector.spanmetrics/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.spanmetrics/ +description: Learn about otelcol.connector.spanmetrics labels: stage: experimental title: otelcol.connector.spanmetrics -description: Learn about otelcol.connector.spanmetrics --- # otelcol.connector.spanmetrics diff --git a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md index 9b9073dc6501..5e42e1d318cf 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.loadbalancing/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.loadbalancing/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.loadbalancing/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.loadbalancing/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.loadbalancing/ +description: Learn about otelcol.exporter.loadbalancing labels: stage: beta title: otelcol.exporter.loadbalancing -description: Learn about otelcol.exporter.loadbalancing --- # otelcol.exporter.loadbalancing diff --git a/docs/sources/flow/reference/components/otelcol.exporter.logging.md b/docs/sources/flow/reference/components/otelcol.exporter.logging.md index e99efa07eede..fe0c7886face 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.logging.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.logging.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.logging/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.logging/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.logging/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.logging/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.logging/ -title: otelcol.exporter.logging description: Learn about otelcol.exporter.logging +title: otelcol.exporter.logging --- # otelcol.exporter.logging diff --git a/docs/sources/flow/reference/components/otelcol.exporter.loki.md b/docs/sources/flow/reference/components/otelcol.exporter.loki.md index d9526fba561f..53d765e520ff 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loki.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loki.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.loki/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.loki/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.loki/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.loki/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.loki/ -title: otelcol.exporter.loki description: Learn about otelcol.exporter.loki +title: otelcol.exporter.loki --- # otelcol.exporter.loki diff --git a/docs/sources/flow/reference/components/otelcol.exporter.otlp.md b/docs/sources/flow/reference/components/otelcol.exporter.otlp.md index 348b73ee5fb1..4b244627de03 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.otlp.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.otlp.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.otlp/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.otlp/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.otlp/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.otlp/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.otlp/ -title: otelcol.exporter.otlp description: Learn about otelcol.exporter.otlp +title: otelcol.exporter.otlp --- # otelcol.exporter.otlp diff --git a/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md b/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md index 8782d6b30bea..c8242228f8b5 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.otlphttp/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.otlphttp/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.otlphttp/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.otlphttp/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.otlphttp/ -title: otelcol.exporter.otlphttp description: Learn about otelcol.exporter.otlphttp +title: otelcol.exporter.otlphttp --- # otelcol.exporter.otlphttp diff --git a/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md b/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md index e3b3c08416a8..8c8f81d133d1 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.prometheus/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.prometheus/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.prometheus/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.exporter.prometheus/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.prometheus/ -title: otelcol.exporter.prometheus description: Learn about otelcol.exporter.prometheus +title: otelcol.exporter.prometheus --- # otelcol.exporter.prometheus diff --git a/docs/sources/flow/reference/components/otelcol.extension.jaeger_remote_sampling.md b/docs/sources/flow/reference/components/otelcol.extension.jaeger_remote_sampling.md index 9ef641fee047..650407ff0a0b 100644 --- a/docs/sources/flow/reference/components/otelcol.extension.jaeger_remote_sampling.md +++ b/docs/sources/flow/reference/components/otelcol.extension.jaeger_remote_sampling.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ +description: Learn about otelcol.extension.jaeger_remote_sampling label: stage: experimental title: otelcol.extension.jaeger_remote_sampling -description: Learn about otelcol.extension.jaeger_remote_sampling --- # otelcol.extension.jaeger_remote_sampling diff --git a/docs/sources/flow/reference/components/otelcol.processor.attributes.md b/docs/sources/flow/reference/components/otelcol.processor.attributes.md index 39af8475dd3f..4125de260d9c 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.attributes.md +++ b/docs/sources/flow/reference/components/otelcol.processor.attributes.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.attributes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.attributes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.attributes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.attributes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.attributes/ -title: otelcol.processor.attributes description: Learn about otelcol.processor.attributes +title: otelcol.processor.attributes --- # otelcol.processor.attributes diff --git a/docs/sources/flow/reference/components/otelcol.processor.batch.md b/docs/sources/flow/reference/components/otelcol.processor.batch.md index 5216d88259fb..a6618da0d672 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.batch.md +++ b/docs/sources/flow/reference/components/otelcol.processor.batch.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.batch/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.batch/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.batch/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.batch/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.batch/ -title: otelcol.processor.batch description: Learn about otelcol.processor.batch +title: otelcol.processor.batch --- # otelcol.processor.batch diff --git a/docs/sources/flow/reference/components/otelcol.processor.discovery.md b/docs/sources/flow/reference/components/otelcol.processor.discovery.md index 14d36d9e13b3..cbeb805c862b 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.discovery.md +++ b/docs/sources/flow/reference/components/otelcol.processor.discovery.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.discovery/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.discovery/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.discovery/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.discovery/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.discovery/ -title: otelcol.processor.discovery description: Learn about otelcol.processor.discovery +title: otelcol.processor.discovery --- # otelcol.processor.discovery diff --git a/docs/sources/flow/reference/components/otelcol.processor.filter.md b/docs/sources/flow/reference/components/otelcol.processor.filter.md index d941665b2d38..e5220c60e59b 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.filter.md +++ b/docs/sources/flow/reference/components/otelcol.processor.filter.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.filter/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.filter/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.filter/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.filter/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.filter/ +description: Learn about otelcol.processor.filter labels: stage: experimental title: otelcol.processor.filter -description: Learn about otelcol.processor.filter --- # otelcol.processor.filter diff --git a/docs/sources/flow/reference/components/otelcol.processor.k8sattributes.md b/docs/sources/flow/reference/components/otelcol.processor.k8sattributes.md index dd06860a4efc..7b323ddaeeea 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.k8sattributes.md +++ b/docs/sources/flow/reference/components/otelcol.processor.k8sattributes.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.k8sattributes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.k8sattributes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.k8sattributes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.k8sattributes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.k8sattributes/ -title: otelcol.processor.k8sattributes description: Learn about otelcol.processor.k8sattributes +title: otelcol.processor.k8sattributes --- # otelcol.processor.k8sattributes diff --git a/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md b/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md index 08ab82396c32..ec22aba18ec4 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md +++ b/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.memory_limiter/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.memory_limiter/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.memory_limiter/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.memory_limiter/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.memory_limiter/ -title: otelcol.processor.memory_limiter description: Learn about otelcol.processor.memory_limiter +title: otelcol.processor.memory_limiter --- # otelcol.processor.memory_limiter diff --git a/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md b/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md index 32bbd8bd15a9..a6e23edf86bb 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md +++ b/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md @@ -1,9 +1,12 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.probabilistic_sampler/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.probabilistic_sampler/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.probabilistic_sampler/ +description: Learn about telcol.processor.probabilistic_sampler labels: stage: experimental title: otelcol.processor.probabilistic_sampler -description: Learn about telcol.processor.probabilistic_sampler --- # otelcol.processor.probabilistic_sampler diff --git a/docs/sources/flow/reference/components/otelcol.processor.span.md b/docs/sources/flow/reference/components/otelcol.processor.span.md index 81ecdacf513e..2484054ab7e3 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.span.md +++ b/docs/sources/flow/reference/components/otelcol.processor.span.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.span/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.span/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.span/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.span/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.span/ +description: Learn about otelcol.processor.span labels: stage: experimental title: otelcol.processor.span -description: Learn about otelcol.processor.span --- # otelcol.processor.span diff --git a/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md b/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md index 97e6072b9731..990c49b322b1 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md +++ b/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.tail_sampling/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.tail_sampling/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.tail_sampling/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.tail_sampling/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.tail_sampling/ +description: Learn about otelcol.processor.tail_sampling labels: stage: beta title: otelcol.processor.tail_sampling -description: Learn about otelcol.processor.tail_sampling --- # otelcol.processor.tail_sampling diff --git a/docs/sources/flow/reference/components/otelcol.processor.transform.md b/docs/sources/flow/reference/components/otelcol.processor.transform.md index 04be52e99eaf..21704f6715d2 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.transform.md +++ b/docs/sources/flow/reference/components/otelcol.processor.transform.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.processor.transform/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.processor.transform/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.processor.transform/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.processor.transform/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.transform/ +description: Learn about otelcol.processor.transform labels: stage: experimental title: otelcol.processor.transform -description: Learn about otelcol.processor.transform --- # otelcol.processor.transform diff --git a/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md b/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md index 6dd59b2a5d93..ce87557ffb9f 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.jaeger/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.jaeger/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.jaeger/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.jaeger/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.jaeger/ -title: otelcol.receiver.jaeger description: Learn about otelcol.receiver.jaeger +title: otelcol.receiver.jaeger --- # otelcol.receiver.jaeger diff --git a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md index 4c332641a990..7e167e478645 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.kafka/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.kafka/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.kafka/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.kafka/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.kafka/ -title: otelcol.receiver.kafka description: Learn about otelcol.receiver.kafka +title: otelcol.receiver.kafka --- # otelcol.receiver.kafka diff --git a/docs/sources/flow/reference/components/otelcol.receiver.loki.md b/docs/sources/flow/reference/components/otelcol.receiver.loki.md index 1a3a1b234eb6..91344de46276 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.loki.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.loki.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.loki/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.loki/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.loki/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.loki/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.loki/ +description: Learn about otelcol.receiver.loki labels: stage: beta title: otelcol.receiver.loki -description: Learn about otelcol.receiver.loki --- # otelcol.receiver.loki diff --git a/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md b/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md index 6da48c06fc53..457feaf34cfd 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.opencensus/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.opencensus/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.opencensus/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.opencensus/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.opencensus/ -title: otelcol.receiver.opencensus description: Learn about otelcol.receiver.opencensus +title: otelcol.receiver.opencensus --- # otelcol.receiver.opencensus diff --git a/docs/sources/flow/reference/components/otelcol.receiver.otlp.md b/docs/sources/flow/reference/components/otelcol.receiver.otlp.md index 60f1f1748f9c..c995dca6d57e 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.otlp.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.otlp.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.otlp/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.otlp/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.otlp/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.otlp/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.otlp/ -title: otelcol.receiver.otlp description: Learn about otelcol.receiver.otlp +title: otelcol.receiver.otlp --- # otelcol.receiver.otlp diff --git a/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md b/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md index 61c16282551b..25bf3e9f4497 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.prometheus/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.prometheus/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.prometheus/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.prometheus/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.prometheus/ +description: Learn about otelcol.receiver.prometheus labels: stage: beta title: otelcol.receiver.prometheus -description: Learn about otelcol.receiver.prometheus --- # otelcol.receiver.prometheus diff --git a/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md b/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md index aa361f7a5233..1927861df7ad 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/otelcol.receiver.zipkin/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.receiver.zipkin/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.receiver.zipkin/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/otelcol.receiver.zipkin/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.zipkin/ -title: otelcol.receiver.zipkin description: Learn about otelcol.receiver.zipkin +title: otelcol.receiver.zipkin --- # otelcol.receiver.zipkin diff --git a/docs/sources/flow/reference/components/prometheus.exporter.agent.md b/docs/sources/flow/reference/components/prometheus.exporter.agent.md index 92ac0b31a860..e9a5c3061e95 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.agent.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.agent.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.agent/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.agent/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.agent/ -title: prometheus.exporter.agent description: Learn about prometheus.exporter.agen +title: prometheus.exporter.agent --- # prometheus.exporter.agent diff --git a/docs/sources/flow/reference/components/prometheus.exporter.apache.md b/docs/sources/flow/reference/components/prometheus.exporter.apache.md index f38021fab6be..5f060b9dc70d 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.apache.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.apache.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.apache/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.apache/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.apache/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.apache/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.apache/ -title: prometheus.exporter.apache description: Learn about prometheus.exporter.apache +title: prometheus.exporter.apache --- # prometheus.exporter.apache diff --git a/docs/sources/flow/reference/components/prometheus.exporter.azure.md b/docs/sources/flow/reference/components/prometheus.exporter.azure.md index 448575287351..7abc09666344 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.azure.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.azure.md @@ -1,11 +1,12 @@ --- aliases: - - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.azure/ - - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.azure/ - - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.azure/ +- /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.azure/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.azure/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.azure/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.azure/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.azure/ -title: prometheus.exporter.azure description: Learn about prometheus.exporter.azure +title: prometheus.exporter.azure --- # prometheus.exporter.azure diff --git a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md index 40cd6db39e0a..2b4faacbfbc6 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.blackbox/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.blackbox/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.blackbox/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.blackbox/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.blackbox/ -title: prometheus.exporter.blackbox description: Learn about prometheus.exporter.blackbox +title: prometheus.exporter.blackbox --- # prometheus.exporter.blackbox diff --git a/docs/sources/flow/reference/components/prometheus.exporter.cadvisor.md b/docs/sources/flow/reference/components/prometheus.exporter.cadvisor.md index 1f4f960d56b0..567783c38702 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.cadvisor.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.cadvisor.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.cadvisor/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.cadvisor/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.cadvisor/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.cadvisor/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.cadvisor/ -title: prometheus.exporter.cadvisor description: Learn about the prometheus.exporter.cadvisor +title: prometheus.exporter.cadvisor --- # prometheus.exporter.cadvisor diff --git a/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md b/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md index 2748ee521adc..6fc15b290106 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.cloudwatch/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.cloudwatch/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.cloudwatch/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.cloudwatch/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.cloudwatch/ -title: prometheus.exporter.cloudwatch description: Learn about prometheus.exporter.cloudwatch +title: prometheus.exporter.cloudwatch --- # prometheus.exporter.cloudwatch diff --git a/docs/sources/flow/reference/components/prometheus.exporter.consul.md b/docs/sources/flow/reference/components/prometheus.exporter.consul.md index d69385db0439..f8344b3a1b69 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.consul.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.consul.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.consul/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.consul/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.consul/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.consul/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.consul/ -title: prometheus.exporter.consul description: Learn about prometheus.exporter.consul +title: prometheus.exporter.consul --- # prometheus.exporter.consul diff --git a/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md b/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md index 60df052a07bb..ef2cde17f49b 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.dnsmasq/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.dnsmasq/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.dnsmasq/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.dnsmasq/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.dnsmasq/ -title: prometheus.exporter.dnsmasq description: Learn about prometheus.exporter.dnsmasq +title: prometheus.exporter.dnsmasq --- # prometheus.exporter.dnsmasq diff --git a/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md b/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md index 792d57995928..4b17ab0602bc 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.elasticsearch/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.elasticsearch/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.elasticsearch/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.elasticsearch/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.elasticsearch/ -title: prometheus.exporter.elasticsearch description: Learn about prometheus.exporter.elasticsearch +title: prometheus.exporter.elasticsearch --- # prometheus.exporter.elasticsearch diff --git a/docs/sources/flow/reference/components/prometheus.exporter.gcp.md b/docs/sources/flow/reference/components/prometheus.exporter.gcp.md index 9140ae58919c..1d76b646f518 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.gcp.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.gcp.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.gcp/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.gcp/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.gcp/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.gcp/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.gcp/ -title: prometheus.exporter.gcp description: Learn about prometheus.exporter.gcp +title: prometheus.exporter.gcp --- # prometheus.exporter.gcp diff --git a/docs/sources/flow/reference/components/prometheus.exporter.github.md b/docs/sources/flow/reference/components/prometheus.exporter.github.md index aab5f2ceb7dd..d0cf3620a251 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.github.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.github.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.github/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.github/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.github/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.github/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.github/ -title: prometheus.exporter.github description: Learn about prometheus.exporter.github +title: prometheus.exporter.github --- # prometheus.exporter.github diff --git a/docs/sources/flow/reference/components/prometheus.exporter.kafka.md b/docs/sources/flow/reference/components/prometheus.exporter.kafka.md index 901d0f9c2636..345ee443dda4 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.kafka.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.kafka.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.kafka/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.kafka/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.kafka/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.kafka/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.kafka/ -title: prometheus.exporter.kafka description: Learn about prometheus.exporter.kafka +title: prometheus.exporter.kafka --- # prometheus.exporter.kafka diff --git a/docs/sources/flow/reference/components/prometheus.exporter.memcached.md b/docs/sources/flow/reference/components/prometheus.exporter.memcached.md index fceb216a4d6a..92330cb70893 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.memcached.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.memcached.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.memcached/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.memcached/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.memcached/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.memcached/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.memcached/ -title: prometheus.exporter.memcached description: Learn about prometheus.exporter.memcached +title: prometheus.exporter.memcached --- # prometheus.exporter.memcached diff --git a/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md b/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md index babc512a2ca2..bd3b03ed04f4 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.mongodb/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.mongodb/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.mongodb/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.mongodb/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mongodb/ -title: prometheus.exporter.mongodb description: Learn about prometheus.exporter.mongodb +title: prometheus.exporter.mongodb --- # prometheus.exporter.mongodb diff --git a/docs/sources/flow/reference/components/prometheus.exporter.mssql.md b/docs/sources/flow/reference/components/prometheus.exporter.mssql.md index 66384a1aace1..84786ee074a0 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mssql.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mssql.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.mssql/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.mssql/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.mssql/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.mssql/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mssql/ -title: prometheus.exporter.mssql description: Learn about prometheus.exporter.mssql +title: prometheus.exporter.mssql --- # prometheus.exporter.mssql diff --git a/docs/sources/flow/reference/components/prometheus.exporter.mysql.md b/docs/sources/flow/reference/components/prometheus.exporter.mysql.md index a3b2569879a8..1d3ef28d816b 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mysql.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mysql.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.mysql/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.mysql/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.mysql/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.mysql/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mysql/ -title: prometheus.exporter.mysql description: Learn about prometheus.exporter.mysql +title: prometheus.exporter.mysql --- # prometheus.exporter.mysql diff --git a/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md b/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md index 06437927d7a3..c1449d56076c 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.oracledb/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.oracledb/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.oracledb/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.oracledb/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.oracledb/ -title: prometheus.exporter.oracledb description: Learn about prometheus.exporter.oracledb +title: prometheus.exporter.oracledb --- # prometheus.exporter.oracledb diff --git a/docs/sources/flow/reference/components/prometheus.exporter.postgres.md b/docs/sources/flow/reference/components/prometheus.exporter.postgres.md index c219c2a62d62..f76f7bacf86d 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.postgres.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.postgres.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.postgres/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.postgres/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.postgres/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.postgres/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.postgres/ +description: Learn about prometheus.exporter.postgres labels: stage: beta title: prometheus.exporter.postgres -description: Learn about prometheus.exporter.postgres --- # prometheus.exporter.postgres diff --git a/docs/sources/flow/reference/components/prometheus.exporter.process.md b/docs/sources/flow/reference/components/prometheus.exporter.process.md index 730071fc471d..284bcd204cda 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.process.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.process.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.process/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.process/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.process/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.process/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.process/ -title: prometheus.exporter.process description: Learn about prometheus.exporter.process +title: prometheus.exporter.process --- # prometheus.exporter.process diff --git a/docs/sources/flow/reference/components/prometheus.exporter.redis.md b/docs/sources/flow/reference/components/prometheus.exporter.redis.md index 7c310c801e6d..acc5ade5b32a 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.redis.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.redis.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.redis/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.redis/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.redis/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.redis/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.redis/ -title: prometheus.exporter.redis description: Learn about prometheus.exporter.redis +title: prometheus.exporter.redis --- # prometheus.exporter.redis diff --git a/docs/sources/flow/reference/components/prometheus.exporter.snmp.md b/docs/sources/flow/reference/components/prometheus.exporter.snmp.md index 448f51ff2aa3..47a0444110d9 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.snmp.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.snmp.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.snmp/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.snmp/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.snmp/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.snmp/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.snmp/ -title: prometheus.exporter.snmp description: Learn about prometheus.exporter.snmp +title: prometheus.exporter.snmp --- # prometheus.exporter.snmp diff --git a/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md b/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md index 5e06636dc43d..e290817292a4 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.snowflake/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.snowflake/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.snowflake/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.snowflake/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.snowflake/ -title: prometheus.exporter.snowflake description: Learn about prometheus.exporter.snowflake +title: prometheus.exporter.snowflake --- # prometheus.exporter.snowflake diff --git a/docs/sources/flow/reference/components/prometheus.exporter.squid.md b/docs/sources/flow/reference/components/prometheus.exporter.squid.md index 606b824dc8b7..b23dc1d0317e 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.squid.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.squid.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.squid/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.squid/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.squid/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.squid/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.squid/ -title: prometheus.exporter.squid description: Learn about prometheus.exporter.squid +title: prometheus.exporter.squid --- # prometheus.exporter.squid diff --git a/docs/sources/flow/reference/components/prometheus.exporter.statsd.md b/docs/sources/flow/reference/components/prometheus.exporter.statsd.md index f9258522de96..68c9fc78bf95 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.statsd.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.statsd.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.statsd/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.statsd/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.statsd/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.statsd/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.statsd/ -title: prometheus.exporter.statsd description: Learn about prometheus.exporter.statsd +title: prometheus.exporter.statsd --- # prometheus.exporter.statsd diff --git a/docs/sources/flow/reference/components/prometheus.exporter.unix.md b/docs/sources/flow/reference/components/prometheus.exporter.unix.md index 95f3ce6f9993..09c4c262914c 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.unix.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.unix.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.unix/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.unix/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.unix/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.unix/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.unix/ -title: prometheus.exporter.unix description: Learn about prometheus.exporter.unix +title: prometheus.exporter.unix --- # prometheus.exporter.unix diff --git a/docs/sources/flow/reference/components/prometheus.exporter.vsphere.md b/docs/sources/flow/reference/components/prometheus.exporter.vsphere.md index 9939defbcd57..166226a27717 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.vsphere.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.vsphere.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.vsphere/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.vsphere/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.vsphere/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.vsphere/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.vsphere/ -title: prometheus.exporter.vsphere description: Learn about prometheus.exporter.vsphere +title: prometheus.exporter.vsphere --- # prometheus.exporter.vsphere diff --git a/docs/sources/flow/reference/components/prometheus.exporter.windows.md b/docs/sources/flow/reference/components/prometheus.exporter.windows.md index 98bd096a3329..f06aba58eaa2 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.windows.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.windows.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.exporter.windows/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.exporter.windows/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.exporter.windows/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.exporter.windows/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.windows/ -title: prometheus.exporter.windows description: Learn about prometheus.exporter.windows +title: prometheus.exporter.windows --- # prometheus.exporter.windows diff --git a/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md b/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md index 89a1fcb81df5..2bdf486982fd 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md +++ b/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.operator.podmonitors/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.operator.podmonitors/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.operator.podmonitors/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.operator.podmonitors/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.podmonitors/ +description: Learn about prometheus.operator.podmonitors labels: stage: beta title: prometheus.operator.podmonitors -description: Learn about prometheus.operator.podmonitors --- # prometheus.operator.podmonitors diff --git a/docs/sources/flow/reference/components/prometheus.operator.probes.md b/docs/sources/flow/reference/components/prometheus.operator.probes.md index d27e43f49f11..693ae045d0f7 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.probes.md +++ b/docs/sources/flow/reference/components/prometheus.operator.probes.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.operator.probes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.operator.probes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.operator.probes/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.operator.probes/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.probes/ +description: Learn about prometheus.operator.probes labels: stage: beta title: prometheus.operator.probes -description: Learn about prometheus.operator.probes --- # prometheus.operator.probes diff --git a/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md b/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md index 2870418b0c54..362abb38d90f 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md +++ b/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.operator.servicemonitors/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.operator.servicemonitors/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.operator.servicemonitors/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.operator.servicemonitors/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.servicemonitors/ +description: Learn about prometheus.operator.servicemonitors labels: stage: beta title: prometheus.operator.servicemonitors -description: Learn about prometheus.operator.servicemonitors --- # prometheus.operator.servicemonitors diff --git a/docs/sources/flow/reference/components/prometheus.receive_http.md b/docs/sources/flow/reference/components/prometheus.receive_http.md index 863c5db1821f..54583a453ed5 100644 --- a/docs/sources/flow/reference/components/prometheus.receive_http.md +++ b/docs/sources/flow/reference/components/prometheus.receive_http.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.receive_http/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.receive_http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.receive_http/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.receive_http/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.receive_http/ -title: prometheus.receive_http description: Learn about prometheus.receive_http +title: prometheus.receive_http --- # prometheus.receive_http diff --git a/docs/sources/flow/reference/components/prometheus.relabel.md b/docs/sources/flow/reference/components/prometheus.relabel.md index 23fb71455a41..9eb0362f82df 100644 --- a/docs/sources/flow/reference/components/prometheus.relabel.md +++ b/docs/sources/flow/reference/components/prometheus.relabel.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.relabel/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.relabel/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.relabel/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.relabel/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.relabel/ -title: prometheus.relabel description: Learn about prometheus.relabel +title: prometheus.relabel --- # prometheus.relabel diff --git a/docs/sources/flow/reference/components/prometheus.remote_write.md b/docs/sources/flow/reference/components/prometheus.remote_write.md index e2ebd4b9cf29..7ce3250a351e 100644 --- a/docs/sources/flow/reference/components/prometheus.remote_write.md +++ b/docs/sources/flow/reference/components/prometheus.remote_write.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.remote_write/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.remote_write/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.remote_write/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.remote_write/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.remote_write/ -title: prometheus.remote_write description: Learn about prometheus.remote_write +title: prometheus.remote_write --- # prometheus.remote_write diff --git a/docs/sources/flow/reference/components/prometheus.scrape.md b/docs/sources/flow/reference/components/prometheus.scrape.md index 25159245bf2d..d51bfa30f963 100644 --- a/docs/sources/flow/reference/components/prometheus.scrape.md +++ b/docs/sources/flow/reference/components/prometheus.scrape.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/prometheus.scrape/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/prometheus.scrape/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/prometheus.scrape/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/prometheus.scrape/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.scrape/ -title: prometheus.scrape description: Learn about prometheus.scrape +title: prometheus.scrape --- # prometheus.scrape diff --git a/docs/sources/flow/reference/components/pyroscope.ebpf.md b/docs/sources/flow/reference/components/pyroscope.ebpf.md index 08dde0a41826..cb3d436cecf7 100644 --- a/docs/sources/flow/reference/components/pyroscope.ebpf.md +++ b/docs/sources/flow/reference/components/pyroscope.ebpf.md @@ -1,13 +1,14 @@ --- aliases: - - /docs/grafana-cloud/agent/flow/reference/components/pyroscope.ebpf/ - - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/pyroscope.ebpf/ - - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/pyroscope.ebpf/ +- /docs/grafana-cloud/agent/flow/reference/components/pyroscope.ebpf/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/pyroscope.ebpf/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/pyroscope.ebpf/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/pyroscope.ebpf/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.ebpf/ +description: Learn about pyroscope.ebpf labels: stage: beta title: pyroscope.ebpf -description: Learn about pyroscope.ebpf --- # pyroscope.ebpf diff --git a/docs/sources/flow/reference/components/pyroscope.scrape.md b/docs/sources/flow/reference/components/pyroscope.scrape.md index 37a90ef89cc8..1d7e514b6732 100644 --- a/docs/sources/flow/reference/components/pyroscope.scrape.md +++ b/docs/sources/flow/reference/components/pyroscope.scrape.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/pyroscope.scrape/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/pyroscope.scrape/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/pyroscope.scrape/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/pyroscope.scrape/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.scrape/ +description: Learn about pyroscope.scrape labels: stage: beta title: pyroscope.scrape -description: Learn about pyroscope.scrape --- # pyroscope.scrape diff --git a/docs/sources/flow/reference/components/pyroscope.write.md b/docs/sources/flow/reference/components/pyroscope.write.md index 4f45edf1beb6..45ce439e338e 100644 --- a/docs/sources/flow/reference/components/pyroscope.write.md +++ b/docs/sources/flow/reference/components/pyroscope.write.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/pyroscope.write/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/pyroscope.write/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/pyroscope.write/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/pyroscope.write/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.write/ +description: Learn about pyroscope.write labels: stage: beta title: pyroscope.write -description: Learn about pyroscope.write --- # pyroscope.write diff --git a/docs/sources/flow/reference/components/remote.http.md b/docs/sources/flow/reference/components/remote.http.md index a7089d88fefc..ebf805728bbd 100644 --- a/docs/sources/flow/reference/components/remote.http.md +++ b/docs/sources/flow/reference/components/remote.http.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/remote.http/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/remote.http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/remote.http/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/remote.http/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.http/ -title: remote.http description: Learn about remote.http +title: remote.http --- # remote.http diff --git a/docs/sources/flow/reference/components/remote.kubernetes.configmap.md b/docs/sources/flow/reference/components/remote.kubernetes.configmap.md index d958c5141139..aba9af2b33f3 100644 --- a/docs/sources/flow/reference/components/remote.kubernetes.configmap.md +++ b/docs/sources/flow/reference/components/remote.kubernetes.configmap.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/remote.kubernetes.configmap/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/remote.kubernetes.configmap/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.kubernetes.configmap/ -title: remote.kubernetes.configmap description: Learn about remote.kubernetes.configmap +title: remote.kubernetes.configmap --- # remote.kubernetes.configmap diff --git a/docs/sources/flow/reference/components/remote.kubernetes.secret.md b/docs/sources/flow/reference/components/remote.kubernetes.secret.md index f72eab8fde72..d3996715c772 100644 --- a/docs/sources/flow/reference/components/remote.kubernetes.secret.md +++ b/docs/sources/flow/reference/components/remote.kubernetes.secret.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/remote.kubernetes.secret/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/remote.kubernetes.secret/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.kubernetes.secret/ -title: remote.kubernetes.secret description: Learn about remote.kubernetes.secret +title: remote.kubernetes.secret --- # remote.kubernetes.secret diff --git a/docs/sources/flow/reference/components/remote.s3.md b/docs/sources/flow/reference/components/remote.s3.md index 897e78f112b5..7e927e11b51f 100644 --- a/docs/sources/flow/reference/components/remote.s3.md +++ b/docs/sources/flow/reference/components/remote.s3.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/components/remote.s3/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/remote.s3/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/remote.s3/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/remote.s3/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.s3/ -title: remote.s3 description: Learn about remote.s3 +title: remote.s3 --- # remote.s3 diff --git a/docs/sources/flow/reference/components/remote.vault.md b/docs/sources/flow/reference/components/remote.vault.md index 17bae832a81f..a4491bd25c66 100644 --- a/docs/sources/flow/reference/components/remote.vault.md +++ b/docs/sources/flow/reference/components/remote.vault.md @@ -1,12 +1,13 @@ --- aliases: -- /docs/agent/latest/flow/reference/components/remote.vault +- /docs/agent/latest/flow/reference/components/remote.vault/ - /docs/grafana-cloud/agent/flow/reference/components/remote.vault/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/remote.vault/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/remote.vault/ +- /docs/grafana-cloud/send-data/agent/flow/reference/components/remote.vault/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.vault/ -title: remote.vault description: Learn about remote.vault +title: remote.vault --- # remote.vault diff --git a/docs/sources/flow/reference/config-blocks/_index.md b/docs/sources/flow/reference/config-blocks/_index.md index e7e24b9a461c..e757c4ccebe6 100644 --- a/docs/sources/flow/reference/config-blocks/_index.md +++ b/docs/sources/flow/reference/config-blocks/_index.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/ -title: Configuration blocks description: Learn about configuration blocks +title: Configuration blocks weight: 200 --- diff --git a/docs/sources/flow/reference/config-blocks/argument.md b/docs/sources/flow/reference/config-blocks/argument.md index 08241ec88732..33817d148e2f 100644 --- a/docs/sources/flow/reference/config-blocks/argument.md +++ b/docs/sources/flow/reference/config-blocks/argument.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/argument/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/argument/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/argument/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/argument/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/argument/ -title: argument block -menuTitle: argument description: Learn about the argument configuration block +menuTitle: argument +title: argument block --- # argument block diff --git a/docs/sources/flow/reference/config-blocks/export.md b/docs/sources/flow/reference/config-blocks/export.md index 1a376ee050f1..3c0a019d865b 100644 --- a/docs/sources/flow/reference/config-blocks/export.md +++ b/docs/sources/flow/reference/config-blocks/export.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/export/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/export/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/export/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/export/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/export/ -title: export block -menuTitle: export description: Learn about the export configuration block +menuTitle: export +title: export block --- # export block diff --git a/docs/sources/flow/reference/config-blocks/http.md b/docs/sources/flow/reference/config-blocks/http.md index 98ac938b6395..9f56dc9fc5bd 100644 --- a/docs/sources/flow/reference/config-blocks/http.md +++ b/docs/sources/flow/reference/config-blocks/http.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/http/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/http/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/http/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/http/ -title: http block -menuTitle: http description: Learn about the http configuration block +menuTitle: http +title: http block --- # http block diff --git a/docs/sources/flow/reference/config-blocks/logging.md b/docs/sources/flow/reference/config-blocks/logging.md index 55012461626b..d8e526094774 100644 --- a/docs/sources/flow/reference/config-blocks/logging.md +++ b/docs/sources/flow/reference/config-blocks/logging.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/logging/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/logging/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/logging/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/logging/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/logging/ -title: logging block -menuTitle: logging description: Learn about the logging configuration block +menuTitle: logging +title: logging block --- # logging block diff --git a/docs/sources/flow/reference/config-blocks/tracing.md b/docs/sources/flow/reference/config-blocks/tracing.md index 269e4969ae6a..b24d34ecbbfc 100644 --- a/docs/sources/flow/reference/config-blocks/tracing.md +++ b/docs/sources/flow/reference/config-blocks/tracing.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/config-blocks/tracing/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/config-blocks/tracing/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/config-blocks/tracing/ +- /docs/grafana-cloud/send-data/agent/flow/reference/config-blocks/tracing/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/tracing/ -title: tracing block -menuTitle: tracing description: Learn about the tracing configuration block +menuTitle: tracing +title: tracing block --- # tracing block diff --git a/docs/sources/flow/reference/stdlib/_index.md b/docs/sources/flow/reference/stdlib/_index.md index f08d4fc47d01..8f42f4bc28d4 100644 --- a/docs/sources/flow/reference/stdlib/_index.md +++ b/docs/sources/flow/reference/stdlib/_index.md @@ -3,10 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/ - standard-library/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/ +description: The standard library is a list of functions used in expressions when + assigning values to attributes title: Standard library -description: The standard library is a list of functions used in expressions when assigning values to attributes weight: 400 --- diff --git a/docs/sources/flow/reference/stdlib/coalesce.md b/docs/sources/flow/reference/stdlib/coalesce.md index 61c84e688efa..73f5cd444821 100644 --- a/docs/sources/flow/reference/stdlib/coalesce.md +++ b/docs/sources/flow/reference/stdlib/coalesce.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/coalesce/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/coalesce/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/coalesce/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/coalesce/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/coalesce/ -title: coalesce description: Learn about coalesce +title: coalesce --- # coalesce diff --git a/docs/sources/flow/reference/stdlib/concat.md b/docs/sources/flow/reference/stdlib/concat.md index bbab029b0db4..36e7eba906a6 100644 --- a/docs/sources/flow/reference/stdlib/concat.md +++ b/docs/sources/flow/reference/stdlib/concat.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/concat/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/concat/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/concat/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/concat/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/concat/ -title: concat description: Learn about concat +title: concat --- # concat diff --git a/docs/sources/flow/reference/stdlib/constants.md b/docs/sources/flow/reference/stdlib/constants.md index 4b1766ace290..44753d08d26d 100644 --- a/docs/sources/flow/reference/stdlib/constants.md +++ b/docs/sources/flow/reference/stdlib/constants.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/constants/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/constants/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/constants/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/constants/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/constants/ -title: constants description: Learn about constants +title: constants --- # constants diff --git a/docs/sources/flow/reference/stdlib/env.md b/docs/sources/flow/reference/stdlib/env.md index b3b0723351bb..fd4d91fcefbb 100644 --- a/docs/sources/flow/reference/stdlib/env.md +++ b/docs/sources/flow/reference/stdlib/env.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/env/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/env/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/env/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/env/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/env/ -title: env description: Learn about env +title: env --- # env diff --git a/docs/sources/flow/reference/stdlib/format.md b/docs/sources/flow/reference/stdlib/format.md index 1309796cdeac..fb725b136a1c 100644 --- a/docs/sources/flow/reference/stdlib/format.md +++ b/docs/sources/flow/reference/stdlib/format.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/format/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/format/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/format/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/format/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/format/ -title: format description: Learn about format +title: format --- # format diff --git a/docs/sources/flow/reference/stdlib/join.md b/docs/sources/flow/reference/stdlib/join.md index 8fd2d578c692..3203585c81c1 100644 --- a/docs/sources/flow/reference/stdlib/join.md +++ b/docs/sources/flow/reference/stdlib/join.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/join/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/join/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/join/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/join/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/join/ -title: join description: Learn about join +title: join --- # join diff --git a/docs/sources/flow/reference/stdlib/json_decode.md b/docs/sources/flow/reference/stdlib/json_decode.md index c82b2acdc09c..d56fc45dabab 100644 --- a/docs/sources/flow/reference/stdlib/json_decode.md +++ b/docs/sources/flow/reference/stdlib/json_decode.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/json_decode/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/json_decode/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/json_decode/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/json_decode/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/json_decode/ -title: json_decode description: Learn about json_decode +title: json_decode --- # json_decode diff --git a/docs/sources/flow/reference/stdlib/json_path.md b/docs/sources/flow/reference/stdlib/json_path.md index 386f27b061be..91058e6e31fe 100644 --- a/docs/sources/flow/reference/stdlib/json_path.md +++ b/docs/sources/flow/reference/stdlib/json_path.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/json_path/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/json_path/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/json_path/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/json_path/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/json_path/ -title: json_path description: Learn about json_path +title: json_path --- # json_path diff --git a/docs/sources/flow/reference/stdlib/nonsensitive.md b/docs/sources/flow/reference/stdlib/nonsensitive.md index c8f6b6bca14b..2763ac952ace 100644 --- a/docs/sources/flow/reference/stdlib/nonsensitive.md +++ b/docs/sources/flow/reference/stdlib/nonsensitive.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/nonsensitive/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/nonsensitive/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/nonsensitive/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/nonsensitive/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/nonsensitive/ -title: nonsensitive description: Learn about nonsensitive +title: nonsensitive --- # nonsensitive diff --git a/docs/sources/flow/reference/stdlib/replace.md b/docs/sources/flow/reference/stdlib/replace.md index dde0057d7840..2c1eb383f390 100644 --- a/docs/sources/flow/reference/stdlib/replace.md +++ b/docs/sources/flow/reference/stdlib/replace.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/replace/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/replace/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/replace/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/replace/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/replace/ -title: replace description: Learn about replace +title: replace --- # replace diff --git a/docs/sources/flow/reference/stdlib/split.md b/docs/sources/flow/reference/stdlib/split.md index 15a5f304f4d1..3087ca153669 100644 --- a/docs/sources/flow/reference/stdlib/split.md +++ b/docs/sources/flow/reference/stdlib/split.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/split/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/split/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/split/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/split/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/split/ -title: split description: Learn about split +title: split --- # split diff --git a/docs/sources/flow/reference/stdlib/to_lower.md b/docs/sources/flow/reference/stdlib/to_lower.md index d344850bd52e..8c252fb354a8 100644 --- a/docs/sources/flow/reference/stdlib/to_lower.md +++ b/docs/sources/flow/reference/stdlib/to_lower.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/to_lower/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/to_lower/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/to_lower/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/to_lower/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/to_lower/ -title: to_lower description: Learn about to_lower +title: to_lower --- # to_lower diff --git a/docs/sources/flow/reference/stdlib/to_upper.md b/docs/sources/flow/reference/stdlib/to_upper.md index 439cd64d8f48..aef26d5ff669 100644 --- a/docs/sources/flow/reference/stdlib/to_upper.md +++ b/docs/sources/flow/reference/stdlib/to_upper.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/to_upper/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/to_upper/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/to_upper/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/to_upper/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/to_upper/ -title: to_upper description: Learn about to_upper +title: to_upper --- # to_upper diff --git a/docs/sources/flow/reference/stdlib/trim.md b/docs/sources/flow/reference/stdlib/trim.md index 603078715ef6..5023d1f21328 100644 --- a/docs/sources/flow/reference/stdlib/trim.md +++ b/docs/sources/flow/reference/stdlib/trim.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/trim/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/trim/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/trim/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/trim/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim/ -title: trim description: Learn about trim +title: trim --- # trim diff --git a/docs/sources/flow/reference/stdlib/trim_prefix.md b/docs/sources/flow/reference/stdlib/trim_prefix.md index 9179274e28a2..33d716f133e4 100644 --- a/docs/sources/flow/reference/stdlib/trim_prefix.md +++ b/docs/sources/flow/reference/stdlib/trim_prefix.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/trim_prefix/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/trim_prefix/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/trim_prefix/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/trim_prefix/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_prefix/ -title: trim_prefix description: Learn about trim_prefix +title: trim_prefix --- # trim_prefix diff --git a/docs/sources/flow/reference/stdlib/trim_space.md b/docs/sources/flow/reference/stdlib/trim_space.md index 7ce358064f29..5e13e0ba0df3 100644 --- a/docs/sources/flow/reference/stdlib/trim_space.md +++ b/docs/sources/flow/reference/stdlib/trim_space.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/trim_space/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/trim_space/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/trim_space/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/trim_space/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_space/ -title: trim_space description: Learn about trim_space +title: trim_space --- # trim_space diff --git a/docs/sources/flow/reference/stdlib/trim_suffix.md b/docs/sources/flow/reference/stdlib/trim_suffix.md index a24a5e6e4294..4741007ebe4b 100644 --- a/docs/sources/flow/reference/stdlib/trim_suffix.md +++ b/docs/sources/flow/reference/stdlib/trim_suffix.md @@ -4,9 +4,10 @@ aliases: - /docs/grafana-cloud/agent/flow/reference/stdlib/trim_suffix/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/stdlib/trim_suffix/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/stdlib/trim_suffix/ +- /docs/grafana-cloud/send-data/agent/flow/reference/stdlib/trim_suffix/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_suffix/ -title: trim_suffix description: Learn about trim_suffix +title: trim_suffix --- # trim_suffix diff --git a/docs/sources/flow/release-notes.md b/docs/sources/flow/release-notes.md index f45b5d3291f7..7c5b5aaeb7a9 100644 --- a/docs/sources/flow/release-notes.md +++ b/docs/sources/flow/release-notes.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/release-notes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/release-notes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/release-notes/ +- /docs/grafana-cloud/send-data/agent/flow/release-notes/ canonical: https://grafana.com/docs/agent/latest/flow/release-notes/ description: Release notes for Grafana Agent flow mode menuTitle: Release notes diff --git a/docs/sources/flow/setup/_index.md b/docs/sources/flow/setup/_index.md index 48afb31b419b..fe38e62eb99a 100644 --- a/docs/sources/flow/setup/_index.md +++ b/docs/sources/flow/setup/_index.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/ +- /docs/grafana-cloud/send-data/agent/flow/setup/ canonical: https://grafana.com/docs/agent/latest/flow/setup/ description: Learn how to install and configure Grafana Agent in flow mode menuTitle: Set up flow mode diff --git a/docs/sources/flow/setup/configure/_index.md b/docs/sources/flow/setup/configure/_index.md index 8a23c557f4e9..4af2c196da69 100644 --- a/docs/sources/flow/setup/configure/_index.md +++ b/docs/sources/flow/setup/configure/_index.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/configure/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/configure/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/configure/ +- /docs/grafana-cloud/send-data/agent/flow/setup/configure/ canonical: https://grafana.com/docs/agent/latest/flow/setup/configure/ description: Configure Grafana Agent in flow mode after it is installed menuTitle: Configure flow mode diff --git a/docs/sources/flow/setup/configure/configure-kubernetes.md b/docs/sources/flow/setup/configure/configure-kubernetes.md index 0b3c9be0eb17..6a492b1190d9 100644 --- a/docs/sources/flow/setup/configure/configure-kubernetes.md +++ b/docs/sources/flow/setup/configure/configure-kubernetes.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/configure/configure-kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/configure/configure-kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/configure/configure-kubernetes/ +- /docs/grafana-cloud/send-data/agent/flow/setup/configure/configure-kubernetes/ canonical: https://grafana.com/docs/agent/latest/flow/setup/configure/configure-kubernetes/ description: Learn how to configure Grafana Agent in flow mode on Kubernetes menuTitle: Kubernetes diff --git a/docs/sources/flow/setup/configure/configure-linux.md b/docs/sources/flow/setup/configure/configure-linux.md index ad8f02135d32..feac6218e59e 100644 --- a/docs/sources/flow/setup/configure/configure-linux.md +++ b/docs/sources/flow/setup/configure/configure-linux.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/configure/configure-linux/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/configure/configure-linux/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/configure/configure-linux/ +- /docs/grafana-cloud/send-data/agent/flow/setup/configure/configure-linux/ canonical: https://grafana.com/docs/agent/latest/flow/setup/configure/configure-linux/ description: Learn how to configure Grafana Agent in flow mode on Linux menuTitle: Linux diff --git a/docs/sources/flow/setup/configure/configure-macos.md b/docs/sources/flow/setup/configure/configure-macos.md index ee9bf74dbf79..4a2f302a6cc7 100644 --- a/docs/sources/flow/setup/configure/configure-macos.md +++ b/docs/sources/flow/setup/configure/configure-macos.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/configure/configure-macos/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/configure/configure-macos/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/configure/configure-macos/ +- /docs/grafana-cloud/send-data/agent/flow/setup/configure/configure-macos/ canonical: https://grafana.com/docs/agent/latest/flow/setup/configure/configure-macos/ description: Learn how to configure Grafana Agent in flow mode on macOS menuTitle: macOS diff --git a/docs/sources/flow/setup/configure/configure-windows.md b/docs/sources/flow/setup/configure/configure-windows.md index ca73255c3483..c2d67e4aec8e 100644 --- a/docs/sources/flow/setup/configure/configure-windows.md +++ b/docs/sources/flow/setup/configure/configure-windows.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/configure/configure-windows/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/configure/configure-windows/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/configure/configure-windows/ +- /docs/grafana-cloud/send-data/agent/flow/setup/configure/configure-windows/ canonical: https://grafana.com/docs/agent/latest/flow/setup/configure/configure-windows/ description: Learn how to configure Grafana Agent in flow mode on Windows menuTitle: Windows diff --git a/docs/sources/flow/setup/deploy-agent.md b/docs/sources/flow/setup/deploy-agent.md index fb372d8d14b0..c55c707b3f8a 100644 --- a/docs/sources/flow/setup/deploy-agent.md +++ b/docs/sources/flow/setup/deploy-agent.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/deploy-agent/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/deploy-agent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/deploy-agent/ +- /docs/grafana-cloud/send-data/agent/flow/setup/deploy-agent/ canonical: https://grafana.com/docs/agent/latest/flow/setup/start-agent/ description: Learn about possible deployment topologies for Grafana Agent menuTitle: Deploy Grafana Agent diff --git a/docs/sources/flow/setup/install/_index.md b/docs/sources/flow/setup/install/_index.md index b711666e84cc..34f4b2b521d8 100644 --- a/docs/sources/flow/setup/install/_index.md +++ b/docs/sources/flow/setup/install/_index.md @@ -3,11 +3,12 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/ - /docs/sources/flow/install/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/ +description: Learn how to install Grafana Agent in flow mode menuTitle: Install flow mode title: Install Grafana Agent in flow mode -description: Learn how to install Grafana Agent in flow mode weight: 50 --- diff --git a/docs/sources/flow/setup/install/binary.md b/docs/sources/flow/setup/install/binary.md index f8fb920e9a93..45874e5460ce 100644 --- a/docs/sources/flow/setup/install/binary.md +++ b/docs/sources/flow/setup/install/binary.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/binary/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/binary/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/binary/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/binary/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/binary/ description: Learn how to install Grafana Agent in flow mode as a standalone binary menuTitle: Standalone diff --git a/docs/sources/flow/setup/install/docker.md b/docs/sources/flow/setup/install/docker.md index 7497c104c9d8..cdc5d8ceb9b2 100644 --- a/docs/sources/flow/setup/install/docker.md +++ b/docs/sources/flow/setup/install/docker.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/docker/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/docker/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/docker/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/docker/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/docker/ description: Learn how to install Grafana Agent in flow mode on Docker menuTitle: Docker diff --git a/docs/sources/flow/setup/install/kubernetes.md b/docs/sources/flow/setup/install/kubernetes.md index bf2307dd5bfd..fb46ed722595 100644 --- a/docs/sources/flow/setup/install/kubernetes.md +++ b/docs/sources/flow/setup/install/kubernetes.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/kubernetes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/kubernetes/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/kubernetes/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/kubernetes/ description: Learn how to deploy Grafana Agent in flow mode on Kubernetes menuTitle: Kubernetes diff --git a/docs/sources/flow/setup/install/linux.md b/docs/sources/flow/setup/install/linux.md index 0c7feaa0940a..8a8788e4d054 100644 --- a/docs/sources/flow/setup/install/linux.md +++ b/docs/sources/flow/setup/install/linux.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/linux/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/linux/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/linux/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/linux/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/linux/ description: Learn how to install Grafana Agent in flow mode on Linux menuTitle: Linux diff --git a/docs/sources/flow/setup/install/macos.md b/docs/sources/flow/setup/install/macos.md index 8527a7ee0841..9f692274ecab 100644 --- a/docs/sources/flow/setup/install/macos.md +++ b/docs/sources/flow/setup/install/macos.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/macos/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/macos/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/macos/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/macos/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/macos/ description: Learn how to install Grafana Agent in flow mode on macOS menuTitle: macOS diff --git a/docs/sources/flow/setup/install/windows.md b/docs/sources/flow/setup/install/windows.md index 7bbcd2241755..36eaced3b3d0 100644 --- a/docs/sources/flow/setup/install/windows.md +++ b/docs/sources/flow/setup/install/windows.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/install/windows/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/install/windows/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/install/windows/ +- /docs/grafana-cloud/send-data/agent/flow/setup/install/windows/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/windows/ description: Learn how to install Grafana Agent in flow mode on Windows menuTitle: Windows diff --git a/docs/sources/flow/setup/start-agent.md b/docs/sources/flow/setup/start-agent.md index b76f728732a9..5295fe859053 100644 --- a/docs/sources/flow/setup/start-agent.md +++ b/docs/sources/flow/setup/start-agent.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana-cloud/agent/flow/setup/start-agent/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/start-agent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/start-agent/ +- /docs/grafana-cloud/send-data/agent/flow/setup/start-agent/ canonical: https://grafana.com/docs/agent/latest/flow/setup/start-agent/ description: Learn how to start, restart, and stop Grafana Agent after it is installed menuTitle: Start flow mode diff --git a/docs/sources/flow/tutorials/_index.md b/docs/sources/flow/tutorials/_index.md index 975dcf9d0edb..0d6149f11721 100644 --- a/docs/sources/flow/tutorials/_index.md +++ b/docs/sources/flow/tutorials/_index.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/flow/tutorials/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/tutorials/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/tutorials/ +- /docs/grafana-cloud/send-data/agent/flow/tutorials/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/ -title: Tutorials description: Learn how to use Grafana Agent Flow +title: Tutorials weight: 300 --- diff --git a/docs/sources/flow/tutorials/chaining.md b/docs/sources/flow/tutorials/chaining.md index 4ce77e56dce0..67d82a151c7f 100644 --- a/docs/sources/flow/tutorials/chaining.md +++ b/docs/sources/flow/tutorials/chaining.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/tutorials/chaining/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/tutorials/chaining/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/tutorials/chaining/ +- /docs/grafana-cloud/send-data/agent/flow/tutorials/chaining/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/chaining/ description: Learn how to chain Prometheus components menuTitle: Chain Prometheus components diff --git a/docs/sources/flow/tutorials/collecting-prometheus-metrics.md b/docs/sources/flow/tutorials/collecting-prometheus-metrics.md index b9e5d221e55e..acac5f42597a 100644 --- a/docs/sources/flow/tutorials/collecting-prometheus-metrics.md +++ b/docs/sources/flow/tutorials/collecting-prometheus-metrics.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/tutorials/collecting-prometheus-metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/tutorials/collecting-prometheus-metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/tutorials/collecting-prometheus-metrics/ +- /docs/grafana-cloud/send-data/agent/flow/tutorials/collecting-prometheus-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/collecting-prometheus-metrics/ description: Learn how to collect Prometheus metrics menuTitle: Collect Prometheus metrics diff --git a/docs/sources/flow/tutorials/filtering-metrics.md b/docs/sources/flow/tutorials/filtering-metrics.md index 0b6ed3afaff2..84e198c0f65c 100644 --- a/docs/sources/flow/tutorials/filtering-metrics.md +++ b/docs/sources/flow/tutorials/filtering-metrics.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/flow/tutorials/filtering-metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/flow/tutorials/filtering-metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/tutorials/filtering-metrics/ +- /docs/grafana-cloud/send-data/agent/flow/tutorials/filtering-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/filtering-metrics/ description: Learn how to filter Prometheus metrics menuTitle: Filter Prometheus metrics diff --git a/docs/sources/operator/_index.md b/docs/sources/operator/_index.md index ff7787d8973c..1c9aef3aca53 100644 --- a/docs/sources/operator/_index.md +++ b/docs/sources/operator/_index.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/operator/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/ +- /docs/grafana-cloud/send-data/agent/operator/ canonical: https://grafana.com/docs/agent/latest/operator/ -title: Static mode Kubernetes operator (Beta) -menuTitle: Static mode Kubernetes operator description: Learn about the static mode Kubernetes operator +menuTitle: Static mode Kubernetes operator +title: Static mode Kubernetes operator (Beta) weight: 300 --- diff --git a/docs/sources/operator/add-custom-scrape-jobs.md b/docs/sources/operator/add-custom-scrape-jobs.md index 6cab5795cb99..6f4fb9cc02df 100644 --- a/docs/sources/operator/add-custom-scrape-jobs.md +++ b/docs/sources/operator/add-custom-scrape-jobs.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/operator/add-custom-scrape-jobs/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/add-custom-scrape-jobs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/add-custom-scrape-jobs/ +- /docs/grafana-cloud/send-data/agent/operator/add-custom-scrape-jobs/ canonical: https://grafana.com/docs/agent/latest/operator/add-custom-scrape-jobs/ -title: Add custom scrape jobs description: Learn how to add custom scrape jobs +title: Add custom scrape jobs weight: 400 --- diff --git a/docs/sources/operator/api.md b/docs/sources/operator/api.md index ca382ebf8c32..f79995f095d2 100644 --- a/docs/sources/operator/api.md +++ b/docs/sources/operator/api.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/operator/api/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/api/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/api/ +- /docs/grafana-cloud/send-data/agent/operator/api/ canonical: https://grafana.com/docs/agent/latest/operator/api/ title: Custom Resource Definition Reference description: Learn about the Grafana Agent API diff --git a/docs/sources/operator/architecture.md b/docs/sources/operator/architecture.md index 63be5c36b2cf..a76903ff3422 100644 --- a/docs/sources/operator/architecture.md +++ b/docs/sources/operator/architecture.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/operator/architecture/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/architecture/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/architecture/ +- /docs/grafana-cloud/send-data/agent/operator/architecture/ canonical: https://grafana.com/docs/agent/latest/operator/architecture/ -title: Architecture description: Learn about Grafana Agent architecture +title: Architecture weight: 300 --- diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index 09132e0d448c..2823f58cb996 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -3,10 +3,11 @@ aliases: - /docs/grafana-cloud/agent/operator/deploy-agent-operator-resources/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/deploy-agent-operator-resources/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/deploy-agent-operator-resources/ +- /docs/grafana-cloud/send-data/agent/operator/deploy-agent-operator-resources/ - custom-resource-quickstart/ canonical: https://grafana.com/docs/agent/latest/operator/deploy-agent-operator-resources/ -title: Deploy Operator resources description: Learn how to deploy Operator resources +title: Deploy Operator resources weight: 120 --- # Deploy Operator resources diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index e78a79bb1f62..c59acf233391 100644 --- a/docs/sources/operator/getting-started.md +++ b/docs/sources/operator/getting-started.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/operator/getting-started/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/getting-started/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/getting-started/ +- /docs/grafana-cloud/send-data/agent/operator/getting-started/ canonical: https://grafana.com/docs/agent/latest/operator/getting-started/ -title: Install the Operator description: Learn how to install the Operator +title: Install the Operator weight: 110 --- diff --git a/docs/sources/operator/helm-getting-started.md b/docs/sources/operator/helm-getting-started.md index 56317949a5ed..bc2f516e10fa 100644 --- a/docs/sources/operator/helm-getting-started.md +++ b/docs/sources/operator/helm-getting-started.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/operator/helm-getting-started/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/helm-getting-started/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/helm-getting-started/ +- /docs/grafana-cloud/send-data/agent/operator/helm-getting-started/ canonical: https://grafana.com/docs/agent/latest/operator/helm-getting-started/ -title: Install the Operator with Helm description: Learn how to install the Operator with Helm charts +title: Install the Operator with Helm weight: 100 --- # Install the Operator with Helm diff --git a/docs/sources/operator/operator-integrations.md b/docs/sources/operator/operator-integrations.md index 1bd180869536..fc49836f8157 100644 --- a/docs/sources/operator/operator-integrations.md +++ b/docs/sources/operator/operator-integrations.md @@ -3,9 +3,10 @@ aliases: - /docs/grafana-cloud/agent/operator/operator-integrations/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/operator-integrations/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/operator-integrations/ +- /docs/grafana-cloud/send-data/agent/operator/operator-integrations/ canonical: https://grafana.com/docs/agent/latest/operator/operator-integrations/ -title: Set up integrations description: Learn how to set up integrations +title: Set up integrations weight: 350 --- # Set up integrations diff --git a/docs/sources/operator/release-notes.md b/docs/sources/operator/release-notes.md index 28eac0947108..ada223145603 100644 --- a/docs/sources/operator/release-notes.md +++ b/docs/sources/operator/release-notes.md @@ -4,12 +4,11 @@ aliases: - /docs/grafana-cloud/agent/operator/release-notes/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/release-notes/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/release-notes/ +- /docs/grafana-cloud/send-data/agent/operator/release-notes/ canonical: https://grafana.com/docs/agent/latest/operator/release-notes/ -description: Release notes for Grafana Agent static mode Kubernetes operator +description: Release notes for Grafana Agent Operator menuTitle: Release notes title: Release notes for Grafana Agent Operator -description: Release notes for Grafana Agent Operator - weight: 999 --- diff --git a/docs/sources/shared/deploy-agent.md b/docs/sources/shared/deploy-agent.md index ccb4b0e8d6b8..1799ea174579 100644 --- a/docs/sources/shared/deploy-agent.md +++ b/docs/sources/shared/deploy-agent.md @@ -4,10 +4,11 @@ aliases: - /docs/grafana-cloud/agent/shared/deploy-agent/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/deploy-agent/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/deploy-agent/ +- /docs/grafana-cloud/send-data/agent/shared/deploy-agent/ canonical: https://grafana.com/docs/agent/latest/shared/deploy-agent/ description: Shared content, deployment topologies for Grafana Agent -title: Deploy Grafana Agent headless: true +title: Deploy Grafana Agent --- # Deploy Grafana Agent diff --git a/docs/sources/shared/flow/reference/components/authorization-block.md b/docs/sources/shared/flow/reference/components/authorization-block.md index 8dfe8d1e3eaa..190cd11f8bb9 100644 --- a/docs/sources/shared/flow/reference/components/authorization-block.md +++ b/docs/sources/shared/flow/reference/components/authorization-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/authorization-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/authorization-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/authorization-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/authorization-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/authorization-block/ description: Shared content, authorization block headless: true diff --git a/docs/sources/shared/flow/reference/components/azuread-block.md b/docs/sources/shared/flow/reference/components/azuread-block.md index b1ecc1e03c3a..ebdf436d02fe 100644 --- a/docs/sources/shared/flow/reference/components/azuread-block.md +++ b/docs/sources/shared/flow/reference/components/azuread-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/azuread-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/azuread-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/azuread-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/azuread-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/azuread-block/ description: Shared content, azuread block headless: true diff --git a/docs/sources/shared/flow/reference/components/basic-auth-block.md b/docs/sources/shared/flow/reference/components/basic-auth-block.md index 6d397a35669a..06c81f660e3c 100644 --- a/docs/sources/shared/flow/reference/components/basic-auth-block.md +++ b/docs/sources/shared/flow/reference/components/basic-auth-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/basic-auth-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/basic-auth-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/basic-auth-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/basic-auth-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/basic-auth-block/ description: Shared content, basic auth block headless: true diff --git a/docs/sources/shared/flow/reference/components/exporter-component-exports.md b/docs/sources/shared/flow/reference/components/exporter-component-exports.md index 84386a7f84ff..beb717a13fae 100644 --- a/docs/sources/shared/flow/reference/components/exporter-component-exports.md +++ b/docs/sources/shared/flow/reference/components/exporter-component-exports.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/exporter-component-exports/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/exporter-component-exports/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/exporter-component-exports/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/exporter-component-exports/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/exporter-component-exports/ description: Shared content, exporter component exports headless: true diff --git a/docs/sources/shared/flow/reference/components/extract-field-block.md b/docs/sources/shared/flow/reference/components/extract-field-block.md index ec38ee16cd6e..5036097d155f 100644 --- a/docs/sources/shared/flow/reference/components/extract-field-block.md +++ b/docs/sources/shared/flow/reference/components/extract-field-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/extract-field-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/extract-field-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/extract-field-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/extract-field-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/extract-field-block/ description: Shared content, extract field block headless: true diff --git a/docs/sources/shared/flow/reference/components/field-filter-block.md b/docs/sources/shared/flow/reference/components/field-filter-block.md index 9eada1aba9a6..bf9d787f2d97 100644 --- a/docs/sources/shared/flow/reference/components/field-filter-block.md +++ b/docs/sources/shared/flow/reference/components/field-filter-block.md @@ -2,8 +2,10 @@ aliases: - /docs/agent/shared/flow/reference/components/filter-field-block/ - /docs/grafana-cloud/agent/shared/flow/reference/components/filter-field-block/ +- /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/field-filter-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/filter-field-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/filter-field-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/field-filter-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/filter-field-block/ description: Shared content, filter field block headless: true diff --git a/docs/sources/shared/flow/reference/components/http-client-config-block.md b/docs/sources/shared/flow/reference/components/http-client-config-block.md index c4c1a55777ad..9519d0d8d67f 100644 --- a/docs/sources/shared/flow/reference/components/http-client-config-block.md +++ b/docs/sources/shared/flow/reference/components/http-client-config-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/http-client-config-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/http-client-config-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/http-client-config-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/http-client-config-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/http-client-config-block/ description: Shared content, http client config block headless: true diff --git a/docs/sources/shared/flow/reference/components/local-file-arguments-text.md b/docs/sources/shared/flow/reference/components/local-file-arguments-text.md index ef3525a46ee9..60bd864aa1d9 100644 --- a/docs/sources/shared/flow/reference/components/local-file-arguments-text.md +++ b/docs/sources/shared/flow/reference/components/local-file-arguments-text.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/local-file-arguments-text/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/local-file-arguments-text/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/local-file-arguments-text/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/local-file-arguments-text/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/local-file-arguments-text/ description: Shared content, local file arguments text headless: true diff --git a/docs/sources/shared/flow/reference/components/loki-server-grpc.md b/docs/sources/shared/flow/reference/components/loki-server-grpc.md index 25428a8ed8d2..e625eb659a01 100644 --- a/docs/sources/shared/flow/reference/components/loki-server-grpc.md +++ b/docs/sources/shared/flow/reference/components/loki-server-grpc.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/loki-server-grpc/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/loki-server-grpc/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/loki-server-grpc/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/loki-server-grpc/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/loki-server-grpc/ description: Shared content, loki server grpc headless: true diff --git a/docs/sources/shared/flow/reference/components/loki-server-http.md b/docs/sources/shared/flow/reference/components/loki-server-http.md index ba1444392cf2..3a424c57063a 100644 --- a/docs/sources/shared/flow/reference/components/loki-server-http.md +++ b/docs/sources/shared/flow/reference/components/loki-server-http.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/loki-server-http/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/loki-server-http/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/loki-server-http/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/loki-server-http/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/loki-server-http/ description: Shared content, loki server http headless: true diff --git a/docs/sources/shared/flow/reference/components/managed_identity-block.md b/docs/sources/shared/flow/reference/components/managed_identity-block.md index bf4dd4aa6831..8422df1ae949 100644 --- a/docs/sources/shared/flow/reference/components/managed_identity-block.md +++ b/docs/sources/shared/flow/reference/components/managed_identity-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/managed_identity-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/managed_identity-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/managed_identity-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/managed_identity-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/managed_identity-block/ description: Shared content, managed_identity block headless: true diff --git a/docs/sources/shared/flow/reference/components/match-properties-block.md b/docs/sources/shared/flow/reference/components/match-properties-block.md index 840a2babb288..16003a6e9122 100644 --- a/docs/sources/shared/flow/reference/components/match-properties-block.md +++ b/docs/sources/shared/flow/reference/components/match-properties-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/match-properties-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/match-properties-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/match-properties-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/match-properties-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/match-properties-block/ description: Shared content, match properties block headless: true diff --git a/docs/sources/shared/flow/reference/components/oauth2-block.md b/docs/sources/shared/flow/reference/components/oauth2-block.md index 0abbc04afa7a..c08b8ebe65b7 100644 --- a/docs/sources/shared/flow/reference/components/oauth2-block.md +++ b/docs/sources/shared/flow/reference/components/oauth2-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/oauth2-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/oauth2-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/oauth2-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/oauth2-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/oauth2-block/ description: Shared content, oauth2 block headless: true diff --git a/docs/sources/shared/flow/reference/components/otelcol-compression-field.md b/docs/sources/shared/flow/reference/components/otelcol-compression-field.md index 4219ad3039d4..3a267705b6a7 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-compression-field.md +++ b/docs/sources/shared/flow/reference/components/otelcol-compression-field.md @@ -1,9 +1,10 @@ --- aliases: -- /docs/agent/shared/flow/reference/components/otelcol-compression-field +- /docs/agent/shared/flow/reference/components/otelcol-compression-field/ - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-compression-field/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-compression-field/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-compression-field/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-compression-field/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/otelcol-compression-field/ description: Shared content, otelcol compression field headless: true diff --git a/docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md b/docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md index cca8f1881f1b..566abf806cc3 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-debug-metrics-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-debug-metrics-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-debug-metrics-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-debug-metrics-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-debug-metrics-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/otelcol-debug-metrics-block/ description: Shared content, otelcol debug metrics block headless: true diff --git a/docs/sources/shared/flow/reference/components/otelcol-filter-attribute-block.md b/docs/sources/shared/flow/reference/components/otelcol-filter-attribute-block.md index 6f58b788463a..ed05d4fb6d48 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-filter-attribute-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-filter-attribute-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-filter-attribute-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-filter-attribute-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-filter-attribute-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-filter-attribute-block/ description: Shared content, otelcol filter attribute block headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-filter-library-block.md b/docs/sources/shared/flow/reference/components/otelcol-filter-library-block.md index 2a76c4285b51..fafc9fd3d67b 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-filter-library-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-filter-library-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-filter-library-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-filter-library-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-filter-library-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-filter-library-block/ description: Shared content, otelcol filter library block headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-filter-log-severity-block.md b/docs/sources/shared/flow/reference/components/otelcol-filter-log-severity-block.md index a0e0c30b22ca..15b17450f7f6 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-filter-log-severity-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-filter-log-severity-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-filter-log-severity-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-filter-log-severity-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-filter-log-severity-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-filter-log-severity-block/ description: Shared content, otelcol filter log severity block headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-filter-regexp-block.md b/docs/sources/shared/flow/reference/components/otelcol-filter-regexp-block.md index cde6340dc38d..649b41554877 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-filter-regexp-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-filter-regexp-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-filter-regexp-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-filter-regexp-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-filter-regexp-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-filter-regexp-block/ description: Shared content, otelcol filter regexp block headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-filter-resource-block.md b/docs/sources/shared/flow/reference/components/otelcol-filter-resource-block.md index a335e4186920..0242f5914e40 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-filter-resource-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-filter-resource-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-filter-resource-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-filter-resource-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-filter-resource-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-filter-resource-block/ description: Shared content, otelcol filter resource block headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-grpc-authority.md b/docs/sources/shared/flow/reference/components/otelcol-grpc-authority.md index ec6833b7246f..f0616490eef5 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-grpc-authority.md +++ b/docs/sources/shared/flow/reference/components/otelcol-grpc-authority.md @@ -1,9 +1,10 @@ --- aliases: -- /docs/agent/shared/flow/reference/components/otelcol-grpc-authority +- /docs/agent/shared/flow/reference/components/otelcol-grpc-authority/ - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-grpc-authority/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-grpc-authority/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-grpc-authority/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-grpc-authority/ description: Shared content, otelcol grpc authority headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-grpc-balancer-name.md b/docs/sources/shared/flow/reference/components/otelcol-grpc-balancer-name.md index 1da59d503705..a735acdf4534 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-grpc-balancer-name.md +++ b/docs/sources/shared/flow/reference/components/otelcol-grpc-balancer-name.md @@ -1,9 +1,10 @@ --- aliases: -- /docs/agent/shared/flow/reference/components/otelcol-grpc-balancer-name +- /docs/agent/shared/flow/reference/components/otelcol-grpc-balancer-name/ - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-grpc-balancer-name/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-grpc-balancer-name/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-grpc-balancer-name/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-grpc-balancer-name/ description: Shared content, otelcol grpc balancer name headless: true --- diff --git a/docs/sources/shared/flow/reference/components/otelcol-queue-block.md b/docs/sources/shared/flow/reference/components/otelcol-queue-block.md index 4066d65d3cc8..ec26580ae2e3 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-queue-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-queue-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-queue-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-queue-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-queue-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-queue-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/otelcol-queue-block/ description: Shared content, otelcol queue block headless: true diff --git a/docs/sources/shared/flow/reference/components/otelcol-retry-block.md b/docs/sources/shared/flow/reference/components/otelcol-retry-block.md index 574d0eed4703..70dce88aa63e 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-retry-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-retry-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-retry-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-retry-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-retry-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-retry-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/otelcol-retry-block/ description: Shared content, otelcol retry block headless: true diff --git a/docs/sources/shared/flow/reference/components/otelcol-tls-config-block.md b/docs/sources/shared/flow/reference/components/otelcol-tls-config-block.md index c7723bfb72ba..0e35f4f8fd8c 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-tls-config-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-tls-config-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/otelcol-tls-config-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/otelcol-tls-config-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/otelcol-tls-config-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/otelcol-tls-config-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/otelcol-tls-config-block/ description: Shared content, otelcol tls config block headless: true diff --git a/docs/sources/shared/flow/reference/components/output-block-logs.md b/docs/sources/shared/flow/reference/components/output-block-logs.md index 04194ac8f9d8..2967d6be3d5d 100644 --- a/docs/sources/shared/flow/reference/components/output-block-logs.md +++ b/docs/sources/shared/flow/reference/components/output-block-logs.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/output-block-logs/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/output-block-logs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/output-block-logs/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/output-block-logs/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/output-block-logs/ description: Shared content, output block logs headless: true diff --git a/docs/sources/shared/flow/reference/components/output-block-metrics.md b/docs/sources/shared/flow/reference/components/output-block-metrics.md index 43e44c5ab8d6..6adc39be1e12 100644 --- a/docs/sources/shared/flow/reference/components/output-block-metrics.md +++ b/docs/sources/shared/flow/reference/components/output-block-metrics.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/output-block-metrics/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/output-block-metrics/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/output-block-metrics/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/output-block-metrics/ description: Shared content, output block metrics headless: true --- diff --git a/docs/sources/shared/flow/reference/components/output-block-traces.md b/docs/sources/shared/flow/reference/components/output-block-traces.md index 600a30ce8514..18635a1be997 100644 --- a/docs/sources/shared/flow/reference/components/output-block-traces.md +++ b/docs/sources/shared/flow/reference/components/output-block-traces.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/output-block-traces/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/output-block-traces/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/output-block-traces/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/output-block-traces/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/output-block-traces/ description: Shared content, output block traces headless: true diff --git a/docs/sources/shared/flow/reference/components/output-block.md b/docs/sources/shared/flow/reference/components/output-block.md index 66451237ea1c..382de1c8e4b8 100644 --- a/docs/sources/shared/flow/reference/components/output-block.md +++ b/docs/sources/shared/flow/reference/components/output-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/output-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/output-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/output-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/output-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/output-block/ description: Shared content, output block headless: true diff --git a/docs/sources/shared/flow/reference/components/prom-operator-scrape.md b/docs/sources/shared/flow/reference/components/prom-operator-scrape.md index 63a69f3a57c6..0a32c9a58796 100644 --- a/docs/sources/shared/flow/reference/components/prom-operator-scrape.md +++ b/docs/sources/shared/flow/reference/components/prom-operator-scrape.md @@ -1,6 +1,8 @@ --- aliases: - /docs/agent/shared/flow/reference/components/prom-operator-scrape/ +- /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/prom-operator-scrape/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/prom-operator-scrape/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/prom-operator-scrape/ description: Shared content, prom operator scrape headless: true diff --git a/docs/sources/shared/flow/reference/components/rule-block-logs.md b/docs/sources/shared/flow/reference/components/rule-block-logs.md index 015b8963d06f..f585dd057e87 100644 --- a/docs/sources/shared/flow/reference/components/rule-block-logs.md +++ b/docs/sources/shared/flow/reference/components/rule-block-logs.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/rule-block-logs/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/rule-block-logs/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/rule-block-logs/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/rule-block-logs/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/rule-block-logs/ description: Shared content, rule block logs headless: true diff --git a/docs/sources/shared/flow/reference/components/rule-block.md b/docs/sources/shared/flow/reference/components/rule-block.md index 6824ec9fdcf7..49b4f9ce9260 100644 --- a/docs/sources/shared/flow/reference/components/rule-block.md +++ b/docs/sources/shared/flow/reference/components/rule-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/rule-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/rule-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/rule-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/rule-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/rule-block/ description: Shared content, rule block headless: true diff --git a/docs/sources/shared/flow/reference/components/sigv4-block.md b/docs/sources/shared/flow/reference/components/sigv4-block.md index 65a67da4e3a5..0acbc40cb67f 100644 --- a/docs/sources/shared/flow/reference/components/sigv4-block.md +++ b/docs/sources/shared/flow/reference/components/sigv4-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/sigv4-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/sigv4-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/sigv4-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/sigv4-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/sigv4-block/ description: Shared content, sigv4 block headless: true diff --git a/docs/sources/shared/flow/reference/components/tls-config-block.md b/docs/sources/shared/flow/reference/components/tls-config-block.md index 046e7f1142f0..033c64ebacf2 100644 --- a/docs/sources/shared/flow/reference/components/tls-config-block.md +++ b/docs/sources/shared/flow/reference/components/tls-config-block.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/reference/components/tls-config-block/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/reference/components/tls-config-block/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/reference/components/tls-config-block/ +- /docs/grafana-cloud/send-data/agent/shared/flow/reference/components/tls-config-block/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/tls-config-block/ description: Shared content, tls config block headless: true diff --git a/docs/sources/shared/flow/stability/beta.md b/docs/sources/shared/flow/stability/beta.md index 8954ed5ebec4..c337059f006a 100644 --- a/docs/sources/shared/flow/stability/beta.md +++ b/docs/sources/shared/flow/stability/beta.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/stability/beta/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/stability/beta/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/stability/beta/ +- /docs/grafana-cloud/send-data/agent/shared/flow/stability/beta/ canonical: https://grafana.com/docs/agent/latest/shared/flow/stability/beta/ description: Shared content, beta headless: true diff --git a/docs/sources/shared/flow/stability/experimental.md b/docs/sources/shared/flow/stability/experimental.md index 1514e75648b1..95d0136400d0 100644 --- a/docs/sources/shared/flow/stability/experimental.md +++ b/docs/sources/shared/flow/stability/experimental.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/flow/stability/experimental/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/flow/stability/experimental/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/flow/stability/experimental/ +- /docs/grafana-cloud/send-data/agent/shared/flow/stability/experimental/ canonical: https://grafana.com/docs/agent/latest/shared/flow/stability/experimental/ description: Shared content, experimental headless: true diff --git a/docs/sources/shared/index.md b/docs/sources/shared/index.md index c783480960b2..8b1094f12e89 100644 --- a/docs/sources/shared/index.md +++ b/docs/sources/shared/index.md @@ -1,6 +1,9 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/shared/ +- /docs/grafana-cloud/send-data/agent/shared/ canonical: https://grafana.com/docs/agent/latest/shared/ -headless: true description: Shared content +headless: true --- diff --git a/docs/sources/shared/wal-data-retention.md b/docs/sources/shared/wal-data-retention.md index cb5c1f5a0e7a..5be67691ec59 100644 --- a/docs/sources/shared/wal-data-retention.md +++ b/docs/sources/shared/wal-data-retention.md @@ -4,6 +4,7 @@ aliases: - /docs/grafana-cloud/agent/shared/wal-data-retention/ - /docs/grafana-cloud/monitor-infrastructure/agent/shared/wal-data-retention/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/shared/wal-data-retention/ +- /docs/grafana-cloud/send-data/agent/shared/wal-data-retention/ canonical: https://grafana.com/docs/agent/latest/shared/wal-data-retention/ description: Shared content, information about data retention in the WAL headless: true diff --git a/docs/sources/stability.md b/docs/sources/stability.md index 8660bce69f4c..c21d549aebdc 100644 --- a/docs/sources/stability.md +++ b/docs/sources/stability.md @@ -1,7 +1,11 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/stability/ +- /docs/grafana-cloud/send-data/agent/stability/ canonical: https://grafana.com/docs/agent/latest/stability/ +description: Grafana Agent features fall into one of three stability categories, experimental, + beta, or stable title: Stability -description: Grafana Agent features fall into one of three stability categories, experimental, beta, or stable weight: 600 --- diff --git a/docs/sources/static/_index.md b/docs/sources/static/_index.md index 61cbc5d74d2a..20e959ec11b5 100644 --- a/docs/sources/static/_index.md +++ b/docs/sources/static/_index.md @@ -1,7 +1,10 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/static/ +- /docs/grafana-cloud/send-data/agent/static/ canonical: https://grafana.com/docs/agent/latest/static/ -title: Static mode description: Learn about Grafana Agent in static mode +title: Static mode weight: 200 --- diff --git a/docs/sources/static/api/_index.md b/docs/sources/static/api/_index.md index 266c94b2457b..959de9238dc6 100644 --- a/docs/sources/static/api/_index.md +++ b/docs/sources/static/api/_index.md @@ -1,10 +1,12 @@ --- aliases: - ../api/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/api/ +- /docs/grafana-cloud/send-data/agent/static/api/ canonical: https://grafana.com/docs/agent/latest/static/api/ -title: Static mode APIs (Stable) -menuTitle: Static mode API description: Learn about the Grafana Agent static mode API +menuTitle: Static mode API +title: Static mode APIs (Stable) weight: 400 --- diff --git a/docs/sources/static/configuration/_index.md b/docs/sources/static/configuration/_index.md index 3928d620bbc3..7cd30818dd8f 100644 --- a/docs/sources/static/configuration/_index.md +++ b/docs/sources/static/configuration/_index.md @@ -1,9 +1,11 @@ --- aliases: - ../configuration/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/ +- /docs/grafana-cloud/send-data/agent/static/configuration/ canonical: https://grafana.com/docs/agent/latest/static/configuration/ -title: Configure static mode description: Learn how to configure Grafana Agent in static mode +title: Configure static mode weight: 300 --- diff --git a/docs/sources/static/configuration/agent-management.md b/docs/sources/static/configuration/agent-management.md index a0cb3cb93b20..0feb5c78def1 100644 --- a/docs/sources/static/configuration/agent-management.md +++ b/docs/sources/static/configuration/agent-management.md @@ -1,8 +1,11 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/agent-management/ +- /docs/grafana-cloud/send-data/agent/static/configuration/agent-management/ canonical: https://grafana.com/docs/agent/latest/static/configuration/agent-management/ +description: Learn about Agent Management menuTitle: Agent Management title: Agent Management - Experimental -description: Learn about Agent Management weight: 700 --- diff --git a/docs/sources/static/configuration/create-config-file.md b/docs/sources/static/configuration/create-config-file.md index 25e774a64d69..c019bd545516 100644 --- a/docs/sources/static/configuration/create-config-file.md +++ b/docs/sources/static/configuration/create-config-file.md @@ -1,10 +1,12 @@ --- aliases: -- ../../set-up/create-config-file/ - ../../configuration/create-config-file/ +- ../../set-up/create-config-file/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/create-config-file/ +- /docs/grafana-cloud/send-data/agent/static/configuration/create-config-file/ canonical: https://grafana.com/docs/agent/latest/static/configuration/create-config-file/ -title: Create a configuration file description: Learn how to create a configuration file +title: Create a configuration file weight: 50 --- diff --git a/docs/sources/static/configuration/flags.md b/docs/sources/static/configuration/flags.md index 8d54ade73e73..c88e1173af6e 100644 --- a/docs/sources/static/configuration/flags.md +++ b/docs/sources/static/configuration/flags.md @@ -1,9 +1,11 @@ --- aliases: - ../../configuration/flags/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/flags/ +- /docs/grafana-cloud/send-data/agent/static/configuration/flags/ canonical: https://grafana.com/docs/agent/latest/static/configuration/flags/ -title: Command-line flags description: Learn about command-line flags +title: Command-line flags weight: 100 --- diff --git a/docs/sources/static/configuration/integrations/_index.md b/docs/sources/static/configuration/integrations/_index.md index ee65737d4a10..f0053c2749c2 100644 --- a/docs/sources/static/configuration/integrations/_index.md +++ b/docs/sources/static/configuration/integrations/_index.md @@ -1,9 +1,11 @@ --- aliases: - ../../configuration/integrations/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/ -title: integrations_config description: Learn about integrations_config +title: integrations_config weight: 500 --- diff --git a/docs/sources/static/configuration/integrations/apache-exporter-config.md b/docs/sources/static/configuration/integrations/apache-exporter-config.md index 16260951423e..3edce2f27538 100644 --- a/docs/sources/static/configuration/integrations/apache-exporter-config.md +++ b/docs/sources/static/configuration/integrations/apache-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/apache-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/apache-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/apache-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/apache-exporter-config/ -title: apache_http_config description: Learn about apache_http_config +title: apache_http_config --- # apache_http_config diff --git a/docs/sources/static/configuration/integrations/azure-exporter-config.md b/docs/sources/static/configuration/integrations/azure-exporter-config.md index d7c12597af59..981b0a523142 100644 --- a/docs/sources/static/configuration/integrations/azure-exporter-config.md +++ b/docs/sources/static/configuration/integrations/azure-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/azure-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/azure-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/azure-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/azure-exporter-config/ -title: azure_exporter_config description: Learn about azure_exporter_config +title: azure_exporter_config --- # azure_exporter_config diff --git a/docs/sources/static/configuration/integrations/blackbox-config.md b/docs/sources/static/configuration/integrations/blackbox-config.md index 755416ab565a..77a592ddb089 100644 --- a/docs/sources/static/configuration/integrations/blackbox-config.md +++ b/docs/sources/static/configuration/integrations/blackbox-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/blackbox-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/blackbox-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/blackbox-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/blackbox-config/ -title: blackbox_config description: Learn about blackbox_config +title: blackbox_config --- # blackbox_config diff --git a/docs/sources/static/configuration/integrations/cadvisor-config.md b/docs/sources/static/configuration/integrations/cadvisor-config.md index 4db214853cd5..16dedf0a5205 100644 --- a/docs/sources/static/configuration/integrations/cadvisor-config.md +++ b/docs/sources/static/configuration/integrations/cadvisor-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/cadvisor-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/cadvisor-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/cadvisor-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/cadvisor-config/ -title: cadvisor_config description: Learn about cadvisor_config +title: cadvisor_config --- # cadvisor_config diff --git a/docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md b/docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md index c0e9f6cb314f..8015bde84bc9 100644 --- a/docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md +++ b/docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/cloudwatch-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/cloudwatch-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/cloudwatch-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/cloudwatch-exporter-config/ -title: cloudwatch_exporter_config description: Learn about cloudwatch_exporter_config +title: cloudwatch_exporter_config --- # cloudwatch_exporter_config diff --git a/docs/sources/static/configuration/integrations/consul-exporter-config.md b/docs/sources/static/configuration/integrations/consul-exporter-config.md index 53cdff1abca8..469afc264f17 100644 --- a/docs/sources/static/configuration/integrations/consul-exporter-config.md +++ b/docs/sources/static/configuration/integrations/consul-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/consul-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/consul-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/consul-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/consul-exporter-config/ -title: consul_exporter_config description: Learn about consul_exporter_config +title: consul_exporter_config --- # consul_exporter_config diff --git a/docs/sources/static/configuration/integrations/dnsmasq-exporter-config.md b/docs/sources/static/configuration/integrations/dnsmasq-exporter-config.md index 87bc75860214..fe38a827bf45 100644 --- a/docs/sources/static/configuration/integrations/dnsmasq-exporter-config.md +++ b/docs/sources/static/configuration/integrations/dnsmasq-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/dnsmasq-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/dnsmasq-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/dnsmasq-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/dnsmasq-exporter-config/ -title: dnsmasq_exporter_config description: Learn about dnsmasq_exporter_config +title: dnsmasq_exporter_config --- # dnsmasq_exporter_config diff --git a/docs/sources/static/configuration/integrations/elasticsearch-exporter-config.md b/docs/sources/static/configuration/integrations/elasticsearch-exporter-config.md index 0d24066ccb28..22f26d4f15ad 100644 --- a/docs/sources/static/configuration/integrations/elasticsearch-exporter-config.md +++ b/docs/sources/static/configuration/integrations/elasticsearch-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/elasticsearch-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/elasticsearch-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/elasticsearch-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/elasticsearch-exporter-config/ -title: elasticsearch_exporter_config description: Learn about elasticsearch_exporter_config +title: elasticsearch_exporter_config --- # elasticsearch_exporter_config diff --git a/docs/sources/static/configuration/integrations/gcp-exporter-config.md b/docs/sources/static/configuration/integrations/gcp-exporter-config.md index 2ff5fc8fd10f..56ef46aa9378 100644 --- a/docs/sources/static/configuration/integrations/gcp-exporter-config.md +++ b/docs/sources/static/configuration/integrations/gcp-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/gcp-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/gcp-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/gcp-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/gcp-exporter-config/ -title: gcp_exporter_config description: Learn about gcp_exporter_config +title: gcp_exporter_config --- # gcp_exporter_config diff --git a/docs/sources/static/configuration/integrations/github-exporter-config.md b/docs/sources/static/configuration/integrations/github-exporter-config.md index 20f2027d78a0..c1bbbfe0d0c5 100644 --- a/docs/sources/static/configuration/integrations/github-exporter-config.md +++ b/docs/sources/static/configuration/integrations/github-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/github-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/github-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/github-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/github-exporter-config/ -title: github_exporter_config description: Learn about github_exporter_config +title: github_exporter_config --- # github_exporter_config diff --git a/docs/sources/static/configuration/integrations/integrations-next/_index.md b/docs/sources/static/configuration/integrations/integrations-next/_index.md index d9e069a1f42d..cfa54bfb9b8f 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/_index.md +++ b/docs/sources/static/configuration/integrations/integrations-next/_index.md @@ -1,10 +1,12 @@ --- aliases: - ../../../configuration/integrations/integrations-next/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/ -title: Integrations next (Experimental) -menuTitle: Integrations next description: Learn about integrations next +menuTitle: Integrations next +title: Integrations next (Experimental) weight: 100 --- diff --git a/docs/sources/static/configuration/integrations/integrations-next/app-agent-receiver-config.md b/docs/sources/static/configuration/integrations/integrations-next/app-agent-receiver-config.md index 9a16464c5d66..7fe049a493e8 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/app-agent-receiver-config.md +++ b/docs/sources/static/configuration/integrations/integrations-next/app-agent-receiver-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../../configuration/integrations/integrations-next/app-agent-receiver-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/app-agent-receiver-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/app-agent-receiver-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/app-agent-receiver-config/ -title: app_agent_receiver_config next description: Learn about app_agent_receiver_config next +title: app_agent_receiver_config next --- # app_agent_receiver_config next diff --git a/docs/sources/static/configuration/integrations/integrations-next/blackbox-config.md b/docs/sources/static/configuration/integrations/integrations-next/blackbox-config.md index 713dcb31fd9a..fa99cf452fd3 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/blackbox-config.md +++ b/docs/sources/static/configuration/integrations/integrations-next/blackbox-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../../configuration/integrations/integrations-next/blackbox-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/blackbox-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/blackbox-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/blackbox-config/ -title: blackbox_config next description: Learn about blackbox_config next +title: blackbox_config next --- # blackbox_config next diff --git a/docs/sources/static/configuration/integrations/integrations-next/eventhandler-config.md b/docs/sources/static/configuration/integrations/integrations-next/eventhandler-config.md index f9d2e0780d03..0008f8c29d48 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/eventhandler-config.md +++ b/docs/sources/static/configuration/integrations/integrations-next/eventhandler-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../../configuration/integrations/integrations-next/eventhandler-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/eventhandler-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/eventhandler-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/eventhandler-config/ -title: eventhandler_config next description: Learn about eventhandler_config next +title: eventhandler_config next --- # eventhandler_config next diff --git a/docs/sources/static/configuration/integrations/integrations-next/snmp-config.md b/docs/sources/static/configuration/integrations/integrations-next/snmp-config.md index c2eebabcaf7c..173711f7132f 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/snmp-config.md +++ b/docs/sources/static/configuration/integrations/integrations-next/snmp-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../../configuration/integrations/integrations-next/snmp-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/snmp-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/snmp-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/snmp-config/ -title: snmp config next description: Learn about snmp config next +title: snmp config next --- # snmp config next diff --git a/docs/sources/static/configuration/integrations/integrations-next/vsphere-config.md b/docs/sources/static/configuration/integrations/integrations-next/vsphere-config.md index b09c691b3eb9..b63523fe484c 100644 --- a/docs/sources/static/configuration/integrations/integrations-next/vsphere-config.md +++ b/docs/sources/static/configuration/integrations/integrations-next/vsphere-config.md @@ -1,10 +1,12 @@ --- aliases: - ../../../../configuration/integrations/integrations-next/vsphere-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/integrations-next/vsphere-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/integrations-next/vsphere-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/integrations-next/vsphere-config/ -title: vsphere config (beta) next -menuTitle: vsphere_config next description: Learn about vsphere_config next +menuTitle: vsphere_config next +title: vsphere config (beta) next --- # vsphere config (beta) next diff --git a/docs/sources/static/configuration/integrations/kafka-exporter-config.md b/docs/sources/static/configuration/integrations/kafka-exporter-config.md index 147558f85df1..14c8e5e99075 100644 --- a/docs/sources/static/configuration/integrations/kafka-exporter-config.md +++ b/docs/sources/static/configuration/integrations/kafka-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/kafka-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/kafka-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/kafka-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/kafka-exporter-config/ -title: kafka_exporter_config description: Learn about kafka_exporter_config +title: kafka_exporter_config --- # kafka_exporter_config diff --git a/docs/sources/static/configuration/integrations/memcached-exporter-config.md b/docs/sources/static/configuration/integrations/memcached-exporter-config.md index 4793d2b8560f..a8fe548f7c50 100644 --- a/docs/sources/static/configuration/integrations/memcached-exporter-config.md +++ b/docs/sources/static/configuration/integrations/memcached-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/memcached-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/memcached-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/memcached-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/memcached-exporter-config/ -title: memcached_exporter_config description: Learn about memcached_exporter_config +title: memcached_exporter_config --- # memcached_exporter_config diff --git a/docs/sources/static/configuration/integrations/mongodb_exporter-config.md b/docs/sources/static/configuration/integrations/mongodb_exporter-config.md index 2c47057e8aa6..4ed4b14b2bbd 100644 --- a/docs/sources/static/configuration/integrations/mongodb_exporter-config.md +++ b/docs/sources/static/configuration/integrations/mongodb_exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/mongodb_exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/mongodb_exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/mongodb_exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/mongodb_exporter-config/ -title: mongodb_exporter_config description: Learn about mongodb_exporter_config +title: mongodb_exporter_config --- # mongodb_exporter_config diff --git a/docs/sources/static/configuration/integrations/mssql-config.md b/docs/sources/static/configuration/integrations/mssql-config.md index c3a95a73d21f..d79b360bfd10 100644 --- a/docs/sources/static/configuration/integrations/mssql-config.md +++ b/docs/sources/static/configuration/integrations/mssql-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/mssql-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/mssql-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/mssql-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/mssql-config/ -title: mssql_config description: Learn about mssql_config +title: mssql_config --- # mssql_config diff --git a/docs/sources/static/configuration/integrations/mysqld-exporter-config.md b/docs/sources/static/configuration/integrations/mysqld-exporter-config.md index 4b2b09078e3a..8f266787ade6 100644 --- a/docs/sources/static/configuration/integrations/mysqld-exporter-config.md +++ b/docs/sources/static/configuration/integrations/mysqld-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/mysqld-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/mysqld-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/mysqld-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/mysqld-exporter-config/ -title: mysqld_exporter_config description: Learn about mysqld_exporter_config +title: mysqld_exporter_config --- # mysqld_exporter_config diff --git a/docs/sources/static/configuration/integrations/node-exporter-config.md b/docs/sources/static/configuration/integrations/node-exporter-config.md index eb65fb51d91f..9919464056a6 100644 --- a/docs/sources/static/configuration/integrations/node-exporter-config.md +++ b/docs/sources/static/configuration/integrations/node-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/node-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/node-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/node-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/node-exporter-config/ -title: node_exporter_config description: Learn about node_exporter_config +title: node_exporter_config --- # node_exporter_config diff --git a/docs/sources/static/configuration/integrations/oracledb-config.md b/docs/sources/static/configuration/integrations/oracledb-config.md index ed13aa931ccb..2937c9f4d207 100644 --- a/docs/sources/static/configuration/integrations/oracledb-config.md +++ b/docs/sources/static/configuration/integrations/oracledb-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/oracledb-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/oracledb-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/oracledb-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/oracledb-config/ -title: oracledb_config description: Learn about oracledb_config +title: oracledb_config --- # oracledb_config diff --git a/docs/sources/static/configuration/integrations/postgres-exporter-config.md b/docs/sources/static/configuration/integrations/postgres-exporter-config.md index 00120e004378..1bd2354c9ec8 100644 --- a/docs/sources/static/configuration/integrations/postgres-exporter-config.md +++ b/docs/sources/static/configuration/integrations/postgres-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/postgres-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/postgres-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/postgres-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/postgres-exporter-config/ -title: postgres_exporter_config description: Learn about postgres_exporter_config +title: postgres_exporter_config --- # postgres_exporter_config diff --git a/docs/sources/static/configuration/integrations/process-exporter-config.md b/docs/sources/static/configuration/integrations/process-exporter-config.md index a0ba6235148d..c6e888df7714 100644 --- a/docs/sources/static/configuration/integrations/process-exporter-config.md +++ b/docs/sources/static/configuration/integrations/process-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/process-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/process-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/process-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/process-exporter-config/ -title: process_exporter_config description: Learn about process_exporter_config +title: process_exporter_config --- # process_exporter_config diff --git a/docs/sources/static/configuration/integrations/redis-exporter-config.md b/docs/sources/static/configuration/integrations/redis-exporter-config.md index cf098a2d9826..392fcb359cab 100644 --- a/docs/sources/static/configuration/integrations/redis-exporter-config.md +++ b/docs/sources/static/configuration/integrations/redis-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/redis-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/redis-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/redis-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/redis-exporter-config/ -title: redis_exporter_config description: Learn about redis_exporter_config +title: redis_exporter_config --- # redis_exporter_config diff --git a/docs/sources/static/configuration/integrations/snmp-config.md b/docs/sources/static/configuration/integrations/snmp-config.md index c85196c10f0d..893348006f92 100644 --- a/docs/sources/static/configuration/integrations/snmp-config.md +++ b/docs/sources/static/configuration/integrations/snmp-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/snmp-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/snmp-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/snmp-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/snmp-config/ -title: snmp config description: Learn about snmp config +title: snmp config --- # snmp config diff --git a/docs/sources/static/configuration/integrations/snowflake-config.md b/docs/sources/static/configuration/integrations/snowflake-config.md index 4c8df2f14136..c648445a2dd0 100644 --- a/docs/sources/static/configuration/integrations/snowflake-config.md +++ b/docs/sources/static/configuration/integrations/snowflake-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/snowflake-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/snowflake-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/snowflake-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/snowflake-config/ -title: snowflake_config description: Learn about snowflake_config +title: snowflake_config --- # snowflake_config diff --git a/docs/sources/static/configuration/integrations/squid-config.md b/docs/sources/static/configuration/integrations/squid-config.md index dd2073a250ee..6bfff685a3f3 100644 --- a/docs/sources/static/configuration/integrations/squid-config.md +++ b/docs/sources/static/configuration/integrations/squid-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/squid-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/squid-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/squid-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/squid-config/ -title: squid_config description: Learn about squid_config +title: squid_config --- # squid_config diff --git a/docs/sources/static/configuration/integrations/statsd-exporter-config.md b/docs/sources/static/configuration/integrations/statsd-exporter-config.md index c76850967c08..87c31458951a 100644 --- a/docs/sources/static/configuration/integrations/statsd-exporter-config.md +++ b/docs/sources/static/configuration/integrations/statsd-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/statsd-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/statsd-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/statsd-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/statsd-exporter-config/ -title: statsd_exporter_config description: Learn about statsd_exporter_config +title: statsd_exporter_config --- # statsd_exporter_config diff --git a/docs/sources/static/configuration/integrations/windows-exporter-config.md b/docs/sources/static/configuration/integrations/windows-exporter-config.md index 3cbd5a3f3df8..53c58b60fe0b 100644 --- a/docs/sources/static/configuration/integrations/windows-exporter-config.md +++ b/docs/sources/static/configuration/integrations/windows-exporter-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../../configuration/integrations/windows-exporter-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/integrations/windows-exporter-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/integrations/windows-exporter-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/integrations/windows-exporter-config/ -title: windows_exporter_config description: Learn about windows_exporter_config +title: windows_exporter_config --- # windows_exporter_config diff --git a/docs/sources/static/configuration/logs-config.md b/docs/sources/static/configuration/logs-config.md index 24e0b491bdb9..56d8d0677394 100644 --- a/docs/sources/static/configuration/logs-config.md +++ b/docs/sources/static/configuration/logs-config.md @@ -1,10 +1,12 @@ --- aliases: -- ../../configuration/loki-config/ - ../../configuration/logs-config/ +- ../../configuration/loki-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/logs-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/logs-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/logs-config/ -title: logs_config description: Learn about logs_config +title: logs_config weight: 300 --- diff --git a/docs/sources/static/configuration/metrics-config.md b/docs/sources/static/configuration/metrics-config.md index d5cb9a91f41e..7022d2330704 100644 --- a/docs/sources/static/configuration/metrics-config.md +++ b/docs/sources/static/configuration/metrics-config.md @@ -1,10 +1,12 @@ --- aliases: -- ../../configuration/prometheus-config/ - ../../configuration/metrics-config/ +- ../../configuration/prometheus-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/metrics-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/metrics-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/metrics-config/ -title: metrics_config description: Learn about metrics_config +title: metrics_config weight: 200 --- diff --git a/docs/sources/static/configuration/scraping-service.md b/docs/sources/static/configuration/scraping-service.md index de33199adf3f..dd6f5d3f4b9f 100644 --- a/docs/sources/static/configuration/scraping-service.md +++ b/docs/sources/static/configuration/scraping-service.md @@ -1,11 +1,13 @@ --- aliases: -- ../../scraping-service/ - ../../configuration/scraping-service/ +- ../../scraping-service/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/scraping-service/ +- /docs/grafana-cloud/send-data/agent/static/configuration/scraping-service/ canonical: https://grafana.com/docs/agent/latest/static/configuration/scraping-service/ -title: Scraping service (Beta) -menuTitle: Scraping service description: Learn about the scraping service +menuTitle: Scraping service +title: Scraping service (Beta) weight: 600 --- diff --git a/docs/sources/static/configuration/server-config.md b/docs/sources/static/configuration/server-config.md index 55d84b14d8fc..aaba5fee0c80 100644 --- a/docs/sources/static/configuration/server-config.md +++ b/docs/sources/static/configuration/server-config.md @@ -1,9 +1,11 @@ --- aliases: - ../../configuration/server-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/server-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/server-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/server-config/ -title: server_config description: Learn about server_config +title: server_config weight: 100 --- diff --git a/docs/sources/static/configuration/traces-config.md b/docs/sources/static/configuration/traces-config.md index 682ce51f5741..b8c822f28bf8 100644 --- a/docs/sources/static/configuration/traces-config.md +++ b/docs/sources/static/configuration/traces-config.md @@ -2,9 +2,11 @@ aliases: - ../../configuration/tempo-config/ - ../../configuration/traces-config/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/configuration/traces-config/ +- /docs/grafana-cloud/send-data/agent/static/configuration/traces-config/ canonical: https://grafana.com/docs/agent/latest/static/configuration/traces-config/ -title: traces_config description: Learn about traces_config +title: traces_config weight: 400 --- diff --git a/docs/sources/static/operation-guide/_index.md b/docs/sources/static/operation-guide/_index.md index a050ba9fc9ce..0b84a78c3ccc 100644 --- a/docs/sources/static/operation-guide/_index.md +++ b/docs/sources/static/operation-guide/_index.md @@ -1,9 +1,11 @@ --- aliases: - ../operation-guide/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/operation-guide/ +- /docs/grafana-cloud/send-data/agent/static/operation-guide/ canonical: https://grafana.com/docs/agent/latest/static/operation-guide/ -title: Operation guide description: Learn how to operate Grafana Agent +title: Operation guide weight: 700 --- diff --git a/docs/sources/static/release-notes.md b/docs/sources/static/release-notes.md index f22381e48442..f0ee38486ac0 100644 --- a/docs/sources/static/release-notes.md +++ b/docs/sources/static/release-notes.md @@ -1,11 +1,13 @@ --- -canonical: https://grafana.com/docs/agent/latest/static/release-notes/ -description: Release notes for Grafana Agent static mode -title: Release notes -menuTitle: Release notes aliases: - ../upgrade-guide/ - ./upgrade-guide/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/release-notes/ +- /docs/grafana-cloud/send-data/agent/static/release-notes/ +canonical: https://grafana.com/docs/agent/latest/static/release-notes/ +description: Release notes for Grafana Agent static mode +menuTitle: Release notes +title: Release notes weight: 999 --- diff --git a/docs/sources/static/set-up/_index.md b/docs/sources/static/set-up/_index.md index aa8756184f84..93fb9171bff6 100644 --- a/docs/sources/static/set-up/_index.md +++ b/docs/sources/static/set-up/_index.md @@ -1,11 +1,12 @@ --- aliases: -- ../set-up +- ../set-up/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/ +- /docs/grafana-cloud/send-data/agent/static/set-up/ canonical: https://grafana.com/docs/agent/latest/static/set-up/ -description: Install and configure Grafana Agent in static mode +description: Learn how to set up Grafana Agent in static mode menuTitle: Set up static mode title: Set up Grafana Agent in static mode -description: Learn how to set up Grafana Agent in static mode weight: 100 --- diff --git a/docs/sources/static/set-up/deploy-agent.md b/docs/sources/static/set-up/deploy-agent.md index 4d4bc23002e8..2c3bb315b4dd 100644 --- a/docs/sources/static/set-up/deploy-agent.md +++ b/docs/sources/static/set-up/deploy-agent.md @@ -1,9 +1,11 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/deploy-agent/ +- /docs/grafana-cloud/send-data/agent/static/set-up/deploy-agent/ canonical: https://grafana.com/docs/agent/latest/static/set-up/deploy-agent/ -description: Learn how to plan for the Grafana Agent deployment +description: Learn how to deploy Grafana Agent in different topologies menuTitle: Deploy static mode title: Deploy Grafana Agent in static mode -description: Learn how to deploy Grafana Agent in different topologies weight: 300 --- diff --git a/docs/sources/static/set-up/install/_index.md b/docs/sources/static/set-up/install/_index.md index 1df90ef26319..ac6a8b51714d 100644 --- a/docs/sources/static/set-up/install/_index.md +++ b/docs/sources/static/set-up/install/_index.md @@ -1,11 +1,13 @@ --- aliases: -- ../set-up/ - ../ +- ../set-up/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/ +description: Learn how to install GRafana Agent in static mode menuTitle: Install static mode title: Install Grafana Agent in static mode -description: Learn how to install GRafana Agent in static mode weight: 100 --- diff --git a/docs/sources/static/set-up/install/install-agent-binary.md b/docs/sources/static/set-up/install/install-agent-binary.md index fb679436b9c1..b773e342fc3b 100644 --- a/docs/sources/static/set-up/install/install-agent-binary.md +++ b/docs/sources/static/set-up/install/install-agent-binary.md @@ -2,10 +2,12 @@ aliases: - ../../set-up/install-agent-binary/ - ../set-up/install-agent-binary/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-binary/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-binary/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-binary/ +description: Learn how to install Grafana Agent in static mode as a standalone binary menuTitle: Standalone title: Install Grafana Agent in static mode as a standalone binary -description: Learn how to install Grafana Agent in static mode as a standalone binary weight: 700 --- diff --git a/docs/sources/static/set-up/install/install-agent-docker.md b/docs/sources/static/set-up/install/install-agent-docker.md index 7f32cc4e6d7f..16061b22d56a 100644 --- a/docs/sources/static/set-up/install/install-agent-docker.md +++ b/docs/sources/static/set-up/install/install-agent-docker.md @@ -2,10 +2,12 @@ aliases: - ../../set-up/install-agent-docker/ - ../set-up/install-agent-docker/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-docker/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-docker/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-docker/ +description: Learn how to run Grafana Agent in static mode in a Docker container menuTitle: Docker title: Run Grafana Agent in static mode in a Docker container -description: Learn how to run Grafana Agent in static mode in a Docker container weight: 200 --- diff --git a/docs/sources/static/set-up/install/install-agent-kubernetes.md b/docs/sources/static/set-up/install/install-agent-kubernetes.md index f4b2d615a685..c8df4dd8fa33 100644 --- a/docs/sources/static/set-up/install/install-agent-kubernetes.md +++ b/docs/sources/static/set-up/install/install-agent-kubernetes.md @@ -1,8 +1,11 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-kubernetes/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-kubernetes/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-kubernetes/ +description: Learn how to deploy Grafana Agent in static mode on Kubernetes menuTitle: Kubernetes title: Deploy Grafana Agent in static mode on Kubernetes -description: Learn how to deploy Grafana Agent in static mode on Kubernetes weight: 300 --- diff --git a/docs/sources/static/set-up/install/install-agent-linux.md b/docs/sources/static/set-up/install/install-agent-linux.md index 63940fe92753..c2c784f17bfa 100644 --- a/docs/sources/static/set-up/install/install-agent-linux.md +++ b/docs/sources/static/set-up/install/install-agent-linux.md @@ -2,10 +2,12 @@ aliases: - ../../set-up/install-agent-linux/ - ../set-up/install-agent-linux/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-linux/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-linux/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-linux/ +description: Learn how to install Grafana Agent in static mode on Linux menuTitle: Linux title: Install Grafana Agent in static mode on Linux -description: Learn how to install Grafana Agent in static mode on Linux weight: 400 --- diff --git a/docs/sources/static/set-up/install/install-agent-macos.md b/docs/sources/static/set-up/install/install-agent-macos.md index fc5f7ecd480b..fb79d5cd1cfc 100644 --- a/docs/sources/static/set-up/install/install-agent-macos.md +++ b/docs/sources/static/set-up/install/install-agent-macos.md @@ -2,10 +2,12 @@ aliases: - ../../set-up/install-agent-macos/ - ../set-up/install-agent-macos/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-macos/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-macos/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-macos/ +description: Learn how to install Grafana Agent in static mode on macOS menuTitle: macOS title: Install Grafana Agent in static mode on macOS -description: Learn how to install Grafana Agent in static mode on macOS weight: 500 --- diff --git a/docs/sources/static/set-up/install/install-agent-on-windows.md b/docs/sources/static/set-up/install/install-agent-on-windows.md index 1df0abefc7a8..44e5e4dae0e7 100644 --- a/docs/sources/static/set-up/install/install-agent-on-windows.md +++ b/docs/sources/static/set-up/install/install-agent-on-windows.md @@ -2,10 +2,12 @@ aliases: - ../../set-up/install-agent-on-windows/ - ../set-up/install-agent-on-windows/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/install/install-agent-on-windows/ +- /docs/grafana-cloud/send-data/agent/static/set-up/install/install-agent-on-windows/ canonical: https://grafana.com/docs/agent/latest/static/set-up/install/install-agent-on-windows/ +description: Learn how to install Grafana Agent in static mode on Windows menuTitle: Windows title: Install Grafana Agent in static mode on Windows -description: Learn how to install Grafana Agent in static mode on Windows weight: 600 --- diff --git a/docs/sources/static/set-up/quick-starts.md b/docs/sources/static/set-up/quick-starts.md index 1c7990e3e1d5..848630ab5b5f 100644 --- a/docs/sources/static/set-up/quick-starts.md +++ b/docs/sources/static/set-up/quick-starts.md @@ -1,10 +1,12 @@ --- aliases: - ../../set-up/quick-starts/ +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/quick-starts/ +- /docs/grafana-cloud/send-data/agent/static/set-up/quick-starts/ canonical: https://grafana.com/docs/agent/latest/static/set-up/quick-starts/ +description: Learn how to get started with Grafana Agent in static mode menuTitle: Get started title: Grafana Agent quick starts -description: Learn how to get started with Grafana Agent in static mode weight: 300 --- diff --git a/docs/sources/static/set-up/start-agent.md b/docs/sources/static/set-up/start-agent.md index 52f6fa4df423..24f9582f928f 100644 --- a/docs/sources/static/set-up/start-agent.md +++ b/docs/sources/static/set-up/start-agent.md @@ -1,9 +1,11 @@ --- +aliases: +- /docs/grafana-cloud/monitor-infrastructure/agent/static/set-up/start-agent/ +- /docs/grafana-cloud/send-data/agent/static/set-up/start-agent/ canonical: https://grafana.com/docs/agent/latest/static/set-up/start-agent/ -description: Learn how to start, restart, and stop Grafana Agent after it is installed +description: Learn how to start, restart, and stop Grafana Agent in static mode menuTitle: Start static mode title: Start, restart, and stop Grafana Agent in static mode -description: Learn how to start, restart, and stop Grafana Agent in static mode weight: 200 --- diff --git a/tools/gen-crd-docs/template/pkg.tpl b/tools/gen-crd-docs/template/pkg.tpl index 61109728efcf..4050a2d5dad9 100644 --- a/tools/gen-crd-docs/template/pkg.tpl +++ b/tools/gen-crd-docs/template/pkg.tpl @@ -7,6 +7,7 @@ aliases: - /docs/grafana-cloud/agent/operator/api/ - /docs/grafana-cloud/monitor-infrastructure/agent/operator/api/ - /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/api/ +- /docs/grafana-cloud/send-data/agent/operator/api/ canonical: https://grafana.com/docs/agent/latest/operator/api/ title: Custom Resource Definition Reference description: Learn about the Grafana Agent API