diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf7b04d21ff..176266cb55a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,8 @@ Main (unreleased) - Add a `file_watch` block in `loki.source.file` to configure how often to poll files from disk for changes via `min_poll_frequency` and `max_poll_frequency`. In static mode it can be configured in the global `file_watch_config` via `min_poll_frequency` and `max_poll_frequency`. (@wildum) +- Flow: In `prometheus.exporter.blackbox`, allow setting labels for individual targets. (@spartan0x117) + ### Enhancements - Clustering: allow advertise interfaces to be configurable, with the possibility to select all available interfaces. (@wildum) @@ -57,6 +59,9 @@ Main (unreleased) - `loki.source.kafka` component now exposes internal label `__meta_kafka_offset` to indicate offset of consumed message. (@hainenber) +- Flow: improve river config validation step in `prometheus.scrape` by comparing `scrape_timeout` with `scrape_interval`. (@wildum) + + ### Other changes - Use Go 1.21.1 for builds. (@rfratto) @@ -69,6 +74,14 @@ Main (unreleased) `msg`, followed by non-common fields. Previously, the position of `msg` was not consistent. (@rfratto) +### Bugfixes + +- Fixed a bug where `otelcol.processor.discovery` could modify the `targets` passed by an upstream component. (@ptodev) + +- Fixed a bug where `otelcol` components with a retry mechanism would not wait after the first retry. (@rfratto) + +- Fixed a bug where documented default settings in `otelcol.exporter.loadbalancing` were never set. (@rfratto) + v0.36.1 (2023-09-06) -------------------- diff --git a/component/otelcol/config_retry.go b/component/otelcol/config_retry.go index 69450a190a0a..227246b01f49 100644 --- a/component/otelcol/config_retry.go +++ b/component/otelcol/config_retry.go @@ -3,6 +3,7 @@ package otelcol import ( "time" + "github.com/cenkalti/backoff/v4" otelexporterhelper "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -35,9 +36,11 @@ func (args *RetryArguments) Convert() *otelexporterhelper.RetrySettings { } return &otelexporterhelper.RetrySettings{ - Enabled: args.Enabled, - InitialInterval: args.InitialInterval, - MaxInterval: args.MaxInterval, - MaxElapsedTime: args.MaxElapsedTime, + Enabled: args.Enabled, + InitialInterval: args.InitialInterval, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, + MaxInterval: args.MaxInterval, + MaxElapsedTime: args.MaxElapsedTime, } } diff --git a/component/otelcol/exporter/loadbalancing/loadbalancing.go b/component/otelcol/exporter/loadbalancing/loadbalancing.go index d19f8a99b2a1..64a53b9d550f 100644 --- a/component/otelcol/exporter/loadbalancing/loadbalancing.go +++ b/component/otelcol/exporter/loadbalancing/loadbalancing.go @@ -48,10 +48,22 @@ var ( _ river.Defaulter = &Arguments{} ) -// DefaultArguments holds default values for Arguments. -var DefaultArguments = Arguments{ - RoutingKey: "traceID", -} +var ( + // DefaultArguments holds default values for Arguments. + DefaultArguments = Arguments{ + Protocol: Protocol{ + OTLP: DefaultOTLPConfig, + }, + RoutingKey: "traceID", + } + + DefaultOTLPConfig = OtlpConfig{ + Timeout: otelcol.DefaultTimeout, + Queue: otelcol.DefaultQueueArguments, + Retry: otelcol.DefaultRetryArguments, + Client: DefaultGRPCClientArguments, + } +) // SetToDefault implements river.Defaulter. func (args *Arguments) SetToDefault() { @@ -88,6 +100,10 @@ type OtlpConfig struct { Client GRPCClientArguments `river:"client,block"` } +func (OtlpConfig *OtlpConfig) SetToDefault() { + *OtlpConfig = DefaultOTLPConfig +} + func (otlpConfig OtlpConfig) Convert() otlpexporter.Config { return otlpexporter.Config{ TimeoutSettings: exporterhelper.TimeoutSettings{ diff --git a/component/otelcol/exporter/loadbalancing/loadbalancing_test.go b/component/otelcol/exporter/loadbalancing/loadbalancing_test.go index 6dc7645fda2f..28ba84e18017 100644 --- a/component/otelcol/exporter/loadbalancing/loadbalancing_test.go +++ b/component/otelcol/exporter/loadbalancing/loadbalancing_test.go @@ -15,17 +15,35 @@ import ( ) func TestConfigConversion(t *testing.T) { - defaultProtocol := loadbalancingexporter.Protocol{ - OTLP: otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ - Endpoint: "", - Compression: "gzip", - WriteBufferSize: 512 * 1024, - Headers: map[string]configopaque.String{}, - BalancerName: "pick_first", + var ( + defaultRetrySettings = exporterhelper.NewDefaultRetrySettings() + defaultTimeoutSettings = exporterhelper.NewDefaultTimeoutSettings() + + // TODO(rfratto): resync defaults with upstream. + // + // We have drifted from the upstream defaults, which have decreased the + // default queue_size to 1000 since we introduced the defaults. + defaultQueueSettings = exporterhelper.QueueSettings{ + Enabled: true, + NumConsumers: 10, + QueueSize: 5000, + } + + defaultProtocol = loadbalancingexporter.Protocol{ + OTLP: otlpexporter.Config{ + GRPCClientSettings: configgrpc.GRPCClientSettings{ + Endpoint: "", + Compression: "gzip", + WriteBufferSize: 512 * 1024, + Headers: map[string]configopaque.String{}, + BalancerName: "pick_first", + }, + RetrySettings: defaultRetrySettings, + TimeoutSettings: defaultTimeoutSettings, + QueueSettings: defaultQueueSettings, }, - }, - } + } + ) tests := []struct { testName string @@ -96,14 +114,15 @@ func TestConfigConversion(t *testing.T) { static { hostnames = ["endpoint-1", "endpoint-2:55678"] } - } - `, + }`, expected: loadbalancingexporter.Config{ Protocol: loadbalancingexporter.Protocol{ OTLP: otlpexporter.Config{ TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 1 * time.Second, }, + RetrySettings: defaultRetrySettings, + QueueSettings: defaultQueueSettings, GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "", Compression: "gzip", diff --git a/component/otelcol/processor/discovery/discovery.go b/component/otelcol/processor/discovery/discovery.go index 5325800c6b10..989712355199 100644 --- a/component/otelcol/processor/discovery/discovery.go +++ b/component/otelcol/processor/discovery/discovery.go @@ -77,7 +77,6 @@ func (args *Arguments) Validate() error { // Component is the otelcol.exporter.discovery component. type Component struct { - cfg Arguments consumer *promsdconsumer.Consumer logger log.Logger } @@ -134,18 +133,17 @@ func (c *Component) Run(ctx context.Context) error { // Update implements Component. func (c *Component) Update(newConfig component.Arguments) error { cfg := newConfig.(Arguments) - c.cfg = cfg hostLabels := make(map[string]discovery.Target) - for _, labels := range c.cfg.Targets { + for _, labels := range cfg.Targets { host, err := promsdconsumer.GetHostFromLabels(labels) if err != nil { level.Warn(c.logger).Log("msg", "ignoring target, unable to find address", "err", err) continue } - promsdconsumer.CleanupLabels(labels) - hostLabels[host] = labels + + hostLabels[host] = promsdconsumer.NewTargetsWithNonInternalLabels(labels) } err := c.consumer.UpdateOptions(promsdconsumer.Options{ diff --git a/component/prometheus/exporter/blackbox/blackbox.go b/component/prometheus/exporter/blackbox/blackbox.go index 9457b054b84b..6cf006af2aa2 100644 --- a/component/prometheus/exporter/blackbox/blackbox.go +++ b/component/prometheus/exporter/blackbox/blackbox.go @@ -38,6 +38,10 @@ func buildBlackboxTargets(baseTarget discovery.Target, args component.Arguments) a := args.(Arguments) for _, tgt := range a.Targets { target := make(discovery.Target) + // Set extra labels first, meaning that any other labels will override + for k, v := range tgt.Labels { + target[k] = v + } for k, v := range baseTarget { target[k] = v } @@ -62,9 +66,10 @@ var DefaultArguments = Arguments{ // BlackboxTarget defines a target to be used by the exporter. type BlackboxTarget struct { - Name string `river:",label"` - Target string `river:"address,attr"` - Module string `river:"module,attr,optional"` + Name string `river:",label"` + Target string `river:"address,attr"` + Module string `river:"module,attr,optional"` + Labels map[string]string `river:"labels,attr,optional"` } type TargetBlock []BlackboxTarget diff --git a/component/prometheus/exporter/blackbox/blackbox_test.go b/component/prometheus/exporter/blackbox/blackbox_test.go index 1fd149c821d9..ea871d775ba0 100644 --- a/component/prometheus/exporter/blackbox/blackbox_test.go +++ b/component/prometheus/exporter/blackbox/blackbox_test.go @@ -170,3 +170,47 @@ func TestBuildBlackboxTargets(t *testing.T) { require.Equal(t, "http://example.com", targets[0]["__param_target"]) require.Equal(t, "http_2xx", targets[0]["__param_module"]) } + +func TestBuildBlackboxTargetsWithExtraLabels(t *testing.T) { + baseArgs := Arguments{ + ConfigFile: "modules.yml", + Targets: TargetBlock{{ + Name: "target_a", + Target: "http://example.com", + Module: "http_2xx", + Labels: map[string]string{ + "env": "test", + "foo": "bar", + }, + }}, + ProbeTimeoutOffset: 1.0, + } + baseTarget := discovery.Target{ + model.SchemeLabel: "http", + model.MetricsPathLabel: "component/prometheus.exporter.blackbox.default/metrics", + "instance": "prometheus.exporter.blackbox.default", + "job": "integrations/blackbox", + "__meta_agent_integration_name": "blackbox", + "__meta_agent_integration_instance": "prometheus.exporter.blackbox.default", + } + args := component.Arguments(baseArgs) + targets := buildBlackboxTargets(baseTarget, args) + require.Equal(t, 1, len(targets)) + require.Equal(t, "integrations/blackbox/target_a", targets[0]["job"]) + require.Equal(t, "http://example.com", targets[0]["__param_target"]) + require.Equal(t, "http_2xx", targets[0]["__param_module"]) + + require.Equal(t, "test", targets[0]["env"]) + require.Equal(t, "bar", targets[0]["foo"]) + + // Check that the extra labels do not override existing labels + baseArgs.Targets[0].Labels = map[string]string{ + "job": "test", + "instance": "test-instance", + } + args = component.Arguments(baseArgs) + targets = buildBlackboxTargets(baseTarget, args) + require.Equal(t, 1, len(targets)) + require.Equal(t, "integrations/blackbox/target_a", targets[0]["job"]) + require.Equal(t, "prometheus.exporter.blackbox.default", targets[0]["instance"]) +} diff --git a/component/prometheus/scrape/scrape.go b/component/prometheus/scrape/scrape.go index ea7100d5de48..8c03fa9cbd30 100644 --- a/component/prometheus/scrape/scrape.go +++ b/component/prometheus/scrape/scrape.go @@ -109,6 +109,10 @@ func (arg *Arguments) SetToDefault() { // Validate implements river.Validator. func (arg *Arguments) Validate() error { + if arg.ScrapeTimeout > arg.ScrapeInterval { + return fmt.Errorf("scrape_timeout (%s) greater than scrape_interval (%s) for scrape config with job name %q", arg.ScrapeTimeout, arg.ScrapeInterval, arg.JobName) + } + // We must explicitly Validate because HTTPClientConfig is squashed and it won't run otherwise return arg.HTTPClientConfig.Validate() } diff --git a/component/prometheus/scrape/scrape_test.go b/component/prometheus/scrape/scrape_test.go index 49764c33cb87..65ab345259f2 100644 --- a/component/prometheus/scrape/scrape_test.go +++ b/component/prometheus/scrape/scrape_test.go @@ -204,3 +204,16 @@ func TestCustomDialer(t *testing.T) { err = scrapeTrigger.Wait(1 * time.Minute) require.NoError(t, err, "custom dialer was not used") } + +func TestValidateScrapeConfig(t *testing.T) { + var exampleRiverConfig = ` + targets = [{ "target1" = "target1" }] + forward_to = [] + scrape_interval = "10s" + scrape_timeout = "20s" + job_name = "local" +` + var args Arguments + err := river.Unmarshal([]byte(exampleRiverConfig), &args) + require.ErrorContains(t, err, "scrape_timeout (20s) greater than scrape_interval (10s) for scrape config with job name \"local\"") +} diff --git a/converter/internal/common/common.go b/converter/internal/common/river_utils.go similarity index 100% rename from converter/internal/common/common.go rename to converter/internal/common/river_utils.go diff --git a/converter/internal/common/validate.go b/converter/internal/common/validate.go index 22890ff286b1..ca514a668eca 100644 --- a/converter/internal/common/validate.go +++ b/converter/internal/common/validate.go @@ -10,9 +10,17 @@ import ( ) func UnsupportedNotDeepEquals(a any, b any, name string) diag.Diagnostics { + return UnsupportedNotDeepEqualsMessage(a, b, name, "") +} + +func UnsupportedNotDeepEqualsMessage(a any, b any, name string, message string) diag.Diagnostics { var diags diag.Diagnostics if !reflect.DeepEqual(a, b) { - diags.Add(diag.SeverityLevelError, fmt.Sprintf("unsupported %s config was provided.", name)) + if message != "" { + diags.Add(diag.SeverityLevelError, fmt.Sprintf("unsupported %s config was provided: %s", name, message)) + } else { + diags.Add(diag.SeverityLevelError, fmt.Sprintf("unsupported %s config was provided.", name)) + } } return diags diff --git a/converter/internal/prometheusconvert/prometheusconvert_test.go b/converter/internal/prometheusconvert/prometheusconvert_test.go index 4f7f4e2422cb..bded9ce3069c 100644 --- a/converter/internal/prometheusconvert/prometheusconvert_test.go +++ b/converter/internal/prometheusconvert/prometheusconvert_test.go @@ -9,5 +9,5 @@ import ( ) func TestConvert(t *testing.T) { - test_common.TestDirectory(t, "testdata", ".yaml", prometheusconvert.Convert) + test_common.TestDirectory(t, "testdata", ".yaml", true, prometheusconvert.Convert) } diff --git a/converter/internal/promtailconvert/promtailconvert_test.go b/converter/internal/promtailconvert/promtailconvert_test.go index 136b9ba395c6..2ebeb3c1ada0 100644 --- a/converter/internal/promtailconvert/promtailconvert_test.go +++ b/converter/internal/promtailconvert/promtailconvert_test.go @@ -9,5 +9,5 @@ import ( ) func TestConvert(t *testing.T) { - test_common.TestDirectory(t, "testdata", ".yaml", promtailconvert.Convert) + test_common.TestDirectory(t, "testdata", ".yaml", true, promtailconvert.Convert) } diff --git a/converter/internal/staticconvert/internal/build/builder.go b/converter/internal/staticconvert/internal/build/builder.go index bfed002e53d0..a4d7ae3a3e1f 100644 --- a/converter/internal/staticconvert/internal/build/builder.go +++ b/converter/internal/staticconvert/internal/build/builder.go @@ -53,12 +53,28 @@ func NewIntegrationsV1ConfigBuilder(f *builder.File, diags *diag.Diagnostics, cf } } -func (b *IntegrationsV1ConfigBuilder) AppendIntegrations() { +func (b *IntegrationsV1ConfigBuilder) Build() { + b.appendLogging(b.cfg.Server) + b.appendServer(b.cfg.Server) + b.appendIntegrations() +} + +func (b *IntegrationsV1ConfigBuilder) appendIntegrations() { for _, integration := range b.cfg.Integrations.ConfigV1.Integrations { if !integration.Common.Enabled { continue } + scrapeIntegration := b.cfg.Integrations.ConfigV1.ScrapeIntegrations + if integration.Common.ScrapeIntegration != nil { + scrapeIntegration = *integration.Common.ScrapeIntegration + } + + if !scrapeIntegration { + b.diags.Add(diag.SeverityLevelError, fmt.Sprintf("unsupported integration which is not being scraped was provided: %s.", integration.Name())) + continue + } + var exports discovery.Exports switch itg := integration.Config.(type) { case *apache_http.Config: @@ -116,27 +132,24 @@ func (b *IntegrationsV1ConfigBuilder) AppendIntegrations() { } func (b *IntegrationsV1ConfigBuilder) appendExporter(commonConfig *int_config.Common, name string, extraTargets []discovery.Target) { - scrapeConfigs := []*prom_config.ScrapeConfig{} - if b.cfg.Integrations.ConfigV1.ScrapeIntegrations { - scrapeConfig := prom_config.DefaultScrapeConfig - scrapeConfig.JobName = fmt.Sprintf("integrations/%s", name) - scrapeConfig.RelabelConfigs = commonConfig.RelabelConfigs - scrapeConfig.MetricRelabelConfigs = commonConfig.MetricRelabelConfigs - // TODO: Add support for scrapeConfig.HTTPClientConfig - - scrapeConfig.ScrapeInterval = model.Duration(commonConfig.ScrapeInterval) - if commonConfig.ScrapeInterval == 0 { - scrapeConfig.ScrapeInterval = b.cfg.Integrations.ConfigV1.PrometheusGlobalConfig.ScrapeInterval - } - - scrapeConfig.ScrapeTimeout = model.Duration(commonConfig.ScrapeTimeout) - if commonConfig.ScrapeTimeout == 0 { - scrapeConfig.ScrapeTimeout = b.cfg.Integrations.ConfigV1.PrometheusGlobalConfig.ScrapeTimeout - } + scrapeConfig := prom_config.DefaultScrapeConfig + scrapeConfig.JobName = fmt.Sprintf("integrations/%s", name) + scrapeConfig.RelabelConfigs = commonConfig.RelabelConfigs + scrapeConfig.MetricRelabelConfigs = commonConfig.MetricRelabelConfigs + scrapeConfig.HTTPClientConfig.TLSConfig = b.cfg.Integrations.ConfigV1.TLSConfig + + scrapeConfig.ScrapeInterval = model.Duration(commonConfig.ScrapeInterval) + if commonConfig.ScrapeInterval == 0 { + scrapeConfig.ScrapeInterval = b.cfg.Integrations.ConfigV1.PrometheusGlobalConfig.ScrapeInterval + } - scrapeConfigs = []*prom_config.ScrapeConfig{&scrapeConfig} + scrapeConfig.ScrapeTimeout = model.Duration(commonConfig.ScrapeTimeout) + if commonConfig.ScrapeTimeout == 0 { + scrapeConfig.ScrapeTimeout = b.cfg.Integrations.ConfigV1.PrometheusGlobalConfig.ScrapeTimeout } + scrapeConfigs := []*prom_config.ScrapeConfig{&scrapeConfig} + promConfig := &prom_config.Config{ GlobalConfig: b.cfg.Integrations.ConfigV1.PrometheusGlobalConfig, ScrapeConfigs: scrapeConfigs, diff --git a/converter/internal/staticconvert/internal/build/logging.go b/converter/internal/staticconvert/internal/build/logging.go new file mode 100644 index 000000000000..c70bc03d30cb --- /dev/null +++ b/converter/internal/staticconvert/internal/build/logging.go @@ -0,0 +1,27 @@ +package build + +import ( + "reflect" + + "github.com/grafana/agent/converter/internal/common" + "github.com/grafana/agent/pkg/flow/logging" + "github.com/grafana/agent/pkg/server" +) + +func (b *IntegrationsV1ConfigBuilder) appendLogging(config *server.Config) { + args := toLogging(config) + if !reflect.DeepEqual(*args, logging.DefaultOptions) { + b.f.Body().AppendBlock(common.NewBlockWithOverride( + []string{"logging"}, + "", + args, + )) + } +} + +func toLogging(config *server.Config) *logging.Options { + return &logging.Options{ + Level: logging.Level(config.LogLevel.String()), + Format: logging.Format(config.LogFormat.String()), + } +} diff --git a/converter/internal/staticconvert/internal/build/server.go b/converter/internal/staticconvert/internal/build/server.go new file mode 100644 index 000000000000..c1c2ada3814f --- /dev/null +++ b/converter/internal/staticconvert/internal/build/server.go @@ -0,0 +1,61 @@ +package build + +import ( + "reflect" + + "github.com/grafana/agent/converter/internal/common" + "github.com/grafana/agent/pkg/server" + "github.com/grafana/agent/service/http" +) + +func (b *IntegrationsV1ConfigBuilder) appendServer(config *server.Config) { + args := toServer(config) + if !reflect.DeepEqual(*args.TLS, http.TLSArguments{}) { + b.f.Body().AppendBlock(common.NewBlockWithOverride( + []string{"http"}, + "", + args, + )) + } +} + +func toServer(config *server.Config) *http.Arguments { + authType, err := server.GetClientAuthFromString(config.HTTP.TLSConfig.ClientAuth) + if err != nil { + panic(err) + } + + return &http.Arguments{ + TLS: &http.TLSArguments{ + Cert: "", + CertFile: config.HTTP.TLSConfig.TLSCertPath, + Key: "", + KeyFile: config.HTTP.TLSConfig.TLSKeyPath, + ClientCA: "", + ClientCAFile: config.HTTP.TLSConfig.ClientCAs, + ClientAuth: http.ClientAuth(authType), + CipherSuites: toHTTPTLSCipher(config.HTTP.TLSConfig.CipherSuites), + CurvePreferences: toHTTPTLSCurve(config.HTTP.TLSConfig.CurvePreferences), + MinVersion: http.TLSVersion(config.HTTP.TLSConfig.MinVersion), + MaxVersion: http.TLSVersion(config.HTTP.TLSConfig.MaxVersion), + }, + } +} + +func toHTTPTLSCipher(cipherSuites []server.TLSCipher) []http.TLSCipher { + var result []http.TLSCipher + for _, cipcipherSuite := range cipherSuites { + result = append(result, http.TLSCipher(cipcipherSuite)) + } + + return result +} + +func toHTTPTLSCurve(curvePreferences []server.TLSCurve) []http.TLSCurve { + var result []http.TLSCurve + for _, curvePreference := range curvePreferences { + result = append(result, http.TLSCurve(curvePreference)) + } + + return result +} diff --git a/converter/internal/staticconvert/staticconvert.go b/converter/internal/staticconvert/staticconvert.go index 23d3ac3d93e1..d649dfcf20b9 100644 --- a/converter/internal/staticconvert/staticconvert.go +++ b/converter/internal/staticconvert/staticconvert.go @@ -66,8 +66,8 @@ func AppendAll(f *builder.File, staticConfig *config.Config) diag.Diagnostics { diags.AddAll(appendStaticPrometheus(f, staticConfig)) diags.AddAll(appendStaticPromtail(f, staticConfig)) diags.AddAll(appendStaticIntegrationsV1(f, staticConfig)) + // TODO integrations v2 // TODO otel - // TODO other diags.AddAll(validate(staticConfig)) @@ -158,7 +158,7 @@ func appendStaticIntegrationsV1(f *builder.File, staticConfig *config.Config) di var diags diag.Diagnostics b := build.NewIntegrationsV1ConfigBuilder(f, &diags, staticConfig, &build.GlobalContext{LabelPrefix: "integrations"}) - b.AppendIntegrations() + b.Build() return diags } diff --git a/converter/internal/staticconvert/staticconvert_test.go b/converter/internal/staticconvert/staticconvert_test.go index 188ef481b710..e7017b119059 100644 --- a/converter/internal/staticconvert/staticconvert_test.go +++ b/converter/internal/staticconvert/staticconvert_test.go @@ -10,9 +10,12 @@ import ( ) func TestConvert(t *testing.T) { - test_common.TestDirectory(t, "testdata", ".yaml", staticconvert.Convert) + test_common.TestDirectory(t, "testdata", ".yaml", true, staticconvert.Convert) + + // This test has a race condition due to downstream code so skip loading the config + test_common.TestDirectory(t, "testdata-race", ".yaml", false, staticconvert.Convert) if runtime.GOOS == "windows" { - test_common.TestDirectory(t, "testdata_windows", ".yaml", staticconvert.Convert) + test_common.TestDirectory(t, "testdata_windows", ".yaml", true, staticconvert.Convert) } } diff --git a/converter/internal/staticconvert/testdata-race/example-cert.pem b/converter/internal/staticconvert/testdata-race/example-cert.pem new file mode 100644 index 000000000000..761f93aeea21 --- /dev/null +++ b/converter/internal/staticconvert/testdata-race/example-cert.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC6jCCAdICCQCOLEZvJLYQlDANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQGEwJV +UzELMAkGA1UECAwCRkwxDDAKBgNVBAoMA09yZzENMAsGA1UEAwwEcm9vdDAeFw0y +MjAzMDkxNjM1NTRaFw0zMjAzMDYxNjM1NTRaMDcxCzAJBgNVBAYTAlVTMQswCQYD +VQQIDAJGTDEMMAoGA1UECgwDT3JnMQ0wCwYDVQQDDARyb290MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx63pDVP4z4psrU6i5qOCUSjUGFkGRUekdrJ9 +FtkOEyoQSl2hpkF+QAGvM2L3+bqH8Y1CZ7yakkCncSmzpXShVg2D2nxHkwYVGhmz +rzwHttmewokrWtw72ta6v9gxljxNLjz+HsYovKFGbudnOcK3BxseluikrOM08fEi +SF7Y1FJkyr103K7yjtRyNH2tKHGiK73wjkLBkd6WWFIrtMbNP0McXqkipOSg9dwY +OKfuVDzD/fCkW24j2pgHAI+4TQWC6PSIGMVZ76I5hhYd0WLi/8KaBu/gfqmDjnBn +qqJONoAxT5kEmXWwE5jO0ZOWx88S2D9wmBNIx8HtMLh+7pVQ7QIDAQABMA0GCSqG +SIb3DQEBCwUAA4IBAQBM85fNb+7b+3q0+uDw/fgrUkYfAVjJX+uN3ONy50qnKWe7 +SAqLC76HVHLa9hdT7OENQurCCrEtnV1Fzg0KNqtE8gW5rPrV44FZrC5YnpqrHoKp +VZeff+Mficioif5KkaELZILgduwYXe/H9r6qg87mHU4zpFlDUnUFCfLDtrO4fc79 +BEpoUXLf5tCwRLUv/d0eeksMqUf5ES4tWfzUVLCjSEEcuX0GIgWdcyG3thCauPWC +9a/QEXqqDC46AgsvkHCNWRoC8TSob5usTJDflodHoree6eaWx6j8ZGA/Uc0ohalJ +XYGN7R9ge9KeqmwvYI6hr/n+WM92Jeqnz9BVWaiQ +-----END CERTIFICATE----- diff --git a/converter/internal/staticconvert/testdata-race/example-key.pem b/converter/internal/staticconvert/testdata-race/example-key.pem new file mode 100644 index 000000000000..8be1dc127d7a --- /dev/null +++ b/converter/internal/staticconvert/testdata-race/example-key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAx63pDVP4z4psrU6i5qOCUSjUGFkGRUekdrJ9FtkOEyoQSl2h +pkF+QAGvM2L3+bqH8Y1CZ7yakkCncSmzpXShVg2D2nxHkwYVGhmzrzwHttmewokr +Wtw72ta6v9gxljxNLjz+HsYovKFGbudnOcK3BxseluikrOM08fEiSF7Y1FJkyr10 +3K7yjtRyNH2tKHGiK73wjkLBkd6WWFIrtMbNP0McXqkipOSg9dwYOKfuVDzD/fCk +W24j2pgHAI+4TQWC6PSIGMVZ76I5hhYd0WLi/8KaBu/gfqmDjnBnqqJONoAxT5kE +mXWwE5jO0ZOWx88S2D9wmBNIx8HtMLh+7pVQ7QIDAQABAoIBADh7XxLgD99U/oy/ +U6D921ztuaDxfa6XJ1RUBMIzv6F4IoeGmLUYjYe5cj+M3SwMsWuIU6JYXTjFhRej +fidtKD3ZMNTalrxl2g45+vO0fVIhmKDagCMBbQTn/IdLtisS/5n2ssMttlQ1ImE4 +n6BdDby61RpG0F3/HvjZBqOGALt92qaE8xmUKa8K7SVNnS7BSE+m9tn0pxJsvxCu +3WALdAELECLLKB2bpW5u+v5niBT7Min2Oi1uJbd5SWyWqGmiX8MQ+yXPjAmQxd5D +6L9okqOB6vkfgkuVCAc2d73NI3BE7HJqcE5PboY+ZVTcFdBGYMhvjLeXnUlMZREZ +B7TcT4ECgYEA9QNIoozXsRwpCQGDLm0a6ZGc1NjNUtd0udOqexTSPkdhvR0sNJep +3mjaWCBwipLTmBKs5gv+0i9V6S28r6Pq93EoJVToDPPLq+7UYMi/7vmshNWrMTBD +N/mWF92d7gSC8cgXSnZwAz40QwIZYU6OXJL5s1YN6r/1vLRoPsbkgVECgYEA0KI0 +Ms4f9XqrrzzT9byaUUtXrSMyFVag995q5lvV5pipwkWOyWscD5tHt5GfOu15F4Ut ++k2pqXmO1FveUO9wMxFEP8LOKuoKUZ2jzJ7IUiz3TwMcQjlV7C6n5NtIsBrlElqW +C2/HYgSw+T87T63WK8467KLgQ09yEFEIg1p7Tt0CgYEAgEqz4cl1t1tTcU/FbK3c +hailQh4zhMkkaZkXj1Mbs1iVKPz5hKBVZgvpKHPz+dtfyCUfO2XUjCIVDf/Q6Pcf +tWke6E1JJF8Tqndn5TW4ql05pGRtO1hWGh0qJlz4sQTTu95Vs7vIcypDG0MiHv2P +NZIQBYNtzhmthp3AZ/6k78ECgYEAty6T8j+1I84PTA92c36jZ9llI+mRIdcsAjZR +We0sRAmqk56LHiJjQvit4WmEizLSbWpL0ke6PckzNRVsf1ecBdqVN/6NEnTnln14 +wkJv1GcSxVcPyr2YyYS1eWVnzufuVU0gDO6Z+1/vGwj/xJf3QgMTDY58pdztY5Ii +jWI2fikCgYEAmGEmcPOu8IjYNN+YdQ1CeF909oSH++Nqr34IB5/e2Wr9WVknfHzZ +wIfzlUJUQO0so0LDaB7UQKk0Xk3+OP6Udw8xFfr/P5s++bvnKr3j5iHn6taqPs+v +PFxn+7KqdYVQ4RYRYLsy6NF+MhXt2sDAhiScxVnkh09t6sT1UG9xKW4= +-----END RSA PRIVATE KEY----- diff --git a/converter/internal/staticconvert/testdata/unsupported.diags b/converter/internal/staticconvert/testdata-race/unsupported.diags similarity index 66% rename from converter/internal/staticconvert/testdata/unsupported.diags rename to converter/internal/staticconvert/testdata-race/unsupported.diags index 3d1a4e778a70..d75a2f33ce42 100644 --- a/converter/internal/staticconvert/testdata/unsupported.diags +++ b/converter/internal/staticconvert/testdata-race/unsupported.diags @@ -1,15 +1,15 @@ (Error) global positions configuration is not supported - each Flow Mode's loki.source.file component has its own positions file in the component's data directory (Warning) server.log_level is not supported - Flow mode components may produce different logs +(Error) unsupported integration which is not being scraped was provided: mssql. (Error) mapping_config is not supported in statsd_exporter integrations config (Warning) Please review your agent command line flags and ensure they are set in your Flow mode config file where necessary. -(Error) unsupported log_level server config was provided. -(Error) unsupported log_format server config was provided. -(Error) unsupported grpc_tls_config server config was provided. -(Error) unsupported http_tls_config server config was provided. +(Error) unsupported grpc_tls_config server config was provided: flow mode does not have a gRPC server to configure. +(Error) unsupported prefer_server_cipher_suites server config was provided. +(Error) unsupported windows_certificate_filter server config was provided. (Error) unsupported wal_directory metrics config was provided. use the run command flag --storage.path for Flow mode instead. (Error) unsupported integration agent was provided. (Error) unsupported integration azure_exporter was provided. (Error) unsupported integration cadvisor was provided. -(Error) unsupported disabled integration node_exporter. +(Warning) disabled integrations do nothing and are not included in the output: node_exporter. (Error) unsupported traces config was provided. (Error) unsupported agent_management config was provided. \ No newline at end of file diff --git a/converter/internal/staticconvert/testdata/unsupported.river b/converter/internal/staticconvert/testdata-race/unsupported.river similarity index 76% rename from converter/internal/staticconvert/testdata/unsupported.river rename to converter/internal/staticconvert/testdata-race/unsupported.river index a4b104b52877..849a491eda36 100644 --- a/converter/internal/staticconvert/testdata/unsupported.river +++ b/converter/internal/staticconvert/testdata-race/unsupported.river @@ -17,6 +17,20 @@ prometheus.remote_write "metrics_agent" { } } +logging { + level = "debug" + format = "json" +} + +http { + tls { + cert_file = "./testdata/example-cert.pem" + key_file = "./testdata/example-key.pem" + client_ca_file = "./testdata/example-cert.pem" + client_auth_type = "VerifyClientCertIfGiven" + } +} + prometheus.exporter.statsd "integrations_statsd_exporter" { } prometheus.scrape "integrations_statsd_exporter" { diff --git a/converter/internal/staticconvert/testdata/unsupported.yaml b/converter/internal/staticconvert/testdata-race/unsupported.yaml similarity index 79% rename from converter/internal/staticconvert/testdata/unsupported.yaml rename to converter/internal/staticconvert/testdata-race/unsupported.yaml index be9e30401501..a61b289c0647 100644 --- a/converter/internal/staticconvert/testdata/unsupported.yaml +++ b/converter/internal/staticconvert/testdata-race/unsupported.yaml @@ -2,9 +2,18 @@ server: log_level: debug log_format: json http_tls_config: - cert_file: "/something.cert" + client_ca_file: "./testdata/example-cert.pem" + cert_file: "./testdata/example-cert.pem" + key_file: "./testdata/example-key.pem" + client_auth_type: "VerifyClientCertIfGiven" + prefer_server_cipher_suites: true + windows_certificate_filter: + server: + store: "something" grpc_tls_config: - cert_file: "/something2.cert" + client_ca_file: "/something4.cert" + cert_file: "/something5.cert" + key_file: "/something6.cert" metrics: wal_directory: /tmp/agent @@ -45,6 +54,9 @@ integrations: - nodepool cadvisor: enabled: true + mssql: + enabled: true + scrape_integration: false node_exporter: enabled: false statsd_exporter: diff --git a/converter/internal/staticconvert/testdata/integrations.river b/converter/internal/staticconvert/testdata/integrations.river index d4f1495bc399..e411f4c556d5 100644 --- a/converter/internal/staticconvert/testdata/integrations.river +++ b/converter/internal/staticconvert/testdata/integrations.river @@ -6,6 +6,12 @@ prometheus.scrape "integrations_apache_http" { targets = prometheus.exporter.apache.integrations_apache_http.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/apache_http" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.remote_write "integrations" { @@ -30,6 +36,12 @@ prometheus.scrape "integrations_blackbox" { targets = prometheus.exporter.blackbox.integrations_blackbox.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/blackbox" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.snmp "integrations_snmp" { @@ -52,6 +64,12 @@ prometheus.scrape "integrations_snmp" { targets = prometheus.exporter.snmp.integrations_snmp.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/snmp" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.cloudwatch "integrations_cloudwatch_exporter" { @@ -84,6 +102,12 @@ prometheus.scrape "integrations_cloudwatch_exporter" { targets = prometheus.exporter.cloudwatch.integrations_cloudwatch_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/cloudwatch_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.consul "integrations_consul_exporter" { } @@ -92,6 +116,12 @@ prometheus.scrape "integrations_consul_exporter" { targets = prometheus.exporter.consul.integrations_consul_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/consul_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.dnsmasq "integrations_dnsmasq_exporter" { @@ -112,6 +142,12 @@ prometheus.scrape "integrations_dnsmasq_exporter" { targets = discovery.relabel.integrations_dnsmasq_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/dnsmasq_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.elasticsearch "integrations_elasticsearch_exporter" { } @@ -120,6 +156,12 @@ prometheus.scrape "integrations_elasticsearch_exporter" { targets = prometheus.exporter.elasticsearch.integrations_elasticsearch_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/elasticsearch_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.gcp "integrations_gcp_exporter" { @@ -132,6 +174,12 @@ prometheus.scrape "integrations_gcp_exporter" { targets = prometheus.exporter.gcp.integrations_gcp_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/gcp_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.github "integrations_github_exporter" { @@ -143,6 +191,12 @@ prometheus.scrape "integrations_github_exporter" { targets = prometheus.exporter.github.integrations_github_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/github_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.kafka "integrations_kafka_exporter" { } @@ -151,6 +205,12 @@ prometheus.scrape "integrations_kafka_exporter" { targets = prometheus.exporter.kafka.integrations_kafka_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/kafka_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.memcached "integrations_memcached_exporter" { @@ -171,6 +231,12 @@ prometheus.scrape "integrations_memcached_exporter" { targets = discovery.relabel.integrations_memcached_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/memcached_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.mongodb "integrations_mongodb_exporter" { @@ -198,6 +264,12 @@ prometheus.scrape "integrations_mongodb_exporter" { targets = discovery.relabel.integrations_mongodb_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/mongodb_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.mssql "integrations_mssql" { @@ -208,6 +280,12 @@ prometheus.scrape "integrations_mssql" { targets = prometheus.exporter.mssql.integrations_mssql.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/mssql" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.mysql "integrations_mysqld_exporter" { @@ -228,6 +306,12 @@ prometheus.scrape "integrations_mysqld_exporter" { targets = discovery.relabel.integrations_mysqld_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/mysqld_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.unix { } @@ -255,6 +339,12 @@ 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" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.relabel "integrations_node_exporter" { @@ -280,6 +370,12 @@ prometheus.scrape "integrations_oracledb" { forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/oracledb" scrape_timeout = "1m0s" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.postgres "integrations_postgres_exporter" { @@ -300,6 +396,12 @@ prometheus.scrape "integrations_postgres_exporter" { targets = discovery.relabel.integrations_postgres_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/postgres_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.process "integrations_process_exporter" { @@ -313,6 +415,12 @@ prometheus.scrape "integrations_process_exporter" { targets = prometheus.exporter.process.integrations_process_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/process_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.redis "integrations_redis_exporter" { @@ -333,6 +441,12 @@ prometheus.scrape "integrations_redis_exporter" { targets = discovery.relabel.integrations_redis_exporter.output forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/redis_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.snowflake "integrations_snowflake" { @@ -346,6 +460,12 @@ prometheus.scrape "integrations_snowflake" { targets = prometheus.exporter.snowflake.integrations_snowflake.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/snowflake" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.squid "integrations_squid" { @@ -357,6 +477,12 @@ prometheus.scrape "integrations_squid" { forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/squid" scrape_timeout = "1m0s" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } prometheus.exporter.statsd "integrations_statsd_exporter" { } @@ -365,4 +491,10 @@ prometheus.scrape "integrations_statsd_exporter" { targets = prometheus.exporter.statsd.integrations_statsd_exporter.targets forward_to = [prometheus.remote_write.integrations.receiver] job_name = "integrations/statsd_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } } diff --git a/converter/internal/staticconvert/testdata/integrations.yaml b/converter/internal/staticconvert/testdata/integrations.yaml index 8e471a625568..27884f65f6ac 100644 --- a/converter/internal/staticconvert/testdata/integrations.yaml +++ b/converter/internal/staticconvert/testdata/integrations.yaml @@ -4,6 +4,10 @@ metrics: - url: http://localhost:9009/api/prom/push integrations: + http_tls_config: + ca_file: "/something7.cert" + cert_file: "/something8.cert" + key_file: "/something9.cert" scrape_integrations: true apache_http: enabled: true diff --git a/converter/internal/staticconvert/validate.go b/converter/internal/staticconvert/validate.go index 695f2454b0d6..24ced7fff293 100644 --- a/converter/internal/staticconvert/validate.go +++ b/converter/internal/staticconvert/validate.go @@ -65,14 +65,15 @@ func validateServer(serverConfig *server.Config) diag.Diagnostics { var diags diag.Diagnostics defaultServerConfig := server.DefaultConfig() - diags.AddAll(common.UnsupportedNotDeepEquals(serverConfig.LogLevel.Level.Logrus, defaultServerConfig.LogLevel.Level.Logrus, "log_level server")) - diags.AddAll(common.UnsupportedNotDeepEquals(serverConfig.LogFormat, defaultServerConfig.LogFormat, "log_format server")) - diags.AddAll(common.UnsupportedNotDeepEquals(serverConfig.GRPC, defaultServerConfig.GRPC, "grpc_tls_config server")) - diags.AddAll(common.UnsupportedNotDeepEquals(serverConfig.HTTP, defaultServerConfig.HTTP, "http_tls_config server")) + diags.AddAll(common.UnsupportedNotDeepEqualsMessage(serverConfig.GRPC, defaultServerConfig.GRPC, "grpc_tls_config server", "flow mode does not have a gRPC server to configure.")) + diags.AddAll(common.UnsupportedNotEquals(serverConfig.HTTP.TLSConfig.PreferServerCipherSuites, defaultServerConfig.HTTP.TLSConfig.PreferServerCipherSuites, "prefer_server_cipher_suites server")) + diags.AddAll(common.UnsupportedNotDeepEquals(serverConfig.HTTP.TLSConfig.WindowsCertificateFilter, defaultServerConfig.HTTP.TLSConfig.WindowsCertificateFilter, "windows_certificate_filter server")) return diags } +// validateMetrics validates the metrics config for anything not already +// covered by appendStaticPrometheus. func validateMetrics(metricsConfig metrics.Config, grpcListenPort int) diag.Diagnostics { var diags diag.Diagnostics @@ -100,7 +101,7 @@ func validateIntegrations(integrationsConfig config.VersionedIntegrations) diag. for _, integration := range integrationsConfig.ConfigV1.Integrations { if !integration.Common.Enabled { - diags.Add(diag.SeverityLevelError, fmt.Sprintf("unsupported disabled integration %s.", integration.Name())) + diags.Add(diag.SeverityLevelWarn, fmt.Sprintf("disabled integrations do nothing and are not included in the output: %s.", integration.Name())) continue } @@ -144,6 +145,8 @@ func validateTraces(tracesConfig traces.Config) diag.Diagnostics { return diags } +// validateLogs validates the logs config for anything not already covered +// by appendStaticPromtail. func validateLogs(logsConfig *logs.Config) diag.Diagnostics { var diags diag.Diagnostics diff --git a/converter/internal/test_common/testing.go b/converter/internal/test_common/testing.go index 1d47079acb5a..ebcd83f302fb 100644 --- a/converter/internal/test_common/testing.go +++ b/converter/internal/test_common/testing.go @@ -38,7 +38,7 @@ const ( // 4. If the current filename.sourceSuffix has a matching filename.river, read // the contents of filename.river and validate that they match the river // configuration generated by calling convert in step 1. -func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, convert func(in []byte) ([]byte, diag.Diagnostics)) { +func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, loadFlowConfig bool, convert func(in []byte) ([]byte, diag.Diagnostics)) { require.NoError(t, filepath.WalkDir(folderPath, func(path string, d fs.DirEntry, _ error) error { if d.IsDir() { return nil @@ -63,7 +63,7 @@ func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, convert validateDiags(t, expectedDiags, actualDiags) expectedRiver := getExpectedRiver(t, riverFile) - validateRiver(t, expectedRiver, actualRiver) + validateRiver(t, expectedRiver, actualRiver, loadFlowConfig) }) } @@ -152,7 +152,7 @@ func fileExists(path string) bool { } // validateRiver makes sure the expected river and actual river are a match -func validateRiver(t *testing.T, expectedRiver []byte, actualRiver []byte) { +func validateRiver(t *testing.T, expectedRiver []byte, actualRiver []byte, loadFlowConfig bool) { if len(expectedRiver) > 0 { if !reflect.DeepEqual(expectedRiver, actualRiver) { fmt.Println("============== ACTUAL =============") @@ -162,7 +162,9 @@ func validateRiver(t *testing.T, expectedRiver []byte, actualRiver []byte) { require.Equal(t, string(expectedRiver), string(normalizeLineEndings(actualRiver))) - attemptLoadingFlowConfig(t, actualRiver) + if loadFlowConfig { + attemptLoadingFlowConfig(t, actualRiver) + } } } diff --git a/docs/Makefile b/docs/Makefile index a7963e99934f..473f6bab03d7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -11,11 +11,11 @@ include docs.mk docs: check-cloudwatch-integration check-cloudwatch-integration: - $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.19.4-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md - $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.19.4-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md + $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md + $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md generate-cloudwatch-integration: - $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.19.4-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go generate + $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go generate sources/assets/hierarchy.svg: sources/operator/hierarchy.dot cat $< | $(PODMAN) run --rm -i nshine/dot dot -Tsvg > $@ diff --git a/docs/developer/windows/certificate_store/README.md b/docs/developer/windows/certificate_store/README.md new file mode 100644 index 000000000000..b0d020c7477b --- /dev/null +++ b/docs/developer/windows/certificate_store/README.md @@ -0,0 +1,143 @@ +# Guide to setting up a Windows Server for Certificate Testing + +This guide is used to set up a Windows Server for Windows Store Certificate Testing. This guide assumes you have downloaded a Windows 2022 Server ISO and have installed the Windows Server onto a virtual machine. Certificate Templates can only be installed on Windows Server and it must enabled as an Enterprise Certificate Authority. This guide is NOT meant to be a guide on how to set up a Windows Server for production use, and is meant only for setting up an environment to test the Grafana Agent and certificate store. + +## Prerequisites + +* The install should be fresh with no server roles defined or installed. +* You should be logged in via an administrator account. + +## Set up as domain controller + +1. Add `Active Directory Domain Services`. +2. Add to a new forest, and when asked for a name, use `test.example.com`. +3. Add a NETBIOS name `TESTCERT`. +4. Continue the feature install until done. +6. Reboot. If the set up succeeded, your username will be prefixed with `TESTCERT/` on login screen. + + +## Set up certificate management + +For this setup we are using a one-node Domain Controller set up as the Enterprise CA. + +1. Go to the Server Management window. +![](./images/initial.png) +2. Click Add Roles. +![](./images/addroles.png) +3. Select `Active Directory Certificate Services`. +![](./images/certificateservices.png) + +4. Select `Certificate Authority`, and `Certificate Authority Web Enrollment`. Note that we will need the `Certificate Web Enrollment Service`, but it must be installed after the `Certificate Authority`. + +5. Install and then select configure `Certificate Authority`. +![](./images/configure_certificate_authority.png) + +6. Select `Enterprise CA`. +![](./images/enterprise_ca.png) + +7. Select `Root CA`. +![](./images/root_ca.png) + +8. Select `Create a new private key`. +![](./images/private_key.png) + +9. Go with the defaults. +![](./images/default_private_ky.png) + +10. Go with validity of 5 years. +![](./images/validity.png) + +11. Install. +12. When asked if you want to install additional services say yes. +![](./images/additional_services.png) + +13. Select `Certificate Enrollment Web Service`. +14. Use the default application pool identity. +![](./images/default_identity.png) + +15. Choose existing SSL certificate. +![](./images/default_certificate.png) + +16. Click through and complete. +17. Reboot. + +## Creating a template + +1. From Server Management click Tools->Certificate Authority. +![](./images/certificate_authority_click.png) + +2. Ensure `Certificate Templates` is available, if not then you are not set up as an Enterprise CA and go back to `Setup as domain controller`. +![](./images/certificate_templates.png) + +3. Right-click on `Certificate Templates` and select `Manage`. +![](./images/manage.png) + +4. This opens the `Certificate Templates Console`. +5. Select `Authenticate Session` and `Duplicate`. +6. Open `General` tab and change names to `Certstore Template`, set the Renewal Period to 32850 hours that is the max allowed. +![](./images/template_general.png) + +7. Open `Cryptography` tab and select `Request can use any provider available on the subject's computer`. +![](./images/availability.png) + +8. Open `Request Handling` tab and select `Allow private key to be exported`. +![](./images/export_private_key.png) + +9. Open `Security` tab and give Administrator all the control. +![](./images/give_control.png) + +10. Open `Extensions` tab click `Application Policies` click `Edit`, ensure `Any Purpose` is selected. +![](./images/any_purpose.png) + +11. Close `Certificate Template Console`. +12. Reopen `Certificate Authority` console. +13. Right-click on `Certificate Templates`, select `New`, then `Certificate Template to Issue`. +14. Select `Certstore Template`. +15. It will now show in the Templates folder of Certificate Authority. + +## Creating a certificate from the template + +1. Open `certmgr` also called `Manage user certificates` from the Run button. +2. Expand `Personal`, right-click on personal, select `All Tasks` , select `Request New Certificate`. +3. Click through until you get the `Request Certificate` screen and select `Certstore Template`. +![](./images/new_cert.png) + +4. Expand `Certstore Template` and select `Properties`. +5. Give it a name like `TestAuth` and ensure under `Private Key` -> `Key options` that the private key is exportable. +![](./images/new_cert_exportable.png) + +6. Create Certificate. + +## Export the certificate + +1. From `certmgr` find the certificate you created and double click to open. +2. Go to the `Details` tab and select `Copy to File...`. +3. Ensure that `Allow private key to be exported` is selected. +![](./images/export_private_key.png) + +4. Under `Export File Format` ensure that `Include all certificates in the certificate path if possible`. +5. Export it to a file. + +## Setup Grafana Agent + +1. Open the Agent configuration file. +2. Open `Certificate Templates Console`, right-click `Certstore Template` and find the Object identifier. +![](./images/object_identifier.png) + +3. Copy the configuration file. +4. Find the common name, it is `test-WIN-TF2GPD2VTOT-CA` in the screenshot. +![](./images/common_name.png) + +5. Copy that to the configuration. +6. Configuration should look like this. +![](./images/config.png) + +7. Start Agent. + +## Copy certificate to browser + +1. Open browser. +2. Find certificate management. +3. Add certificate we exported in `Export the certificate`. +4. Browse to `http://localhost:12345/metrics`, and it should work properly. You may need to tell it to trust the certificate though. + diff --git a/docs/developer/windows/certificate_store/images/additional_services.png b/docs/developer/windows/certificate_store/images/additional_services.png new file mode 100644 index 000000000000..4c540a55d440 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/additional_services.png differ diff --git a/docs/developer/windows/certificate_store/images/addroles.png b/docs/developer/windows/certificate_store/images/addroles.png new file mode 100644 index 000000000000..dab1bad477f2 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/addroles.png differ diff --git a/docs/developer/windows/certificate_store/images/any_purpose.png b/docs/developer/windows/certificate_store/images/any_purpose.png new file mode 100644 index 000000000000..212d6be0af08 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/any_purpose.png differ diff --git a/docs/developer/windows/certificate_store/images/availability.png b/docs/developer/windows/certificate_store/images/availability.png new file mode 100644 index 000000000000..0a6d4fcbd6da Binary files /dev/null and b/docs/developer/windows/certificate_store/images/availability.png differ diff --git a/docs/developer/windows/certificate_store/images/certificate_authority_click.png b/docs/developer/windows/certificate_store/images/certificate_authority_click.png new file mode 100644 index 000000000000..8678cd6367b0 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/certificate_authority_click.png differ diff --git a/docs/developer/windows/certificate_store/images/certificate_templates.png b/docs/developer/windows/certificate_store/images/certificate_templates.png new file mode 100644 index 000000000000..7e7e487d40e8 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/certificate_templates.png differ diff --git a/docs/developer/windows/certificate_store/images/certificateservices.png b/docs/developer/windows/certificate_store/images/certificateservices.png new file mode 100644 index 000000000000..87f3dbfaa172 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/certificateservices.png differ diff --git a/docs/developer/windows/certificate_store/images/common_name.png b/docs/developer/windows/certificate_store/images/common_name.png new file mode 100644 index 000000000000..e191676b1852 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/common_name.png differ diff --git a/docs/developer/windows/certificate_store/images/config.png b/docs/developer/windows/certificate_store/images/config.png new file mode 100644 index 000000000000..65145e87077d Binary files /dev/null and b/docs/developer/windows/certificate_store/images/config.png differ diff --git a/docs/developer/windows/certificate_store/images/configure_certificate_authority.png b/docs/developer/windows/certificate_store/images/configure_certificate_authority.png new file mode 100644 index 000000000000..c860e01b4c1a Binary files /dev/null and b/docs/developer/windows/certificate_store/images/configure_certificate_authority.png differ diff --git a/docs/developer/windows/certificate_store/images/default_certificate.png b/docs/developer/windows/certificate_store/images/default_certificate.png new file mode 100644 index 000000000000..4977c8e6bf75 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/default_certificate.png differ diff --git a/docs/developer/windows/certificate_store/images/default_identity.png b/docs/developer/windows/certificate_store/images/default_identity.png new file mode 100644 index 000000000000..65803533fb71 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/default_identity.png differ diff --git a/docs/developer/windows/certificate_store/images/default_private_ky.png b/docs/developer/windows/certificate_store/images/default_private_ky.png new file mode 100644 index 000000000000..e7e1bba628e0 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/default_private_ky.png differ diff --git a/docs/developer/windows/certificate_store/images/enterprise_ca.png b/docs/developer/windows/certificate_store/images/enterprise_ca.png new file mode 100644 index 000000000000..e6812d721844 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/enterprise_ca.png differ diff --git a/docs/developer/windows/certificate_store/images/export_private_key.png b/docs/developer/windows/certificate_store/images/export_private_key.png new file mode 100644 index 000000000000..8627ea1f6b37 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/export_private_key.png differ diff --git a/docs/developer/windows/certificate_store/images/exportable_key.png b/docs/developer/windows/certificate_store/images/exportable_key.png new file mode 100644 index 000000000000..a3f4f979ff09 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/exportable_key.png differ diff --git a/docs/developer/windows/certificate_store/images/give_control.png b/docs/developer/windows/certificate_store/images/give_control.png new file mode 100644 index 000000000000..ee6e8aa3233f Binary files /dev/null and b/docs/developer/windows/certificate_store/images/give_control.png differ diff --git a/docs/developer/windows/certificate_store/images/initial.png b/docs/developer/windows/certificate_store/images/initial.png new file mode 100644 index 000000000000..5e08ae3af920 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/initial.png differ diff --git a/docs/developer/windows/certificate_store/images/manage.png b/docs/developer/windows/certificate_store/images/manage.png new file mode 100644 index 000000000000..1f8a0cdf6f0e Binary files /dev/null and b/docs/developer/windows/certificate_store/images/manage.png differ diff --git a/docs/developer/windows/certificate_store/images/new_cert.png b/docs/developer/windows/certificate_store/images/new_cert.png new file mode 100644 index 000000000000..e19752a800db Binary files /dev/null and b/docs/developer/windows/certificate_store/images/new_cert.png differ diff --git a/docs/developer/windows/certificate_store/images/new_cert_exportable.png b/docs/developer/windows/certificate_store/images/new_cert_exportable.png new file mode 100644 index 000000000000..037caa23dfd6 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/new_cert_exportable.png differ diff --git a/docs/developer/windows/certificate_store/images/object_identifier.png b/docs/developer/windows/certificate_store/images/object_identifier.png new file mode 100644 index 000000000000..f7b5125f0d45 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/object_identifier.png differ diff --git a/docs/developer/windows/certificate_store/images/private_key.png b/docs/developer/windows/certificate_store/images/private_key.png new file mode 100644 index 000000000000..74e14b5e4696 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/private_key.png differ diff --git a/docs/developer/windows/certificate_store/images/root_ca.png b/docs/developer/windows/certificate_store/images/root_ca.png new file mode 100644 index 000000000000..fcd74c3a4324 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/root_ca.png differ diff --git a/docs/developer/windows/certificate_store/images/template_general.png b/docs/developer/windows/certificate_store/images/template_general.png new file mode 100644 index 000000000000..5f062dbac0e5 Binary files /dev/null and b/docs/developer/windows/certificate_store/images/template_general.png differ diff --git a/docs/developer/windows/certificate_store/images/validity.png b/docs/developer/windows/certificate_store/images/validity.png new file mode 100644 index 000000000000..f88486a4c2ec Binary files /dev/null and b/docs/developer/windows/certificate_store/images/validity.png differ diff --git a/docs/developer/writing-flow-component-documentation.md b/docs/developer/writing-flow-component-documentation.md index 54984160e773..7a5b8914f6f6 100644 --- a/docs/developer/writing-flow-component-documentation.md +++ b/docs/developer/writing-flow-component-documentation.md @@ -113,13 +113,13 @@ If documenting a beta component, include the following after the header, but before the description of the component: ```markdown -{{< docs/shared lookup="flow/stability/beta.md" source="agent" >}} +{{< docs/shared lookup="flow/stability/beta.md" source="agent" version="" >}} ``` If documenting an experimental component, include the following instead: ```markdown -{{< docs/shared lookup="flow/stability/experimental.md" source="agent" >}} +{{< docs/shared lookup="flow/stability/experimental.md" source="agent" version="" >}} ``` ### Usage diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 66f02b163f7b..1f419426c286 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/ +- /docs/grafana-cloud/monitor-infrastructure/agent/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/ canonical: https://grafana.com/docs/agent/latest/ title: Grafana Agent weight: 350 diff --git a/docs/sources/about.md b/docs/sources/about.md index 3b79f8be90d1..729ce2d25ff0 100644 --- a/docs/sources/about.md +++ b/docs/sources/about.md @@ -1,9 +1,12 @@ --- aliases: - ./about-agent/ +- /docs/grafana-cloud/agent/about/ +- /docs/grafana-cloud/monitor-infrastructure/agent/about/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/about/ canonical: https://grafana.com/docs/agent/latest/about/ -title: Introduction to Grafana Agent menuTitle: Introduction +title: Introduction to Grafana Agent weight: 100 --- diff --git a/docs/sources/flow/_index.md b/docs/sources/flow/_index.md index 37637aafc988..29832ac27565 100644 --- a/docs/sources/flow/_index.md +++ b/docs/sources/flow/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/ canonical: https://grafana.com/docs/agent/latest/flow/ title: Flow mode weight: 400 diff --git a/docs/sources/flow/concepts/_index.md b/docs/sources/flow/concepts/_index.md index fae04f5f8359..f2e415bb211f 100644 --- a/docs/sources/flow/concepts/_index.md +++ b/docs/sources/flow/concepts/_index.md @@ -1,6 +1,9 @@ --- aliases: - ../concepts/ +- /docs/grafana-cloud/agent/flow/concepts/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/concepts/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/concepts/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/ title: Concepts weight: 100 diff --git a/docs/sources/flow/concepts/clustering.md b/docs/sources/flow/concepts/clustering.md index 022eeaf67f89..4d82b9f8167b 100644 --- a/docs/sources/flow/concepts/clustering.md +++ b/docs/sources/flow/concepts/clustering.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/clustering/ labels: stage: beta diff --git a/docs/sources/flow/concepts/component_controller.md b/docs/sources/flow/concepts/component_controller.md index 94d9b5cdf98c..63734ef870ec 100644 --- a/docs/sources/flow/concepts/component_controller.md +++ b/docs/sources/flow/concepts/component_controller.md @@ -1,6 +1,9 @@ --- aliases: - ../../concepts/component-controller/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/component_controller/ title: Component controller weight: 200 diff --git a/docs/sources/flow/concepts/components.md b/docs/sources/flow/concepts/components.md index ac604a50c298..1edd7be5be1b 100644 --- a/docs/sources/flow/concepts/components.md +++ b/docs/sources/flow/concepts/components.md @@ -1,6 +1,9 @@ --- aliases: - ../../concepts/components/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/components/ title: Components weight: 100 diff --git a/docs/sources/flow/concepts/configuration_language.md b/docs/sources/flow/concepts/configuration_language.md index 47153ff58a1e..abd65969abb4 100644 --- a/docs/sources/flow/concepts/configuration_language.md +++ b/docs/sources/flow/concepts/configuration_language.md @@ -1,6 +1,9 @@ --- aliases: - ../../concepts/configuration-language/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/configuration_language/ title: Configuration language concepts weight: 400 diff --git a/docs/sources/flow/concepts/modules.md b/docs/sources/flow/concepts/modules.md index 55fdd0006991..0bd2f78148fe 100644 --- a/docs/sources/flow/concepts/modules.md +++ b/docs/sources/flow/concepts/modules.md @@ -1,6 +1,9 @@ --- aliases: - ../../concepts/modules/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/concepts/modules/ title: Modules weight: 300 diff --git a/docs/sources/flow/config-language/_index.md b/docs/sources/flow/config-language/_index.md index d4c3930ae386..8c81b94317e5 100644 --- a/docs/sources/flow/config-language/_index.md +++ b/docs/sources/flow/config-language/_index.md @@ -1,5 +1,8 @@ --- 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/ - configuration-language/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/ title: Configuration language diff --git a/docs/sources/flow/config-language/components.md b/docs/sources/flow/config-language/components.md index c0f9d45f37c8..623255cf1bd5 100644 --- a/docs/sources/flow/config-language/components.md +++ b/docs/sources/flow/config-language/components.md @@ -1,6 +1,9 @@ --- aliases: - ../configuration-language/components/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/components/ title: Components config language weight: 300 diff --git a/docs/sources/flow/config-language/expressions/_index.md b/docs/sources/flow/config-language/expressions/_index.md index 67b4b4e40868..d55e4696330f 100644 --- a/docs/sources/flow/config-language/expressions/_index.md +++ b/docs/sources/flow/config-language/expressions/_index.md @@ -1,6 +1,9 @@ --- aliases: - ../configuration-language/expressions/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/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 13562cca6bef..79d858ec0380 100644 --- a/docs/sources/flow/config-language/expressions/function_calls.md +++ b/docs/sources/flow/config-language/expressions/function_calls.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/expressions/function-calls/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/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 52a867a82476..830983595e2d 100644 --- a/docs/sources/flow/config-language/expressions/operators.md +++ b/docs/sources/flow/config-language/expressions/operators.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/expressions/operators/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/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 923d2bfb6c1a..18b9da2f6607 100644 --- a/docs/sources/flow/config-language/expressions/referencing_exports.md +++ b/docs/sources/flow/config-language/expressions/referencing_exports.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/expressions/referencing-exports/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/referencing_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 3513d62f5d0d..af86bd9dfbd0 100644 --- a/docs/sources/flow/config-language/expressions/types_and_values.md +++ b/docs/sources/flow/config-language/expressions/types_and_values.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/expressions/types-and-values/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/expressions/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 6736ee26c18c..77e09aadc3eb 100644 --- a/docs/sources/flow/config-language/files.md +++ b/docs/sources/flow/config-language/files.md @@ -1,6 +1,9 @@ --- aliases: - ../configuration-language/files/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/files/ title: Files weight: 100 diff --git a/docs/sources/flow/config-language/syntax.md b/docs/sources/flow/config-language/syntax.md index b39734c6c7e6..221adda0cedc 100644 --- a/docs/sources/flow/config-language/syntax.md +++ b/docs/sources/flow/config-language/syntax.md @@ -1,6 +1,9 @@ --- aliases: - ../configuration-language/syntax/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/config-language/syntax/ title: Syntax weight: 200 diff --git a/docs/sources/flow/getting-started/_index.md b/docs/sources/flow/getting-started/_index.md index 7f12e7de490a..baeef15f88b9 100644 --- a/docs/sources/flow/getting-started/_index.md +++ b/docs/sources/flow/getting-started/_index.md @@ -1,5 +1,8 @@ --- 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/ - getting_started/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/ menuTitle: Get started diff --git a/docs/sources/flow/getting-started/collect-opentelemetry-data.md b/docs/sources/flow/getting-started/collect-opentelemetry-data.md index eb6bad458b80..ba87e46aba28 100644 --- a/docs/sources/flow/getting-started/collect-opentelemetry-data.md +++ b/docs/sources/flow/getting-started/collect-opentelemetry-data.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/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 035d42be8692..4e7ebffcdf05 100644 --- a/docs/sources/flow/getting-started/collect-prometheus-metrics.md +++ b/docs/sources/flow/getting-started/collect-prometheus-metrics.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/collect-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 1c8da4ea48fb..13b068e082fa 100644 --- a/docs/sources/flow/getting-started/configure-agent-clustering.md +++ b/docs/sources/flow/getting-started/configure-agent-clustering.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/configure-agent-clustering/ menuTitle: Configure Grafana Agent clustering title: Configure Grafana Agent clustering in an existing installation 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 4e51b7df15de..6d59bf341f70 100644 --- a/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md +++ b/docs/sources/flow/getting-started/distribute-prometheus-scrape-load.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/distribute-prometheus-scrape-load/ menuTitle: Distribute Prometheus metrics scrape load title: Distribute your Prometheus metrics scrape load diff --git a/docs/sources/flow/getting-started/migrating-from-prometheus.md b/docs/sources/flow/getting-started/migrating-from-prometheus.md index 396c1e2db36c..b79a585503cc 100644 --- a/docs/sources/flow/getting-started/migrating-from-prometheus.md +++ b/docs/sources/flow/getting-started/migrating-from-prometheus.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-prometheus/ description: Learn how to migrate your configuration from Prometheus to Grafana Agent flow mode diff --git a/docs/sources/flow/getting-started/migrating-from-promtail.md b/docs/sources/flow/getting-started/migrating-from-promtail.md index f55e24bf6b4a..ef473eac630e 100644 --- a/docs/sources/flow/getting-started/migrating-from-promtail.md +++ b/docs/sources/flow/getting-started/migrating-from-promtail.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/migrating-from-promtail/ description: Learn how to migrate your configuration from Promtail to Grafana Agent Flow Mode 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 b9d3d79ca1e7..95947d954521 100644 --- a/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md +++ b/docs/sources/flow/getting-started/opentelemetry-to-lgtm-stack.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/getting-started/opentelemetry-to-lgtm-stack/ title: OpenTelemetry to Grafana stack weight: 350 diff --git a/docs/sources/flow/monitoring/_index.md b/docs/sources/flow/monitoring/_index.md index 8d9b8129a699..356fb3b41258 100644 --- a/docs/sources/flow/monitoring/_index.md +++ b/docs/sources/flow/monitoring/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/monitoring/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/monitoring/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/monitoring/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/ 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 e7b9d07a0666..2736ee590fd1 100644 --- a/docs/sources/flow/monitoring/component_metrics.md +++ b/docs/sources/flow/monitoring/component_metrics.md @@ -1,5 +1,8 @@ --- 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/ - component-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/component_metrics/ title: Component metrics diff --git a/docs/sources/flow/monitoring/controller_metrics.md b/docs/sources/flow/monitoring/controller_metrics.md index 3084ad4c5db4..06d4e94de032 100644 --- a/docs/sources/flow/monitoring/controller_metrics.md +++ b/docs/sources/flow/monitoring/controller_metrics.md @@ -1,5 +1,8 @@ --- 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/ - controller-metrics/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/controller_metrics/ title: Controller metrics diff --git a/docs/sources/flow/monitoring/debugging.md b/docs/sources/flow/monitoring/debugging.md index 94838e1b048c..b981e8d10724 100644 --- a/docs/sources/flow/monitoring/debugging.md +++ b/docs/sources/flow/monitoring/debugging.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/monitoring/debugging/ title: Debugging weight: 300 diff --git a/docs/sources/flow/reference/_index.md b/docs/sources/flow/reference/_index.md index 59953e8cc1ea..190dadd20b11 100644 --- a/docs/sources/flow/reference/_index.md +++ b/docs/sources/flow/reference/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/reference/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/ canonical: https://grafana.com/docs/agent/latest/flow/reference/ title: Reference weight: 600 diff --git a/docs/sources/flow/reference/cli/_index.md b/docs/sources/flow/reference/cli/_index.md index 0413de50ee71..96948c45fad2 100644 --- a/docs/sources/flow/reference/cli/_index.md +++ b/docs/sources/flow/reference/cli/_index.md @@ -1,8 +1,13 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/ -description: The Grafana Agent command line interface provides subcommands to perform various operations. -title: The Grafana Agent command line interface +description: The Grafana Agent command line interface provides subcommands to perform + various operations. menuTitle: Command-line interface +title: 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 d99246c3f5d5..ddaa90bdc50b 100644 --- a/docs/sources/flow/reference/cli/convert.md +++ b/docs/sources/flow/reference/cli/convert.md @@ -1,10 +1,15 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/convert/ +description: The `convert` command converts supported configuration formats to River + format. labels: stage: beta -description: The `convert` command converts supported configuration formats to River format. -title: convert command menuTitle: convert +title: convert command weight: 100 --- diff --git a/docs/sources/flow/reference/cli/fmt.md b/docs/sources/flow/reference/cli/fmt.md index c92d1ff57f57..1e44c62be9f1 100644 --- a/docs/sources/flow/reference/cli/fmt.md +++ b/docs/sources/flow/reference/cli/fmt.md @@ -1,8 +1,12 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/fmt/ description: The `fmt` command formats a Grafana Agent configuration file. -title: fmt command menuTitle: fmt +title: fmt command weight: 200 --- diff --git a/docs/sources/flow/reference/cli/run.md b/docs/sources/flow/reference/cli/run.md index b2f587dac928..b7bb6ea7dd83 100644 --- a/docs/sources/flow/reference/cli/run.md +++ b/docs/sources/flow/reference/cli/run.md @@ -1,8 +1,13 @@ --- +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/ 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. -title: run command +description: The `run` command runs Grafana Agent in the foreground until an interrupt + is received. menuTitle: run +title: run command weight: 300 --- diff --git a/docs/sources/flow/reference/cli/tools.md b/docs/sources/flow/reference/cli/tools.md index ef52d5a1ae1c..e859bee834cf 100644 --- a/docs/sources/flow/reference/cli/tools.md +++ b/docs/sources/flow/reference/cli/tools.md @@ -1,8 +1,12 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/cli/tools/ description: Command line tools that read the WAL and provide statistical information. -title: tools command menuTitle: tools +title: tools command weight: 400 --- diff --git a/docs/sources/flow/reference/components/_index.md b/docs/sources/flow/reference/components/_index.md index 9d46383ea224..8563112f3876 100644 --- a/docs/sources/flow/reference/components/_index.md +++ b/docs/sources/flow/reference/components/_index.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/ 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 9cb67a9bc589..71317594de8e 100644 --- a/docs/sources/flow/reference/components/discovery.azure.md +++ b/docs/sources/flow/reference/components/discovery.azure.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.azure/ title: discovery.azure --- diff --git a/docs/sources/flow/reference/components/discovery.consul.md b/docs/sources/flow/reference/components/discovery.consul.md index a4f89b7dc71f..cae0e521ba83 100644 --- a/docs/sources/flow/reference/components/discovery.consul.md +++ b/docs/sources/flow/reference/components/discovery.consul.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.consul/ title: discovery.consul --- diff --git a/docs/sources/flow/reference/components/discovery.consulagent.md b/docs/sources/flow/reference/components/discovery.consulagent.md index 3b731d5a6379..34a574e4ad2c 100644 --- a/docs/sources/flow/reference/components/discovery.consulagent.md +++ b/docs/sources/flow/reference/components/discovery.consulagent.md @@ -49,7 +49,7 @@ The following blocks are supported inside the definition of ### tls_config block -{{< docs/shared lookup="flow/reference/components/tls-config-block.md" source="agent" >}} +{{< docs/shared lookup="flow/reference/components/tls-config-block.md" source="agent" version="" >}} ## Exported fields diff --git a/docs/sources/flow/reference/components/discovery.digitalocean.md b/docs/sources/flow/reference/components/discovery.digitalocean.md index 790c74377224..935020ceb789 100644 --- a/docs/sources/flow/reference/components/discovery.digitalocean.md +++ b/docs/sources/flow/reference/components/discovery.digitalocean.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.digitalocean/ title: discovery.digitalocean --- diff --git a/docs/sources/flow/reference/components/discovery.dns.md b/docs/sources/flow/reference/components/discovery.dns.md index 76a31dee8e0d..927d52c9b026 100644 --- a/docs/sources/flow/reference/components/discovery.dns.md +++ b/docs/sources/flow/reference/components/discovery.dns.md @@ -1,6 +1,9 @@ --- aliases: - /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.dns/ title: discovery.dns --- diff --git a/docs/sources/flow/reference/components/discovery.docker.md b/docs/sources/flow/reference/components/discovery.docker.md index fb38631f7f08..3516ecd3e6ba 100644 --- a/docs/sources/flow/reference/components/discovery.docker.md +++ b/docs/sources/flow/reference/components/discovery.docker.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.docker/ title: discovery.docker --- diff --git a/docs/sources/flow/reference/components/discovery.ec2.md b/docs/sources/flow/reference/components/discovery.ec2.md index 681ddf8bdb91..b292963de438 100644 --- a/docs/sources/flow/reference/components/discovery.ec2.md +++ b/docs/sources/flow/reference/components/discovery.ec2.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.ec2/ title: discovery.ec2 --- diff --git a/docs/sources/flow/reference/components/discovery.eureka.md b/docs/sources/flow/reference/components/discovery.eureka.md index 71616e1237ba..290195747194 100644 --- a/docs/sources/flow/reference/components/discovery.eureka.md +++ b/docs/sources/flow/reference/components/discovery.eureka.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.eureka/ title: discovery.eureka --- diff --git a/docs/sources/flow/reference/components/discovery.file.md b/docs/sources/flow/reference/components/discovery.file.md index 4cbc9176003c..28f30c93b203 100644 --- a/docs/sources/flow/reference/components/discovery.file.md +++ b/docs/sources/flow/reference/components/discovery.file.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.file/ title: discovery.file --- diff --git a/docs/sources/flow/reference/components/discovery.gce.md b/docs/sources/flow/reference/components/discovery.gce.md index e62c86b94b08..2f78ea92d771 100644 --- a/docs/sources/flow/reference/components/discovery.gce.md +++ b/docs/sources/flow/reference/components/discovery.gce.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.gce/ title: discovery.gce --- diff --git a/docs/sources/flow/reference/components/discovery.hetzner.md b/docs/sources/flow/reference/components/discovery.hetzner.md index 3a73c4705e6e..8f0bd3c86478 100644 --- a/docs/sources/flow/reference/components/discovery.hetzner.md +++ b/docs/sources/flow/reference/components/discovery.hetzner.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.hetzner/ title: discovery.hetzner --- diff --git a/docs/sources/flow/reference/components/discovery.http.md b/docs/sources/flow/reference/components/discovery.http.md index 341d03146409..731a2f5c0b78 100644 --- a/docs/sources/flow/reference/components/discovery.http.md +++ b/docs/sources/flow/reference/components/discovery.http.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.http/ title: discovery.http --- diff --git a/docs/sources/flow/reference/components/discovery.ionos.md b/docs/sources/flow/reference/components/discovery.ionos.md index 0463a14266d6..1ed842ce08a9 100644 --- a/docs/sources/flow/reference/components/discovery.ionos.md +++ b/docs/sources/flow/reference/components/discovery.ionos.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.ionos/ title: discovery.ionos --- diff --git a/docs/sources/flow/reference/components/discovery.kubelet.md b/docs/sources/flow/reference/components/discovery.kubelet.md index 6a3d18be299b..58236ff52731 100644 --- a/docs/sources/flow/reference/components/discovery.kubelet.md +++ b/docs/sources/flow/reference/components/discovery.kubelet.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kubelet/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/discovery.kubernetes.md b/docs/sources/flow/reference/components/discovery.kubernetes.md index 76812a9dff02..0e9cf2db4faf 100644 --- a/docs/sources/flow/reference/components/discovery.kubernetes.md +++ b/docs/sources/flow/reference/components/discovery.kubernetes.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kubernetes/ title: discovery.kubernetes --- diff --git a/docs/sources/flow/reference/components/discovery.kuma.md b/docs/sources/flow/reference/components/discovery.kuma.md index 9d76e2ae0979..e81f3d349526 100644 --- a/docs/sources/flow/reference/components/discovery.kuma.md +++ b/docs/sources/flow/reference/components/discovery.kuma.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.kuma/ title: discovery.kuma --- diff --git a/docs/sources/flow/reference/components/discovery.lightsail.md b/docs/sources/flow/reference/components/discovery.lightsail.md index 0b7891ab86ba..0a57bde53b4f 100644 --- a/docs/sources/flow/reference/components/discovery.lightsail.md +++ b/docs/sources/flow/reference/components/discovery.lightsail.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.lightsail/ title: discovery.lightsail --- diff --git a/docs/sources/flow/reference/components/discovery.marathon.md b/docs/sources/flow/reference/components/discovery.marathon.md index 6b1c5a279698..9cce0e7c56fc 100644 --- a/docs/sources/flow/reference/components/discovery.marathon.md +++ b/docs/sources/flow/reference/components/discovery.marathon.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.marathon/ title: discovery.marathon --- diff --git a/docs/sources/flow/reference/components/discovery.nerve.md b/docs/sources/flow/reference/components/discovery.nerve.md index e5b5ef6fdfd6..8a2fa3f71bf4 100644 --- a/docs/sources/flow/reference/components/discovery.nerve.md +++ b/docs/sources/flow/reference/components/discovery.nerve.md @@ -1,3 +1,4 @@ +--- canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.nerve/ title: discovery.nerve --- diff --git a/docs/sources/flow/reference/components/discovery.nomad.md b/docs/sources/flow/reference/components/discovery.nomad.md index 49bd421b005f..97cbeba8c77d 100644 --- a/docs/sources/flow/reference/components/discovery.nomad.md +++ b/docs/sources/flow/reference/components/discovery.nomad.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.nomad/ title: discovery.nomad --- diff --git a/docs/sources/flow/reference/components/discovery.openstack.md b/docs/sources/flow/reference/components/discovery.openstack.md index dbf81c89d5e7..91d19013d100 100644 --- a/docs/sources/flow/reference/components/discovery.openstack.md +++ b/docs/sources/flow/reference/components/discovery.openstack.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.openstack/ title: discovery.openstack --- diff --git a/docs/sources/flow/reference/components/discovery.puppetdb.md b/docs/sources/flow/reference/components/discovery.puppetdb.md index 419413628112..559e09cf14b3 100644 --- a/docs/sources/flow/reference/components/discovery.puppetdb.md +++ b/docs/sources/flow/reference/components/discovery.puppetdb.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.puppetdb/ title: discovery.puppetdb --- diff --git a/docs/sources/flow/reference/components/discovery.relabel.md b/docs/sources/flow/reference/components/discovery.relabel.md index 6258241e4ed2..823f8edf363e 100644 --- a/docs/sources/flow/reference/components/discovery.relabel.md +++ b/docs/sources/flow/reference/components/discovery.relabel.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.relabel/ title: discovery.relabel --- diff --git a/docs/sources/flow/reference/components/discovery.triton.md b/docs/sources/flow/reference/components/discovery.triton.md index ea7ffabc489f..c91919f06981 100644 --- a/docs/sources/flow/reference/components/discovery.triton.md +++ b/docs/sources/flow/reference/components/discovery.triton.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.triton/ title: discovery.triton --- diff --git a/docs/sources/flow/reference/components/discovery.uyuni.md b/docs/sources/flow/reference/components/discovery.uyuni.md index eaa6f1ec64d3..c7c3b864c6cb 100644 --- a/docs/sources/flow/reference/components/discovery.uyuni.md +++ b/docs/sources/flow/reference/components/discovery.uyuni.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/discovery.uyuni/ title: discovery.uyuni --- diff --git a/docs/sources/flow/reference/components/local.file.md b/docs/sources/flow/reference/components/local.file.md index 916c0cfca158..12d1cd62a8bf 100644 --- a/docs/sources/flow/reference/components/local.file.md +++ b/docs/sources/flow/reference/components/local.file.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/local.file/ title: 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 4e49fd08e503..b8ac4ae1c135 100644 --- a/docs/sources/flow/reference/components/local.file_match.md +++ b/docs/sources/flow/reference/components/local.file_match.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/local.file_match/ title: local.file_match --- diff --git a/docs/sources/flow/reference/components/loki.echo.md b/docs/sources/flow/reference/components/loki.echo.md index 8f6454cd0215..a6223c158342 100644 --- a/docs/sources/flow/reference/components/loki.echo.md +++ b/docs/sources/flow/reference/components/loki.echo.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.echo/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/loki.process.md b/docs/sources/flow/reference/components/loki.process.md index ac134a611c0c..cf28df261a33 100644 --- a/docs/sources/flow/reference/components/loki.process.md +++ b/docs/sources/flow/reference/components/loki.process.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/ title: loki.process --- diff --git a/docs/sources/flow/reference/components/loki.relabel.md b/docs/sources/flow/reference/components/loki.relabel.md index 6391d1ed6082..66638f3f3175 100644 --- a/docs/sources/flow/reference/components/loki.relabel.md +++ b/docs/sources/flow/reference/components/loki.relabel.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.relabel/ title: 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 2cb7d280cbb0..fe9cd021091d 100644 --- a/docs/sources/flow/reference/components/loki.source.api.md +++ b/docs/sources/flow/reference/components/loki.source.api.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.api/ title: 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 c17825d80b54..bf3d5368fd64 100644 --- a/docs/sources/flow/reference/components/loki.source.awsfirehose.md +++ b/docs/sources/flow/reference/components/loki.source.awsfirehose.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.awsfirehose/ title: 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 3b7f7cfb6ca1..f7e641b5dee7 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 @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.azure_event_hubs/ title: 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 92e0c73cc611..6a86eeca680a 100644 --- a/docs/sources/flow/reference/components/loki.source.cloudflare.md +++ b/docs/sources/flow/reference/components/loki.source.cloudflare.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.cloudflare/ title: 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 6ec97246d28e..6d3b8d91c22d 100644 --- a/docs/sources/flow/reference/components/loki.source.docker.md +++ b/docs/sources/flow/reference/components/loki.source.docker.md @@ -1,6 +1,9 @@ --- aliases: - /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.docker/ title: 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 ff677ef7c41c..d972cc543274 100644 --- a/docs/sources/flow/reference/components/loki.source.file.md +++ b/docs/sources/flow/reference/components/loki.source.file.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.file/ title: 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 60a27d7e0c48..de4ff1431741 100644 --- a/docs/sources/flow/reference/components/loki.source.gcplog.md +++ b/docs/sources/flow/reference/components/loki.source.gcplog.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.gcplog/ title: 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 b6739328f586..b6a9ea9b7987 100644 --- a/docs/sources/flow/reference/components/loki.source.gelf.md +++ b/docs/sources/flow/reference/components/loki.source.gelf.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.gelf/ title: 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 451630ce0eb2..23fb93517503 100644 --- a/docs/sources/flow/reference/components/loki.source.heroku.md +++ b/docs/sources/flow/reference/components/loki.source.heroku.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.heroku/ title: 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 66f45d8c54b9..56d6c82962d8 100644 --- a/docs/sources/flow/reference/components/loki.source.journal.md +++ b/docs/sources/flow/reference/components/loki.source.journal.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.journal/ title: 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 15a73ab982ff..a0f3f66f6c3f 100644 --- a/docs/sources/flow/reference/components/loki.source.kafka.md +++ b/docs/sources/flow/reference/components/loki.source.kafka.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kafka/ title: loki.source.kafka --- @@ -143,27 +147,27 @@ This example consumes Kafka events from the specified brokers and topics then forwards them to a `loki.write` component using the Kafka timestamp. ```river -loki.relabel "kafka" { - rule { - source_labels = ["__meta_kafka_topic"] - target_label = "topic" - } -} - - loki.source.kafka "local" { brokers = ["localhost:9092"] topics = ["quickstart-events"] labels = {component = "loki.source.kafka"} - forward_to = [loki.write.local.receiver] + forward_to = [loki.relabel.kafka.receiver] use_incoming_timestamp = true relabel_rules = loki.relabel.kafka.rules } +loki.relabel "kafka" { + forward_to = [loki.write.local.receiver] + + rule { + source_labels = ["__meta_kafka_topic"] + target_label = "topic" + } +} + loki.write "local" { endpoint { url = "loki:3100/api/v1/push" } } ``` - diff --git a/docs/sources/flow/reference/components/loki.source.kubernetes.md b/docs/sources/flow/reference/components/loki.source.kubernetes.md index 72aca6fc3429..1dad188cd5de 100644 --- a/docs/sources/flow/reference/components/loki.source.kubernetes.md +++ b/docs/sources/flow/reference/components/loki.source.kubernetes.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kubernetes/ labels: stage: experimental 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 245c660a9cbf..209b3d148b60 100644 --- a/docs/sources/flow/reference/components/loki.source.kubernetes_events.md +++ b/docs/sources/flow/reference/components/loki.source.kubernetes_events.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.kubernetes_events/ title: 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 a5409d16de71..2cd20c7de5b6 100644 --- a/docs/sources/flow/reference/components/loki.source.podlogs.md +++ b/docs/sources/flow/reference/components/loki.source.podlogs.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.podlogs/ labels: stage: experimental diff --git a/docs/sources/flow/reference/components/loki.source.syslog.md b/docs/sources/flow/reference/components/loki.source.syslog.md index fdbe7a4c00d5..c5fd3638725d 100644 --- a/docs/sources/flow/reference/components/loki.source.syslog.md +++ b/docs/sources/flow/reference/components/loki.source.syslog.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.syslog/ title: 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 c93a095b605f..6ae598978c71 100644 --- a/docs/sources/flow/reference/components/loki.source.windowsevent.md +++ b/docs/sources/flow/reference/components/loki.source.windowsevent.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.source.windowsevent/ title: loki.source.windowsevent --- diff --git a/docs/sources/flow/reference/components/loki.write.md b/docs/sources/flow/reference/components/loki.write.md index b59777fece79..fef50a60ecf7 100644 --- a/docs/sources/flow/reference/components/loki.write.md +++ b/docs/sources/flow/reference/components/loki.write.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/loki.write/ title: 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 a60050a174a0..558bcf0c795c 100644 --- a/docs/sources/flow/reference/components/mimir.rules.kubernetes.md +++ b/docs/sources/flow/reference/components/mimir.rules.kubernetes.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/mimir.rules.kubernetes/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/module.file.md b/docs/sources/flow/reference/components/module.file.md index 4ed3b54e1232..ce0ba4a84205 100644 --- a/docs/sources/flow/reference/components/module.file.md +++ b/docs/sources/flow/reference/components/module.file.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.file/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/module.git.md b/docs/sources/flow/reference/components/module.git.md index b64488d7d52f..2c3cf68cb321 100644 --- a/docs/sources/flow/reference/components/module.git.md +++ b/docs/sources/flow/reference/components/module.git.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.git/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/module.http.md b/docs/sources/flow/reference/components/module.http.md index 08fb2cd357d1..0023f3179b2e 100644 --- a/docs/sources/flow/reference/components/module.http.md +++ b/docs/sources/flow/reference/components/module.http.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.http/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/module.string.md b/docs/sources/flow/reference/components/module.string.md index 7613838811cb..8105c9f88ff1 100644 --- a/docs/sources/flow/reference/components/module.string.md +++ b/docs/sources/flow/reference/components/module.string.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/module.string/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/otelcol.auth.basic.md b/docs/sources/flow/reference/components/otelcol.auth.basic.md index 23491a4d02de..fecdba57749a 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.basic.md +++ b/docs/sources/flow/reference/components/otelcol.auth.basic.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.basic/ title: 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 2bee3b7842bb..73e8050f5ad4 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.bearer.md +++ b/docs/sources/flow/reference/components/otelcol.auth.bearer.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.bearer/ title: 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 7b711247e52e..30dd49406311 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.headers.md +++ b/docs/sources/flow/reference/components/otelcol.auth.headers.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.headers/ title: 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 d25547d02d52..bcc235eb65b2 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.oauth2.md +++ b/docs/sources/flow/reference/components/otelcol.auth.oauth2.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.oauth2/ title: 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 aefa9513229a..fa75d58218fb 100644 --- a/docs/sources/flow/reference/components/otelcol.auth.sigv4.md +++ b/docs/sources/flow/reference/components/otelcol.auth.sigv4.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.sigv4/ title: 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 423c3a4c5bf3..9acaf8dd70ba 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md +++ b/docs/sources/flow/reference/components/otelcol.connector.servicegraph.md @@ -7,7 +7,7 @@ title: otelcol.connector.servicegraph # otelcol.connector.servicegraph -{{< docs/shared lookup="flow/stability/experimental.md" source="agent" >}} +{{< docs/shared lookup="flow/stability/experimental.md" source="agent" version="" >}} `otelcol.connector.servicegraph` accepts span data from other `otelcol` components and outputs metrics representing the relationship between various services in a system. @@ -135,7 +135,7 @@ Name | Type | Description | Default | Required ### output block -{{< docs/shared lookup="flow/reference/components/output-block-metrics.md" source="agent" >}} +{{< docs/shared lookup="flow/reference/components/output-block-metrics.md" source="agent" version="" >}} ## Exported fields diff --git a/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md b/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md index 948579584771..201fb3c1ba9e 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md +++ b/docs/sources/flow/reference/components/otelcol.connector.spanlogs.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.spanlogs/ title: 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 2efd730de8ed..3a14a591e41b 100644 --- a/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md +++ b/docs/sources/flow/reference/components/otelcol.connector.spanmetrics.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.spanmetrics/ labels: stage: alpha diff --git a/docs/sources/flow/reference/components/otelcol.exporter.jaeger.md b/docs/sources/flow/reference/components/otelcol.exporter.jaeger.md index 5d2ad1c5088f..49c76ea7ec6c 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.jaeger.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.jaeger.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/reference/components/otelcol.exporter.jaeger/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/reference/components/otelcol.exporter.jaeger/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/reference/components/otelcol.exporter.jaeger/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.jaeger/ title: otelcol.exporter.jaeger --- diff --git a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md index 6f27291898f8..6fb389d885c5 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.loadbalancing/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/otelcol.exporter.logging.md b/docs/sources/flow/reference/components/otelcol.exporter.logging.md index 100bde3fee5b..ddf6a3d429eb 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.logging.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.logging.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.logging/ title: 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 009c67a139f6..10a7d9ca0bc0 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loki.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loki.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.loki/ title: 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 53a9f3865dcc..04500a8a1cd0 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.otlp.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.otlp.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.otlp/ title: 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 b294e9ad63a7..3556a7573491 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.otlphttp.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.otlphttp/ title: 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 c8ee7fe98489..c3d130e4088c 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.prometheus.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.prometheus/ title: 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 d8e0f834b772..03d7eb488217 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 @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.extension.jaeger_remote_sampling/ label: stage: experimental diff --git a/docs/sources/flow/reference/components/otelcol.processor.attributes.md b/docs/sources/flow/reference/components/otelcol.processor.attributes.md index 0a581c702a17..84bba6414658 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.attributes.md +++ b/docs/sources/flow/reference/components/otelcol.processor.attributes.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.attributes/ title: 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 e16164faba26..4ae6f5ae57ae 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.batch.md +++ b/docs/sources/flow/reference/components/otelcol.processor.batch.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.batch/ title: 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 286e8795ed28..f1ecd82ba89c 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.discovery.md +++ b/docs/sources/flow/reference/components/otelcol.processor.discovery.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.discovery/ title: otelcol.processor.discovery --- @@ -100,7 +104,7 @@ information. ## Examples ### Basic usage -``` +```river discovery.http "dynamic_targets" { url = "https://example.com/scrape_targets" refresh_interval = "15s" @@ -119,7 +123,7 @@ otelcol.processor.discovery "default" { Outputs from more than one discovery process can be combined via the `concat` function. -``` +```river discovery.http "dynamic_targets" { url = "https://example.com/scrape_targets" refresh_interval = "15s" @@ -145,7 +149,7 @@ It is not necessary to use a discovery component. In the example below, a `test_ attribute will be added to a span if its IP address is "1.2.2.2". The `__internal_label__` will be not be added to the span, because it begins with a double underscore (`__`). -``` +```river otelcol.processor.discovery "default" { targets = [{ "__address__" = "1.2.2.2", 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 910d3f15624b..95592315ca17 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md +++ b/docs/sources/flow/reference/components/otelcol.processor.memory_limiter.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.memory_limiter/ title: otelcol.processor.memory_limiter --- diff --git a/docs/sources/flow/reference/components/otelcol.processor.span.md b/docs/sources/flow/reference/components/otelcol.processor.span.md index 23f5b98aa410..174533a6679c 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.span.md +++ b/docs/sources/flow/reference/components/otelcol.processor.span.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.span/ labels: stage: alpha @@ -230,7 +234,7 @@ This example creates a new span name from the values of attributes `db.svc`, `operation`, and `id`, in that order, separated by the value `::`. All attribute keys need to be specified in the span for the processor to rename it. -``` +```river otelcol.processor.span "default" { name { separator = "::" @@ -243,9 +247,9 @@ otelcol.processor.span "default" { } ``` -For a span with the following attributes key/value pairs, the example +For a span with the following attributes key/value pairs, the above Flow configuration will change the span name to `"location::get::1234"`: -``` +```json { "db.svc": "location", "operation": "get", @@ -253,10 +257,10 @@ Flow configuration will change the span name to `"location::get::1234"`: } ``` -For a span with the following attributes key/value pairs, the example +For a span with the following attributes key/value pairs, the above Flow configuration will not change the span name. This is because the attribute key `operation` isn't set: -``` +```json { "db.svc": "location", "id": "1234" @@ -265,7 +269,7 @@ This is because the attribute key `operation` isn't set: ### Creating a new span name from attribute values (no separator) -``` +```river otelcol.processor.span "default" { name { from_attributes = ["db.svc", "operation", "id"] @@ -277,9 +281,9 @@ otelcol.processor.span "default" { } ``` -For a span with the following attributes key/value pairs, the example +For a span with the following attributes key/value pairs, the above Flow configuration will change the span name to `"locationget1234"`: -``` +```json { "db.svc": "location", "operation": "get", @@ -294,7 +298,7 @@ Example input and output using the Flow configuration below: 2. The span name will be changed to `/api/v1/document/{documentId}/update` 3. A new attribute `"documentId"="12345678"` will be added to the span. -``` +```river otelcol.processor.span "default" { name { to_attributes { @@ -317,7 +321,7 @@ if the span has the following properties: - The span name contains `/` anywhere in the string. - The span name is not `donot/change`. -``` +```river otelcol.processor.span "default" { include { match_type = "regexp" @@ -344,7 +348,7 @@ otelcol.processor.span "default" { This example changes the status of a span to "Error" and sets an error description. -``` +```river otelcol.processor.span "default" { status { code = "Error" @@ -362,7 +366,7 @@ otelcol.processor.span "default" { This example sets the status to success only when attribute `http.status_code` is equal to `400`. -``` +```river otelcol.processor.span "default" { include { match_type = "strict" 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 da3605e0e060..5538e74f0f0b 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md +++ b/docs/sources/flow/reference/components/otelcol.processor.tail_sampling.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.tail_sampling/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md b/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md index e07d1ed1bce1..f3c061e170fa 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.jaeger.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.jaeger/ title: 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 1d9572a6d71e..4110bb75deaf 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.kafka/ title: 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 82a9687dee69..8bcf9b62a44c 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.loki.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.loki.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.loki/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md b/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md index c32f3f4f92a0..431467c28e85 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.opencensus.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.opencensus/ title: 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 be0ac403f26b..b50683bdd392 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.otlp.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.otlp.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.otlp/ title: 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 0870c2c24412..94dec52fa704 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.prometheus.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.prometheus/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md b/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md index 0c4daf2beb3f..94d9c6a5b097 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.zipkin.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.zipkin/ title: otelcol.receiver.zipkin --- diff --git a/docs/sources/flow/reference/components/prometheus.exporter.apache.md b/docs/sources/flow/reference/components/prometheus.exporter.apache.md index 0824aa4e8fc3..796188d556cb 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.apache.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.apache.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.apache/ title: prometheus.exporter.apache --- diff --git a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md index 1cdc2a889134..494dd273d0a6 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.blackbox/ title: prometheus.exporter.blackbox --- @@ -83,7 +87,7 @@ 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`: +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. ```river prometheus.exporter.blackbox "example" { @@ -97,6 +101,9 @@ prometheus.exporter.blackbox "example" { target "grafana" { address = "http://grafana.com" module = "http_2xx" + labels = { + "env": "dev", + } } } @@ -140,6 +147,9 @@ prometheus.exporter.blackbox "example" { target "grafana" { address = "http://grafana.com" module = "http_2xx" + labels = { + "env": "dev", + } } } @@ -167,4 +177,5 @@ Replace the following: - `USERNAME`: The username to use for authentication to the remote_write API. - `PASSWORD`: The password to use for authentication to the remote_write API. + [scrape]: {{< relref "./prometheus.scrape.md" >}} diff --git a/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md b/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md index 4596e906e220..d33d135d80a9 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.cloudwatch/ title: 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 96316bbb2860..44443ba9a460 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.consul.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.consul.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.consul/ title: 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 b1285d492bf8..851e35ec54cd 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.dnsmasq.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.dnsmasq/ title: 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 d4e9026897dc..f06a25aea8e0 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.elasticsearch.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.elasticsearch/ title: 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 76187ca57def..58465f0c4bc9 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.gcp.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.gcp.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.gcp/ title: 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 0a4b69035470..59a67797a355 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.github.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.github.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.github/ title: 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 c40280ce40bc..d78e6b9ca13d 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.kafka.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.kafka.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.kafka/ title: 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 729259b40346..8b65bbf91507 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.memcached.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.memcached.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.memcached/ title: 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 18719b1d52d7..11ec8fc3435f 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mongodb.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mongodb/ title: 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 1ef759ef3a9b..6e588abf838d 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mssql.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mssql.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mssql/ title: 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 de6347f3c336..1d69cb3d2878 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.mysql.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.mysql.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.mysql/ title: 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 a7660cb01639..d6ace3500298 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.oracledb.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.oracledb/ title: 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 13f55d08f3fa..e22c0bf3da7f 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.postgres.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.postgres.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.postgres/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/prometheus.exporter.process.md b/docs/sources/flow/reference/components/prometheus.exporter.process.md index 94aa16d4845a..c11711361546 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.process.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.process.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.process/ title: 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 b643c2f39093..3e59847cd6ef 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.redis.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.redis.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.redis/ title: 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 2c2e26787f4a..f1b77f4f26d7 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.snmp.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.snmp.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.snmp/ title: 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 3cd3f35a2300..836672ced8a9 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.snowflake.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.snowflake/ title: 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 6445ba3477a1..a0e31b4f53f4 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.squid.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.squid.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.squid/ title: 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 a6464ce9b230..fad2fa6f7010 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.statsd.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.statsd.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.statsd/ title: 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 ea2bbb45cb64..92b3a4933fc5 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.unix.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.unix.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.unix/ title: prometheus.exporter.unix --- diff --git a/docs/sources/flow/reference/components/prometheus.exporter.windows.md b/docs/sources/flow/reference/components/prometheus.exporter.windows.md index 7ef3e9fa928c..8256b73b18b1 100644 --- a/docs/sources/flow/reference/components/prometheus.exporter.windows.md +++ b/docs/sources/flow/reference/components/prometheus.exporter.windows.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.exporter.windows/ title: 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 725db2337b14..a4e4cb9523a7 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md +++ b/docs/sources/flow/reference/components/prometheus.operator.podmonitors.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.podmonitors/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/prometheus.operator.probes.md b/docs/sources/flow/reference/components/prometheus.operator.probes.md index 38bd89d5df87..71e66a562c33 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.probes.md +++ b/docs/sources/flow/reference/components/prometheus.operator.probes.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.probes/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md b/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md index 48a66a87fce5..31055b1e1b36 100644 --- a/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md +++ b/docs/sources/flow/reference/components/prometheus.operator.servicemonitors.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.operator.servicemonitors/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/prometheus.receive_http.md b/docs/sources/flow/reference/components/prometheus.receive_http.md index 402f57727d0e..9dea2ead2799 100644 --- a/docs/sources/flow/reference/components/prometheus.receive_http.md +++ b/docs/sources/flow/reference/components/prometheus.receive_http.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.receive_http/ title: prometheus.receive_http --- diff --git a/docs/sources/flow/reference/components/prometheus.relabel.md b/docs/sources/flow/reference/components/prometheus.relabel.md index 5aa1152a5798..1be1495e5aa1 100644 --- a/docs/sources/flow/reference/components/prometheus.relabel.md +++ b/docs/sources/flow/reference/components/prometheus.relabel.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.relabel/ title: 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 46e8e77743dc..6d462b6c6092 100644 --- a/docs/sources/flow/reference/components/prometheus.remote_write.md +++ b/docs/sources/flow/reference/components/prometheus.remote_write.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.remote_write/ title: prometheus.remote_write --- @@ -304,7 +308,7 @@ information. * `prometheus_remote_storage_exemplars_in_total` (counter): Exemplars read into remote storage. -# Examples +## Examples The following examples show you how to create `prometheus.remote_write` components that send metrics to different destinations. diff --git a/docs/sources/flow/reference/components/prometheus.scrape.md b/docs/sources/flow/reference/components/prometheus.scrape.md index bb9037bef22e..ef279da4a40c 100644 --- a/docs/sources/flow/reference/components/prometheus.scrape.md +++ b/docs/sources/flow/reference/components/prometheus.scrape.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.scrape/ title: prometheus.scrape --- diff --git a/docs/sources/flow/reference/components/pyroscope.ebpf.md b/docs/sources/flow/reference/components/pyroscope.ebpf.md index 8a58ca8b7094..9c04cea892f9 100644 --- a/docs/sources/flow/reference/components/pyroscope.ebpf.md +++ b/docs/sources/flow/reference/components/pyroscope.ebpf.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.ebpf/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/pyroscope.scrape.md b/docs/sources/flow/reference/components/pyroscope.scrape.md index 6c6b8043e2db..975418da6a1b 100644 --- a/docs/sources/flow/reference/components/pyroscope.scrape.md +++ b/docs/sources/flow/reference/components/pyroscope.scrape.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.scrape/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/pyroscope.write.md b/docs/sources/flow/reference/components/pyroscope.write.md index 11332d8a95ab..67c13592f84d 100644 --- a/docs/sources/flow/reference/components/pyroscope.write.md +++ b/docs/sources/flow/reference/components/pyroscope.write.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/pyroscope.write/ labels: stage: beta diff --git a/docs/sources/flow/reference/components/remote.http.md b/docs/sources/flow/reference/components/remote.http.md index ef5807c4f30a..15d9ef59e580 100644 --- a/docs/sources/flow/reference/components/remote.http.md +++ b/docs/sources/flow/reference/components/remote.http.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.http/ title: remote.http --- diff --git a/docs/sources/flow/reference/components/remote.s3.md b/docs/sources/flow/reference/components/remote.s3.md index b0fe6b6ce038..1438fc2fa9e4 100644 --- a/docs/sources/flow/reference/components/remote.s3.md +++ b/docs/sources/flow/reference/components/remote.s3.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.s3/ title: remote.s3 --- diff --git a/docs/sources/flow/reference/components/remote.vault.md b/docs/sources/flow/reference/components/remote.vault.md index 704cf323fbb9..feffeaa95894 100644 --- a/docs/sources/flow/reference/components/remote.vault.md +++ b/docs/sources/flow/reference/components/remote.vault.md @@ -1,6 +1,9 @@ --- aliases: - /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/components/remote.vault/ title: remote.vault --- diff --git a/docs/sources/flow/reference/config-blocks/_index.md b/docs/sources/flow/reference/config-blocks/_index.md index 755e43479908..488e3a4e5561 100644 --- a/docs/sources/flow/reference/config-blocks/_index.md +++ b/docs/sources/flow/reference/config-blocks/_index.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-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 74467400a37a..040328b7c21c 100644 --- a/docs/sources/flow/reference/config-blocks/argument.md +++ b/docs/sources/flow/reference/config-blocks/argument.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/argument/ title: argument --- diff --git a/docs/sources/flow/reference/config-blocks/export.md b/docs/sources/flow/reference/config-blocks/export.md index 4983c035ed0c..aa786aba4e06 100644 --- a/docs/sources/flow/reference/config-blocks/export.md +++ b/docs/sources/flow/reference/config-blocks/export.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/export/ title: export --- diff --git a/docs/sources/flow/reference/config-blocks/http.md b/docs/sources/flow/reference/config-blocks/http.md index f19177c68b02..1d509bd3ca8b 100644 --- a/docs/sources/flow/reference/config-blocks/http.md +++ b/docs/sources/flow/reference/config-blocks/http.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/http/ title: http --- diff --git a/docs/sources/flow/reference/config-blocks/logging.md b/docs/sources/flow/reference/config-blocks/logging.md index c86d61e7a4a2..f8219947b36b 100644 --- a/docs/sources/flow/reference/config-blocks/logging.md +++ b/docs/sources/flow/reference/config-blocks/logging.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/logging/ title: logging --- diff --git a/docs/sources/flow/reference/config-blocks/tracing.md b/docs/sources/flow/reference/config-blocks/tracing.md index 928b8c242c27..c0e1e60bafbe 100644 --- a/docs/sources/flow/reference/config-blocks/tracing.md +++ b/docs/sources/flow/reference/config-blocks/tracing.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/config-blocks/tracing/ title: tracing --- diff --git a/docs/sources/flow/reference/stdlib/_index.md b/docs/sources/flow/reference/stdlib/_index.md index a75cb709e4a0..1e231dad4efd 100644 --- a/docs/sources/flow/reference/stdlib/_index.md +++ b/docs/sources/flow/reference/stdlib/_index.md @@ -1,5 +1,8 @@ --- 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/ - standard-library/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/ title: Standard library diff --git a/docs/sources/flow/reference/stdlib/coalesce.md b/docs/sources/flow/reference/stdlib/coalesce.md index 82d56ac8113c..aa452a1da735 100644 --- a/docs/sources/flow/reference/stdlib/coalesce.md +++ b/docs/sources/flow/reference/stdlib/coalesce.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/coalesce/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/coalesce/ title: coalesce --- diff --git a/docs/sources/flow/reference/stdlib/concat.md b/docs/sources/flow/reference/stdlib/concat.md index d2f7bca24171..ac793123c628 100644 --- a/docs/sources/flow/reference/stdlib/concat.md +++ b/docs/sources/flow/reference/stdlib/concat.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/concat/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/concat/ title: concat --- diff --git a/docs/sources/flow/reference/stdlib/constants.md b/docs/sources/flow/reference/stdlib/constants.md index b33d0c7bd542..54701a4633ef 100644 --- a/docs/sources/flow/reference/stdlib/constants.md +++ b/docs/sources/flow/reference/stdlib/constants.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/constants/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/constants/ title: constants --- diff --git a/docs/sources/flow/reference/stdlib/env.md b/docs/sources/flow/reference/stdlib/env.md index c39569fcaee5..5c6bcc443170 100644 --- a/docs/sources/flow/reference/stdlib/env.md +++ b/docs/sources/flow/reference/stdlib/env.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/env/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/env/ title: env --- diff --git a/docs/sources/flow/reference/stdlib/format.md b/docs/sources/flow/reference/stdlib/format.md index 627a26b35a39..39d92da9c2fe 100644 --- a/docs/sources/flow/reference/stdlib/format.md +++ b/docs/sources/flow/reference/stdlib/format.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/format/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/format/ title: format --- diff --git a/docs/sources/flow/reference/stdlib/join.md b/docs/sources/flow/reference/stdlib/join.md index 8f79ce5c5a11..38864f689aea 100644 --- a/docs/sources/flow/reference/stdlib/join.md +++ b/docs/sources/flow/reference/stdlib/join.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/join/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/join/ title: join --- diff --git a/docs/sources/flow/reference/stdlib/json_decode.md b/docs/sources/flow/reference/stdlib/json_decode.md index eb3ce5c96157..0a70394a1eb8 100644 --- a/docs/sources/flow/reference/stdlib/json_decode.md +++ b/docs/sources/flow/reference/stdlib/json_decode.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/json_decode/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/json_decode/ title: json_decode --- diff --git a/docs/sources/flow/reference/stdlib/json_path.md b/docs/sources/flow/reference/stdlib/json_path.md index 42d66cfc4626..07d85bad460a 100644 --- a/docs/sources/flow/reference/stdlib/json_path.md +++ b/docs/sources/flow/reference/stdlib/json_path.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/json_path/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/json_path/ title: json_path --- diff --git a/docs/sources/flow/reference/stdlib/nonsensitive.md b/docs/sources/flow/reference/stdlib/nonsensitive.md index a019163ab1ec..d37414e47a8c 100644 --- a/docs/sources/flow/reference/stdlib/nonsensitive.md +++ b/docs/sources/flow/reference/stdlib/nonsensitive.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/nonsensitive/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/nonsensitive/ title: nonsensitive --- diff --git a/docs/sources/flow/reference/stdlib/replace.md b/docs/sources/flow/reference/stdlib/replace.md index 4efc43e901cc..c139d388eed7 100644 --- a/docs/sources/flow/reference/stdlib/replace.md +++ b/docs/sources/flow/reference/stdlib/replace.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/replace/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/replace/ title: replace --- diff --git a/docs/sources/flow/reference/stdlib/split.md b/docs/sources/flow/reference/stdlib/split.md index ccb382899142..707c3f57d371 100644 --- a/docs/sources/flow/reference/stdlib/split.md +++ b/docs/sources/flow/reference/stdlib/split.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/split/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/split/ title: split --- @@ -16,12 +19,12 @@ split(list, separator) ## Examples ```river -> split(",", "foo,bar,baz") +> split("foo,bar,baz", "," ) ["foo", "bar", "baz"] -> split(",", "foo") +> split("foo", ",") ["foo"] -> split(",", "") +> split("", ",") [""] ``` diff --git a/docs/sources/flow/reference/stdlib/to_lower.md b/docs/sources/flow/reference/stdlib/to_lower.md index fbec0cdc6388..39630a6bbdc9 100644 --- a/docs/sources/flow/reference/stdlib/to_lower.md +++ b/docs/sources/flow/reference/stdlib/to_lower.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/to_lower/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/to_lower/ title: to_lower --- diff --git a/docs/sources/flow/reference/stdlib/to_upper.md b/docs/sources/flow/reference/stdlib/to_upper.md index 1e4131e49643..c7279466c4d8 100644 --- a/docs/sources/flow/reference/stdlib/to_upper.md +++ b/docs/sources/flow/reference/stdlib/to_upper.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/to_upper/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/to_upper/ title: to_upper --- diff --git a/docs/sources/flow/reference/stdlib/trim.md b/docs/sources/flow/reference/stdlib/trim.md index 4ba34e5bf3d5..03ab2d0f3202 100644 --- a/docs/sources/flow/reference/stdlib/trim.md +++ b/docs/sources/flow/reference/stdlib/trim.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/trim/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim/ title: trim --- diff --git a/docs/sources/flow/reference/stdlib/trim_prefix.md b/docs/sources/flow/reference/stdlib/trim_prefix.md index d021c07f11ad..ae7bad5fa395 100644 --- a/docs/sources/flow/reference/stdlib/trim_prefix.md +++ b/docs/sources/flow/reference/stdlib/trim_prefix.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/trim_prefix/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_prefix/ title: trim_prefix --- diff --git a/docs/sources/flow/reference/stdlib/trim_space.md b/docs/sources/flow/reference/stdlib/trim_space.md index 411b453cf467..9851fdfce15b 100644 --- a/docs/sources/flow/reference/stdlib/trim_space.md +++ b/docs/sources/flow/reference/stdlib/trim_space.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/trim_space/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_space/ title: trim_space --- diff --git a/docs/sources/flow/reference/stdlib/trim_suffix.md b/docs/sources/flow/reference/stdlib/trim_suffix.md index 0aa361f87028..72bc60cfb2a8 100644 --- a/docs/sources/flow/reference/stdlib/trim_suffix.md +++ b/docs/sources/flow/reference/stdlib/trim_suffix.md @@ -1,6 +1,9 @@ --- aliases: - ../../configuration-language/standard-library/trim_suffix/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/reference/stdlib/trim_suffix/ title: trim_suffix --- diff --git a/docs/sources/flow/release-notes.md b/docs/sources/flow/release-notes.md index 081e3609fd0a..a77740ea724a 100644 --- a/docs/sources/flow/release-notes.md +++ b/docs/sources/flow/release-notes.md @@ -1,10 +1,13 @@ --- +aliases: +- ./upgrade-guide/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/release-notes/ description: Release notes for Grafana Agent flow mode -title: Release notes for Grafana Agentflow mode menuTitle: Release notes -aliases: -- ./upgrade-guide/ +title: Release notes for Grafana Agentflow mode weight: 999 --- diff --git a/docs/sources/flow/setup/_index.md b/docs/sources/flow/setup/_index.md index af591f8bd74c..3fc1bcb0be4a 100644 --- a/docs/sources/flow/setup/_index.md +++ b/docs/sources/flow/setup/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/setup/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/setup/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/setup/ canonical: https://grafana.com/docs/agent/latest/flow/setup/ description: 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 3a04c5e909dd..8a23c557f4e9 100644 --- a/docs/sources/flow/setup/configure/_index.md +++ b/docs/sources/flow/setup/configure/_index.md @@ -1,4 +1,8 @@ --- +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/ 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 d8ac995d3ce8..0b3c9be0eb17 100644 --- a/docs/sources/flow/setup/configure/configure-kubernetes.md +++ b/docs/sources/flow/setup/configure/configure-kubernetes.md @@ -1,4 +1,8 @@ --- +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/ 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 03ffb5256b70..28073f7fbe84 100644 --- a/docs/sources/flow/setup/configure/configure-linux.md +++ b/docs/sources/flow/setup/configure/configure-linux.md @@ -1,4 +1,8 @@ --- +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/ 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 30b5964cabbf..0f0487ab24bb 100644 --- a/docs/sources/flow/setup/configure/configure-macos.md +++ b/docs/sources/flow/setup/configure/configure-macos.md @@ -1,4 +1,8 @@ --- +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/ 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 5490cab444a1..bf992f46081b 100644 --- a/docs/sources/flow/setup/configure/configure-windows.md +++ b/docs/sources/flow/setup/configure/configure-windows.md @@ -1,4 +1,8 @@ --- +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/ 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/install/_index.md b/docs/sources/flow/setup/install/_index.md index c826b5fb3de2..b65e9c4b3228 100644 --- a/docs/sources/flow/setup/install/_index.md +++ b/docs/sources/flow/setup/install/_index.md @@ -1,5 +1,8 @@ --- 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/sources/flow/install/ canonical: https://grafana.com/docs/agent/latest/flow/setup/install/ menuTitle: Install flow mode @@ -13,7 +16,7 @@ You can install Grafana Agent in flow mode on Docker, Kubernetes, Linux, macOS, The following architectures are supported: -- Linux: AMD64, ARM64, ARMv6, ARMv7 +- Linux: AMD64, ARM64 - Windows: AMD64 - macOS: AMD64 (Intel), ARM64 (Apple Silicon) - FreeBSD: AMD64 diff --git a/docs/sources/flow/setup/install/binary.md b/docs/sources/flow/setup/install/binary.md index 97a17d4f1a19..a0c7e219dbe1 100644 --- a/docs/sources/flow/setup/install/binary.md +++ b/docs/sources/flow/setup/install/binary.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/binary/ +- /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/ 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 095e1091abaa..a97d1fa9b317 100644 --- a/docs/sources/flow/setup/install/docker.md +++ b/docs/sources/flow/setup/install/docker.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/docker/ +- /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/ 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 00b1257f6c73..85c6e19c6122 100644 --- a/docs/sources/flow/setup/install/kubernetes.md +++ b/docs/sources/flow/setup/install/kubernetes.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/kubernetes/ +- /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/ 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 1dfa594e697c..502738acb02e 100644 --- a/docs/sources/flow/setup/install/linux.md +++ b/docs/sources/flow/setup/install/linux.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/linux/ +- /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/ 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 758f915e56e4..94ecd9ff1cea 100644 --- a/docs/sources/flow/setup/install/macos.md +++ b/docs/sources/flow/setup/install/macos.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/macos/ +- /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/ 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 @@ -51,7 +54,7 @@ To upgrade Grafana Agent on macOS, run the following commands in a terminal wind 1. Restart Grafana Agent: ```shell - brew services restart grafana-agent + brew services restart grafana-agent-flow ``` ## Uninstall diff --git a/docs/sources/flow/setup/install/windows.md b/docs/sources/flow/setup/install/windows.md index 829e48cd5af2..a75069351435 100644 --- a/docs/sources/flow/setup/install/windows.md +++ b/docs/sources/flow/setup/install/windows.md @@ -1,6 +1,9 @@ --- aliases: - ../../install/windows/ +- /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/ 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 0890db605697..0893f96f7119 100644 --- a/docs/sources/flow/setup/start-agent.md +++ b/docs/sources/flow/setup/start-agent.md @@ -1,4 +1,8 @@ --- +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/ 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 @@ -103,7 +107,7 @@ brew services stop grafana-agent-flow By default, logs are written to `$(brew --prefix)/var/log/grafana-agent-flow.log` and `$(brew --prefix)/var/log/grafana-agent-flow.err.log`. -If you followed [Configure the Grafana Agent service](../setup/configure/configure-macos/#configure-the-grafana-agent-service) +If you followed [Configure the Grafana Agent service](../setup/configure/configure-macos#configure-the-grafana-agent-service) and changed the path where logs are written, refer to your current copy of the Grafana Agent formula to locate your log files. ## Windows diff --git a/docs/sources/flow/tutorials/_index.md b/docs/sources/flow/tutorials/_index.md index 91866981be39..74f3d1f3d94f 100644 --- a/docs/sources/flow/tutorials/_index.md +++ b/docs/sources/flow/tutorials/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/flow/tutorials/ +- /docs/grafana-cloud/monitor-infrastructure/agent/flow/tutorials/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/flow/tutorials/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/ title: Tutorials weight: 300 diff --git a/docs/sources/flow/tutorials/chaining.md b/docs/sources/flow/tutorials/chaining.md index ce36cc2e08f6..002571970e9c 100644 --- a/docs/sources/flow/tutorials/chaining.md +++ b/docs/sources/flow/tutorials/chaining.md @@ -1,10 +1,13 @@ --- +aliases: +- ./chaining/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/chaining/ description: Learn how to chain Prometheus components -title: Chain Prometheus components menuTitle: Chain Prometheus components -aliases: -- ./chaining/ +title: Chain Prometheus components weight: 400 --- diff --git a/docs/sources/flow/tutorials/collecting-prometheus-metrics.md b/docs/sources/flow/tutorials/collecting-prometheus-metrics.md index 7955c6940877..82145b4dcb34 100644 --- a/docs/sources/flow/tutorials/collecting-prometheus-metrics.md +++ b/docs/sources/flow/tutorials/collecting-prometheus-metrics.md @@ -1,10 +1,13 @@ --- +aliases: +- ./collecting-prometheus-metrics/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/collecting-prometheus-metrics/ description: Learn how to collect Prometheus metrics -title: Collect Prometheus metrics menuTitle: Collect Prometheus metrics -aliases: -- ./collecting-prometheus-metrics/ +title: Collect Prometheus metrics weight: 200 --- diff --git a/docs/sources/flow/tutorials/filtering-metrics.md b/docs/sources/flow/tutorials/filtering-metrics.md index 748442eae8f5..af4c10482679 100644 --- a/docs/sources/flow/tutorials/filtering-metrics.md +++ b/docs/sources/flow/tutorials/filtering-metrics.md @@ -1,10 +1,13 @@ --- +aliases: +- ./filtering-metrics/ +- /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/ canonical: https://grafana.com/docs/agent/latest/flow/tutorials/filtering-metrics/ description: Learn how to filter Prometheus metrics -title: Filter Prometheus metrics menuTitle: Filter Prometheus metrics -aliases: -- ./filtering-metrics/ +title: Filter Prometheus metrics weight: 300 --- diff --git a/docs/sources/operator/_index.md b/docs/sources/operator/_index.md index 51cb2e63f4ff..db36d10e5bf1 100644 --- a/docs/sources/operator/_index.md +++ b/docs/sources/operator/_index.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/operator/ +- /docs/grafana-cloud/monitor-infrastructure/agent/operator/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/ canonical: https://grafana.com/docs/agent/latest/operator/ title: Static mode Kubernetes operator weight: 300 diff --git a/docs/sources/operator/add-custom-scrape-jobs.md b/docs/sources/operator/add-custom-scrape-jobs.md index 161753e6311c..cfeea0dc3b4e 100644 --- a/docs/sources/operator/add-custom-scrape-jobs.md +++ b/docs/sources/operator/add-custom-scrape-jobs.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/operator/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 1b426b83e612..b9e4e4dc3b34 100644 --- a/docs/sources/operator/api.md +++ b/docs/sources/operator/api.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/latest/operator/crd/ +- /docs/grafana-cloud/agent/operator/api/ +- /docs/grafana-cloud/monitor-infrastructure/agent/operator/api/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/api/ canonical: https://grafana.com/docs/agent/latest/operator/api/ title: Custom Resource Definition Reference weight: 500 diff --git a/docs/sources/operator/architecture.md b/docs/sources/operator/architecture.md index f492cf83ef59..0d4519bf179c 100644 --- a/docs/sources/operator/architecture.md +++ b/docs/sources/operator/architecture.md @@ -1,4 +1,8 @@ --- +aliases: +- /docs/grafana-cloud/agent/operator/architecture/ +- /docs/grafana-cloud/monitor-infrastructure/agent/operator/architecture/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/architecture/ canonical: https://grafana.com/docs/agent/latest/operator/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 79648934b31b..a0a8b45a8ed1 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -1,5 +1,8 @@ --- 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/ - custom-resource-quickstart/ canonical: https://grafana.com/docs/agent/latest/operator/deploy-agent-operator-resources/ title: Deploy Operator resources diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index 5f73bf5458cd..561e722baed8 100644 --- a/docs/sources/operator/getting-started.md +++ b/docs/sources/operator/getting-started.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/operator/getting-started/ 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 08f6976cefed..1a66f48b48a3 100644 --- a/docs/sources/operator/helm-getting-started.md +++ b/docs/sources/operator/helm-getting-started.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/operator/helm-getting-started/ title: Install the Operator with Helm weight: 100 diff --git a/docs/sources/operator/operator-integrations.md b/docs/sources/operator/operator-integrations.md index 766712debf4e..6dccc3f6fb29 100644 --- a/docs/sources/operator/operator-integrations.md +++ b/docs/sources/operator/operator-integrations.md @@ -1,4 +1,8 @@ --- +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/ canonical: https://grafana.com/docs/agent/latest/operator/operator-integrations/ title: Set up integrations weight: 350 diff --git a/docs/sources/operator/release-notes.md b/docs/sources/operator/release-notes.md index 85879a62f9f3..0881fbeb3203 100644 --- a/docs/sources/operator/release-notes.md +++ b/docs/sources/operator/release-notes.md @@ -1,10 +1,13 @@ --- +aliases: +- ./upgrade-guide/ +- /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/ canonical: https://grafana.com/docs/agent/latest/operator/release-notes/ description: Release notes for Grafana Agent static mode Kubernetes operator -title: Release notes for Grafana Agent menuTitle: Release notes -aliases: -- ./upgrade-guide/ +title: Release notes for Grafana Agent weight: 999 --- diff --git a/docs/sources/shared/flow/reference/components/authorization-block.md b/docs/sources/shared/flow/reference/components/authorization-block.md index 0015449c66d3..5f71edf0ffbf 100644 --- a/docs/sources/shared/flow/reference/components/authorization-block.md +++ b/docs/sources/shared/flow/reference/components/authorization-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/authorization-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/authorization-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 e5d4ec98a29c..902d911398d3 100644 --- a/docs/sources/shared/flow/reference/components/basic-auth-block.md +++ b/docs/sources/shared/flow/reference/components/basic-auth-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/basic-auth-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 a2ae979cd3e7..131936ab4f6f 100644 --- a/docs/sources/shared/flow/reference/components/exporter-component-exports.md +++ b/docs/sources/shared/flow/reference/components/exporter-component-exports.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/exporter-component-exports/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/exporter-component-exports/ 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 60921d7d8bde..b699c5d94048 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/http-client-config-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 44ec48e84270..280f165653cf 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/local-file-arguments-text/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 815a6529084c..42709a292979 100644 --- a/docs/sources/shared/flow/reference/components/loki-server-grpc.md +++ b/docs/sources/shared/flow/reference/components/loki-server-grpc.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/loki-server-grpc/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 a261eb18f9ea..b9e1779845bf 100644 --- a/docs/sources/shared/flow/reference/components/loki-server-http.md +++ b/docs/sources/shared/flow/reference/components/loki-server-http.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/loki-server-http/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/loki-server-http/ 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 f9dfd139fd32..a2bbf6e00acb 100644 --- a/docs/sources/shared/flow/reference/components/match-properties-block.md +++ b/docs/sources/shared/flow/reference/components/match-properties-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/match-properties-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 8756ec9d2957..51f572d41abd 100644 --- a/docs/sources/shared/flow/reference/components/oauth2-block.md +++ b/docs/sources/shared/flow/reference/components/oauth2-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/oauth2-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 f8b4789e4c44..6ae03e2d9e2a 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-compression-field.md +++ b/docs/sources/shared/flow/reference/components/otelcol-compression-field.md @@ -1,6 +1,9 @@ --- aliases: - /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 496bda9d3f35..92c6b20690e7 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-debug-metrics-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 8faed5b307fd..c454b13aa36c 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-filter-attribute-block/ +- /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/ 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 3bff9c3930fe..9881fee71201 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-filter-library-block/ +- /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/ 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 0a7836371221..092259360625 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-filter-log-severity-block/ +- /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/ 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 3c198377bf49..5230ee962ff0 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-filter-regexp-block/ +- /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/ 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 df06bbc8307f..71ff5afb9fc5 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-filter-resource-block/ +- /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/ 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 98a0282c0094..1f0ce93d783b 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,6 +1,9 @@ --- aliases: - /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/ 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 cbe2b7829ad7..344a9d1da019 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-queue-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-queue-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-queue-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 0d4b81bcbbc4..b15911d1f4eb 100644 --- a/docs/sources/shared/flow/reference/components/otelcol-retry-block.md +++ b/docs/sources/shared/flow/reference/components/otelcol-retry-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-retry-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 f90594138d85..afd7308536d1 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 @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/otelcol-tls-config-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 314e097347e0..bcae6595abfe 100644 --- a/docs/sources/shared/flow/reference/components/output-block-logs.md +++ b/docs/sources/shared/flow/reference/components/output-block-logs.md @@ -1,6 +1,9 @@ --- aliases: - ../../otelcol/output-block-logs/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 e66c8acf932b..d47c8ea53f3b 100644 --- a/docs/sources/shared/flow/reference/components/output-block-metrics.md +++ b/docs/sources/shared/flow/reference/components/output-block-metrics.md @@ -1,6 +1,9 @@ --- aliases: - ../../otelcol/output-block-metrics/ +- /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/ 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 f14d0b138089..b30aa8219596 100644 --- a/docs/sources/shared/flow/reference/components/output-block-traces.md +++ b/docs/sources/shared/flow/reference/components/output-block-traces.md @@ -1,6 +1,9 @@ --- aliases: - ../../otelcol/output-block-traces/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 8821bb611cbf..c33d904690b5 100644 --- a/docs/sources/shared/flow/reference/components/output-block.md +++ b/docs/sources/shared/flow/reference/components/output-block.md @@ -1,6 +1,9 @@ --- aliases: - ../../otelcol/output-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/output-block/ 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 747811c2e564..bbcf750bdb39 100644 --- a/docs/sources/shared/flow/reference/components/rule-block-logs.md +++ b/docs/sources/shared/flow/reference/components/rule-block-logs.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/rule-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/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 066981ac76aa..9a0ee2871058 100644 --- a/docs/sources/shared/flow/reference/components/rule-block.md +++ b/docs/sources/shared/flow/reference/components/rule-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/rule-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/rule-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 872c0115553c..1c2e88135d86 100644 --- a/docs/sources/shared/flow/reference/components/tls-config-block.md +++ b/docs/sources/shared/flow/reference/components/tls-config-block.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/reference/components/tls-config-block/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/reference/components/tls-config-block/ headless: true --- diff --git a/docs/sources/shared/flow/stability/beta.md b/docs/sources/shared/flow/stability/beta.md index 53bafa8f9438..895865b21292 100644 --- a/docs/sources/shared/flow/stability/beta.md +++ b/docs/sources/shared/flow/stability/beta.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/stability/beta/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/stability/beta/ headless: true --- diff --git a/docs/sources/shared/flow/stability/experimental.md b/docs/sources/shared/flow/stability/experimental.md index 17f33c476172..1e3936e0e243 100644 --- a/docs/sources/shared/flow/stability/experimental.md +++ b/docs/sources/shared/flow/stability/experimental.md @@ -1,6 +1,9 @@ --- aliases: - /docs/agent/shared/flow/stability/experimental/ +- /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/ canonical: https://grafana.com/docs/agent/latest/shared/flow/stability/experimental/ headless: true --- diff --git a/docs/sources/static/set-up/install/_index.md b/docs/sources/static/set-up/install/_index.md index 3afff29a50ee..8db1e54200e2 100644 --- a/docs/sources/static/set-up/install/_index.md +++ b/docs/sources/static/set-up/install/_index.md @@ -14,7 +14,7 @@ You can install Grafana Agent in static mode on Docker, Kubernetes, Linux, macOS The following architectures are supported: -- Linux: AMD64, ARM64, ARMv6, ARMv7 +- Linux: AMD64, ARM64 - Windows: AMD64 - macOS: AMD64 (Intel), ARM64 (Apple Silicon) - FreeBSD: AMD64 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 9da9d7f898f9..7a208c26ad39 100644 --- a/docs/sources/static/set-up/install/install-agent-linux.md +++ b/docs/sources/static/set-up/install/install-agent-linux.md @@ -72,7 +72,6 @@ To install Grafana Agent in static mode on RHEL or Fedora, run the following com 1. Create `/etc/yum.repos.d/grafana.repo` with the following content: ```shell - sudo nano /etc/yum.repos.d/grafana.repo [grafana] name=grafana baseurl=https://rpm.grafana.com diff --git a/go.mod b/go.mod index 71509cc0d010..4f087e394d44 100644 --- a/go.mod +++ b/go.mod @@ -542,7 +542,7 @@ require ( github.com/samber/lo v1.38.1 // indirect github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17 // indirect + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/sergi/go-diff v1.2.0 // indirect @@ -714,8 +714,8 @@ exclude github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194 // Add exclude directives so Go doesn't pick old incompatible k8s.io/client-go // versions. exclude ( - k8s.io/client-go v12.0.0+incompatible k8s.io/client-go v8.0.0+incompatible + k8s.io/client-go v12.0.0+incompatible ) replace github.com/github/smimesign => github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3 diff --git a/go.sum b/go.sum index 00d29361f18c..a0ab05b4f239 100644 --- a/go.sum +++ b/go.sum @@ -224,6 +224,7 @@ cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxs cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g= +cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= @@ -407,6 +408,7 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 h1:V8krnnfGj4pV65YLUm3C0/8bl7V5Nry2Pwvy3ru/wLc= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI= github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE= github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= @@ -427,7 +429,9 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLC github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2/go.mod h1:FbdwsQ2EzwvXxOPcMFYO8ogEc9uMMIj3YkmCdXdAFmk= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0/go.mod h1:mLfWfj8v3jfWKsL9G4eoBoXVcsqcIUTapmdKy7uGOp0= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.9.1 h1:BDYGHuQZ5IjPpdXcZmFVsXnWOcjZ0+trzyUfiyIDsBU= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.9.1/go.mod h1:Xvhh92LkBGnwklU5WY19Ky2kwZy5bkKqm6+uLT5CGoY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.7.1 h1:eoQrCw9DMThzbJ32fHXZtISnURk6r0TozXiWuTsay5s= @@ -513,11 +517,13 @@ github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v0.0.0-20160329135253-cc2f4770f4d6/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Jeffail/gabs v1.1.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= @@ -568,6 +574,7 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= +github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7 h1:DSqTh6nEes/uO8BlNcGk8PzZsxY2sN9ZL//veWBdTRI= github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= @@ -588,6 +595,7 @@ github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSd github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= +github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -600,12 +608,14 @@ github.com/aerospike/aerospike-client-go v1.27.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaR github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= +github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g= github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -616,8 +626,10 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAu github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis/v2 v2.30.4 h1:8S4/o1/KoUArAGbGwPxcwf0krlzceva2XVOSchFS7Eo= +github.com/alicebob/miniredis/v2 v2.30.4/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -701,13 +713,19 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36/go.mod h1:Rmw2M1hMVTwiUhjwMoIB github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26/go.mod h1:MtYiox5gvyB+OyP0Mr0Sm/yzbEAIPL9eijj/ouHAPw0= github.com/aws/aws-sdk-go-v2/service/amp v1.16.14 h1:cak6jLkSwmPqcJ7pcVlkABsYfjCxxiyjBM2xBgjPwmY= +github.com/aws/aws-sdk-go-v2/service/amp v1.16.14/go.mod h1:Tq9wKXE+SPKKkwJSRHE/u+aOdUdvU//AuPfi/w6iNdc= github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.14 h1:mXf/MQX2zcKpWTfI4YgHrD4UYBh6AzyBCRfVdsxExaU= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.14/go.mod h1:KJyzRVA5DkFaU4hVgKDoHiSrCobfmYP8UpRXlybTuTU= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.15 h1:lgTqmtilhObvVhxeBhX/KRC5RaB4A0dQqDDdLmfAP+0= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.15/go.mod h1:lg/1D90DDo2//C84mvygysHF4JRo+Vf/W5YbkHoeUk8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.28.10 h1:moHEk4wbdc8VNvff4UOLuXVHtjh7YtsGdiyB0MrPPKg= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.28.10/go.mod h1:P3qp1VYVoxHgDhpDDCTre1ee9IKpmgqnUoOb+8RA9qI= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.5.0/go.mod h1:acH3+MQoiMzozT/ivU+DbRg7Ooo2298RdRaWcOv+4vM= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.27.0 h1:8ei9YIP3tmLbIX4rh1Hq9MM8/rpb1QBtHreVN/TP7wQ= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.27.0/go.mod h1:UXh7fjHrDoVd/tRPQyGCSfb04setwR75qxAx7+x1vcU= github.com/aws/aws-sdk-go-v2/service/ec2 v1.106.0 h1:chzRNw2kwcrosHm0k72Wyf4sbUNcG8+HeCJbSBtsOTk= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.106.0/go.mod h1:/0btVmMZJ0sn9JQ2N96XszlQNeRCJhhXOS/sPZgDeew= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 h1:zZSLP3v3riMOP14H7b4XP0uyfREDQOYv2cqIrvTXDNQ= @@ -719,9 +737,11 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29/go.mod h1:fD github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3/go.mod h1:f1QyiAsvIv4B49DmCqrhlXqyaR+0IxMmyX+1P+AnzOM= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15 h1:5I9Yi2Ls1q8/VTpRmlLOGilFCtJNsEms+64BhYybm7Y= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15/go.mod h1:86l8OObGPcaNgQ2pVaRRdaHTepispGs2UYLp8niWkSM= github.com/aws/aws-sdk-go-v2/service/s3 v1.34.1 h1:rYYwwsGqbwvGgQHjBkqgDt8MynXk+I8xgS0IEj5gOT0= github.com/aws/aws-sdk-go-v2/service/s3 v1.34.1/go.mod h1:aVbf0sko/TsLWHx30c/uVu7c62+0EAJ3vbxaJga0xCw= github.com/aws/aws-sdk-go-v2/service/shield v1.18.13 h1:/QqZKWvxShuecy5hZm6P4pJQ2Uzn6TSJtsd9xeaqLG0= +github.com/aws/aws-sdk-go-v2/service/shield v1.18.13/go.mod h1:YcHL79qHynGYok2NKGb3+mrb6EWROWD4gBU3v+tKtUM= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.12.12/go.mod h1:HuCOxYsF21eKrerARYO6HapNeh9GBNq7fius2AcwodY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 h1:sWDv7cMITPcZ21QdreULwxOOAmE05JjEsT6fCDtDA9k= @@ -730,6 +750,7 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12/go.mod h1:E4VrHCPzmVB/KFXt github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 h1:BFubHS/xN5bjl818QaroN6mQdjneYQ+AOx44KNXlyH4= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13/go.mod h1:BzqsVVFduubEmzrVtUFQQIQdFqvUItF8XUq2EnS8Wog= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.18.16 h1:Gk+75k6j55fqE+uA/99jAlcZBY4OLT244JuKp+HLXxo= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.18.16/go.mod h1:l/XhpyuxnJ3s8yKi9h0XDwVqM18iDEFeUVDYGCEcE/g= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/aws-sdk-go-v2/service/sts v1.19.2/go.mod h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg= github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 h1:e5mnydVdCVWxP+5rPAGi2PYxC7u2OZgH1ypC114H04U= @@ -746,6 +767,7 @@ github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NR github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -807,6 +829,7 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61 h1:o64h9XF42kVEUuhuer2ehqrlX8rZmvQSU0+Vpj1rF6Q= +github.com/channelmeter/iso8601duration v0.0.0-20150204201828-8da3af7a2a61/go.mod h1:Rp8e0DCtEKwXFOC6JPJQVTz8tuGoGvw6Xfexggh/ed0= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8= @@ -1168,6 +1191,7 @@ github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= +github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= @@ -1218,6 +1242,7 @@ github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= +github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -1281,12 +1306,13 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= +github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= @@ -1333,6 +1359,7 @@ github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gofrs/uuid v2.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.1+incompatible h1:0/KbAdpx3UXAx1kEOWHJeOkpbgRFGHVgv+CFIY7dBJI= +github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= @@ -1365,6 +1392,7 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1524,6 +1552,7 @@ github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORR github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -1539,10 +1568,6 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gosnmp/gosnmp v1.35.0 h1:EuWWNPxTCdAUx2/NbQcSa3WdNxjzpy4Phv57b4MWpJM= github.com/gosnmp/gosnmp v1.35.0/go.mod h1:2AvKZ3n9aEl5TJEo/fFmf/FGO4Nj4cVeEc5yuk88CYc= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/grafana/ckit v0.0.0-20230828161709-f92727a81ad4 h1:wr+UcS7TXxVgHKjZnJPhoczlDjscHyZnp/imc4pi/Es= -github.com/grafana/ckit v0.0.0-20230828161709-f92727a81ad4/go.mod h1:PjJIKCdwH5OLd57TsYa6dOhTrPURREpdrABxmV475bQ= -github.com/grafana/ckit v0.0.0-20230906010118-dae9eedb7aad h1:24QbWLcvMauE1d9MswyrPTcN151IKKsF/gPbfuwDJMI= -github.com/grafana/ckit v0.0.0-20230906010118-dae9eedb7aad/go.mod h1:HOnDIbkxfvVlDM5FBujt0uawGLfdpdTeqE7fIwfBmQk= github.com/grafana/ckit v0.0.0-20230906125525-c046c99a5c04 h1:tG8Qxq4dN1WqakMmsPaxaH4+OQhYg5HVsarw5acLBX8= github.com/grafana/ckit v0.0.0-20230906125525-c046c99a5c04/go.mod h1:HOnDIbkxfvVlDM5FBujt0uawGLfdpdTeqE7fIwfBmQk= github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I= @@ -1623,6 +1648,7 @@ github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY= +github.com/hashicorp/consul/sdk v0.13.1/go.mod h1:SW/mM4LbKfqmMvcFu8v+eiQQ7oitXEFeiBe9StxERb0= github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1774,6 +1800,7 @@ github.com/heroku/x v0.0.59/go.mod h1:C7xYbpMdond+s6L5VpniDUSVPRwm3kZum1o7XiD5ZH github.com/hetznercloud/hcloud-go v1.45.1 h1:nl0OOklFfQT5J6AaNIOhl5Ruh3fhmGmhvZEqHbibVuk= github.com/hetznercloud/hcloud-go v1.45.1/go.mod h1:aAUGxSfSnB8/lVXHNEDxtCT1jykaul8kqjD7f5KQXF8= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/hodgesds/perf-utils v0.7.0 h1:7KlHGMuig4FRH5fNw68PV6xLmgTe7jKs9hgAcEAbioU= @@ -1870,6 +1897,7 @@ github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= +github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= @@ -2076,6 +2104,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfr github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g= +github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b/go.mod h1:WYK/Z/aXq9cbMFIL5ihcA4sX/r/3/WCas/Qvs/2fXcA= github.com/mdlayher/ethtool v0.0.0-20221212131811-ba3b4bc2e02c h1:Y7LoKqIgD7vmqJ7+6ZVnADuwUO+m3tGXbf2lK0OvjIw= @@ -2132,6 +2161,7 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= +github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -2149,7 +2179,6 @@ github.com/mna/redisc v1.3.2/go.mod h1:CplIoaSTDi5h9icnj4FLbRgHoNKCHDNJDVRztWDGe github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= @@ -2223,6 +2252,7 @@ github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnu github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/observiq/ctimefmt v1.0.0 h1:r7vTJ+Slkrt9fZ67mkf+mA6zAdR5nGIJRMTzkUyvilk= github.com/observiq/ctimefmt v1.0.0/go.mod h1:mxi62//WbSpG/roCO1c6MqZ7zQTvjVtYheqHN3eOjvc= github.com/ohler55/ojg v1.19.2 h1:XvMP9oF6jo3T4eUyCsDwi3YFv0bGyQ4PvYBSMF9LiBM= @@ -2250,7 +2280,9 @@ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= +github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -2262,6 +2294,7 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= +github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.80.0 h1:fJF/5xzmnrXVKIMan4Q54toP8brqiGmaNTLQGrYnfro= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.80.0/go.mod h1:YepdDwedXtA3g7Q3bnDVJ07Onjn8AusMdwsH+f3phco= @@ -2288,6 +2321,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2client github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.80.0 h1:bDOzezMdoK2m5Q7h/kzd5qBZRqX1B4hrIIzxKiDuFLE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.80.0/go.mod h1:GvKtC20zbU1ldj6c8EnHcRFVQBJDrY0IwN0KzfsePYs= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.80.0 h1:y9Nk8rE3hRNB+iWdrfkA0ssTw1Jn3QlmIaWnj8yD6aM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.80.0/go.mod h1:pJHh21NYSJNpnkzaDSy0xCZ/Jg4ETd24l54/XHVkr3s= github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.80.0 h1:oJTxSiEJggI5YcmK+SsPQWgml0EMGEzK8K7RWwPC39Q= github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.80.0/go.mod h1:GezufcOBscYo2wdN7Thfw/ejsAWFAPHYYbpAqzNZIdQ= github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.80.0 h1:RHoVQ2KTns+AkyTXohGfkDX2VxlPZY98vnmnoScXyBU= @@ -2299,6 +2333,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0. github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.80.0 h1:ksiHIklzr+QFAiWtrmuAgS8moquOq4TRD2xaSumzgIE= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.80.0/go.mod h1:pO2qe935prkz12penMY1LspQ1iNBU13ayqaU+SpgFXs= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.80.0 h1:RLKHj2MCFU1+CRDzfTAlZJdfcdjcyA7pd3KETQLLuiM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.80.0/go.mod h1:QBGnd7LIee8QouZwKYlcOHg/+bPoRWWOarYGkGdWZdA= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.80.0 h1:wyWGJB/bgcCHDuhAW2PFgxH+izL0AEYDQihKOG5Zi50= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.80.0/go.mod h1:REypWmuMlISg05C+TYStCpDxjOAnZBq30J793c15mdU= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.80.0 h1:CqYgmPPPFTHMPNymMFM22A6R0GSUXfPzu8kwMHI6AmU= @@ -2330,6 +2365,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.80.0 h1:Tyzg00j8+RmJ57qUKpYgVA0SGXP6C7qxCF66Qo62dcQ= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.80.0/go.mod h1:6SK0LWzcUPtkSHTWo14zBCFs1emZC/N6HsmUVdOB/Qs= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.80.0 h1:lHo0U7rnOm5yBgheEgBD0S6EI9Op4U3UevcKksjs/GE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.80.0/go.mod h1:hEnBjc/qiah5zEObHwD8l6uIghTcE2pdUhVLwu4eVQ0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.80.0 h1:kqdOkMFPsAYrpI/HctXMCZ04XpNtOxzb9SRHetP9ZYs= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.80.0/go.mod h1:VrzwgAF/M4c40IgAFYNXCdaupRgFLzDWaLp+Ru5Pbj0= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= @@ -2412,9 +2448,11 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/percona/exporter_shared v0.7.4-0.20211108113423-8555cdbac68b h1:tPnodYuNto6iPkeBCKJKw2HLeEYCiRmN2cpcMzTs8W4= +github.com/percona/exporter_shared v0.7.4-0.20211108113423-8555cdbac68b/go.mod h1:bweWrCdYX+iAONTNUNIIkXGDjGg8dbFL0VBxuUv0wus= github.com/percona/mongodb_exporter v0.39.1-0.20230706092307-28432707eb65 h1:SOB6SH1o//vt7uOWA47Nvahd0lVOLH1vjrBzEECuB+o= github.com/percona/mongodb_exporter v0.39.1-0.20230706092307-28432707eb65/go.mod h1:VIKFC7G2UtRRESarb2FniLKUIXrBAh/hHiHdAjCcRGs= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= @@ -2593,6 +2631,7 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -2638,6 +2677,7 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shoenig/test v0.6.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= +github.com/shoenig/test v0.6.6/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= @@ -2648,6 +2688,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 h1:GfSdC6wKfTGcgCS7BtzF5694Amne1pGCSTY252WhlEY= +github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8= github.com/sijms/go-ora/v2 v2.7.3 h1:ppqaCq/qfc/xqr9ZCVOm7IHbzSkvArg/Bz9P1RgBwno= github.com/sijms/go-ora/v2 v2.7.3/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/simonpasquier/klog-gokit v0.3.0/go.mod h1:+SUlDQNrhVtGt2FieaqNftzzk8P72zpWlACateWxA9k= @@ -2865,7 +2906,6 @@ github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1 github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xo/dburl v0.13.0 h1:kq+oD1j/m8DnJ/p6G/LQXRosVchs8q5/AszEUKkvYfo= github.com/xo/dburl v0.13.0/go.mod h1:K6rSPgbVqP3ZFT0RHkdg/M3M5KhLeV2MaS/ZqaLd1kA= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -2879,12 +2919,14 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= +github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= +github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -2964,6 +3006,7 @@ go.opentelemetry.io/collector/extension v0.80.0/go.mod h1:r61aYWq9NYZP22+LVqiLOE go.opentelemetry.io/collector/extension/auth v0.80.0 h1:BElM8HXYVho2ZikMS8OpQQjmaMizB3qFGJ+kGZ4cyoI= go.opentelemetry.io/collector/extension/auth v0.80.0/go.mod h1:wDpwb37PxV/aH/kecpPXtJqGSmiOYUyeLuQvRmWciAA= go.opentelemetry.io/collector/extension/zpagesextension v0.80.0 h1:30cJEhbyvnGdFjV+AiOW6l84GCMaU4bb1kdX2VcGzH4= +go.opentelemetry.io/collector/extension/zpagesextension v0.80.0/go.mod h1:rdCO1QK8V0MvU3uxH+kThn5GQUf5jfSUEpV3ijF0JfE= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k= @@ -2989,6 +3032,7 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1: go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= go.opentelemetry.io/contrib/zpages v0.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= +go.opentelemetry.io/contrib/zpages v0.42.0/go.mod h1:qRJBEfB0iwRKrYImq5qfwTolmY8HXvZBRucvhuTVQZw= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= @@ -2997,12 +3041,10 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= -go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/export/metric v0.23.0/go.mod h1:SuMiREmKVRIwFKq73zvGTvwFpxb/ZAYkMfyqMoOtDqs= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= @@ -3085,8 +3127,6 @@ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -3227,8 +3267,6 @@ golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -3439,8 +3477,6 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -3451,8 +3487,6 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -3471,8 +3505,6 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -3921,6 +3953,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/netdb v0.0.0-20150201073656-a416d700ae39/go.mod h1:rbNo0ST5hSazCG4rGfpHrwnwvzP1QX62WbhzD+ghGzs= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md index 1969dc92c7fe..7104cf1d004f 100644 --- a/operations/helm/charts/grafana-agent/CHANGELOG.md +++ b/operations/helm/charts/grafana-agent/CHANGELOG.md @@ -10,6 +10,10 @@ internal API changes are not present. Unreleased ---------- +### Enhancements + +- An image's digest can now be used in place of a tag. (@hainenber) + 0.24.0 (2023-09-08) ------------------- diff --git a/operations/helm/charts/grafana-agent/README.md b/operations/helm/charts/grafana-agent/README.md index 7240c4e332e4..f2982e5f9c1d 100644 --- a/operations/helm/charts/grafana-agent/README.md +++ b/operations/helm/charts/grafana-agent/README.md @@ -62,6 +62,7 @@ use the older mode (called "static mode"), set the `agent.mode` value to | agent.storagePath | string | `"/tmp/agent"` | Path to where Grafana Agent stores data (for example, the Write-Ahead Log). By default, data is lost between reboots. | | configReloader.customArgs | list | `[]` | Override the args passed to the container. | | configReloader.enabled | bool | `true` | Enables automatically reloading when the agent config changes. | +| configReloader.image.digest | string | `""` | SHA256 digest of image to use for config reloading (either in format "sha256:XYZ" or "XYZ"). When set, will override `configReloader.image.tag` | | configReloader.image.registry | string | `"docker.io"` | Config reloader image registry (defaults to docker.io) | | configReloader.image.repository | string | `"jimmidyson/configmap-reload"` | Repository to get config reloader image from. | | configReloader.image.tag | string | `"v0.8.0"` | Tag of image to use for config reloading. | @@ -92,6 +93,7 @@ use the older mode (called "static mode"), set the `agent.mode` value to | global.image.pullSecrets | list | `[]` | Optional set of global image pull secrets. | | global.image.registry | string | `""` | Global image registry to use if it needs to be overriden for some specific use cases (e.g local registries, custom images, ...) | | global.podSecurityContext | object | `{}` | Security context to apply to the Grafana Agent pod. | +| image.digest | string | `nil` | Grafana Agent image's SHA256 digest (either in format "sha256:XYZ" or "XYZ"). When set, will override `image.tag`. | | image.pullPolicy | string | `"IfNotPresent"` | Grafana Agent image pull policy. | | image.pullSecrets | list | `[]` | Optional set of image pull secrets. | | image.registry | string | `"docker.io"` | Grafana Agent image registry (defaults to docker.io) | diff --git a/operations/helm/charts/grafana-agent/templates/_helpers.tpl b/operations/helm/charts/grafana-agent/templates/_helpers.tpl index 0aa65bf0e964..b9336e976d62 100644 --- a/operations/helm/charts/grafana-agent/templates/_helpers.tpl +++ b/operations/helm/charts/grafana-agent/templates/_helpers.tpl @@ -82,13 +82,36 @@ Create the name of the service account to use {{- end }} {{/* -Calculate name of image tag to use. +Calculate name of image ID to use for "grafana-agent". */}} -{{- define "grafana-agent.imageTag" -}} -{{- if .Values.image.tag -}} -{{- .Values.image.tag }} -{{- else -}} -{{- .Chart.AppVersion }} +{{- define "grafana-agent.imageId" -}} +{{- if .Values.image.digest }} +{{- $digest := .Values.image.digest }} +{{- if not (hasPrefix "sha256:" $digest) }} +{{- $digest = printf "sha256:%s" $digest }} +{{- end }} +{{- printf "@%s" $digest }} +{{- else if .Values.image.tag }} +{{- printf ":%s" .Values.image.tag }} +{{- else }} +{{- printf ":%s" .Chart.AppVersion }} +{{- end }} +{{- end }} + +{{/* +Calculate name of image ID to use for "config-reloader". +*/}} +{{- define "config-reloader.imageId" -}} +{{- if .Values.configReloader.image.digest }} +{{- $digest := .Values.configReloader.digest }} +{{- if not (hasPrefix "sha256:" $digest) }} +{{- $digest = printf "sha256:%s" $digest }} +{{- end }} +{{- printf "@%s" $digest }} +{{- else if .Values.configReloader.image.tag }} +{{- printf ":%s" .Values.configReloader.image.tag }} +{{- else }} +{{- printf ":%s" "v0.8.0" }} {{- end }} {{- end }} diff --git a/operations/helm/charts/grafana-agent/templates/containers/_agent.yaml b/operations/helm/charts/grafana-agent/templates/containers/_agent.yaml index 7563e11b96a7..2de13343258c 100644 --- a/operations/helm/charts/grafana-agent/templates/containers/_agent.yaml +++ b/operations/helm/charts/grafana-agent/templates/containers/_agent.yaml @@ -1,6 +1,6 @@ {{- define "grafana-agent.container" -}} - name: grafana-agent - image: {{ .Values.global.image.registry | default .Values.image.registry }}/{{ .Values.image.repository }}:{{ include "grafana-agent.imageTag" . }} + image: {{ .Values.global.image.registry | default .Values.image.registry }}/{{ .Values.image.repository }}{{ include "grafana-agent.imageId" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: {{- if eq .Values.agent.mode "flow"}} diff --git a/operations/helm/charts/grafana-agent/templates/containers/_watch.yaml b/operations/helm/charts/grafana-agent/templates/containers/_watch.yaml index 410e56eeeafe..250e4b4f0da7 100644 --- a/operations/helm/charts/grafana-agent/templates/containers/_watch.yaml +++ b/operations/helm/charts/grafana-agent/templates/containers/_watch.yaml @@ -1,7 +1,7 @@ {{- define "grafana-agent.watch-container" -}} {{- if .Values.configReloader.enabled -}} - name: config-reloader - image: {{ .Values.global.image.registry | default .Values.configReloader.image.registry }}/{{ .Values.configReloader.image.repository }}:{{ .Values.configReloader.image.tag }} + image: {{ .Values.global.image.registry | default .Values.configReloader.image.registry }}/{{ .Values.configReloader.image.repository }}{{ include "config-reloader.imageId" . }} {{- if .Values.configReloader.customArgs }} args: {{- toYaml .Values.configReloader.customArgs | nindent 4 }} diff --git a/operations/helm/charts/grafana-agent/values.yaml b/operations/helm/charts/grafana-agent/values.yaml index b51efbeafdfb..da4a1b737073 100644 --- a/operations/helm/charts/grafana-agent/values.yaml +++ b/operations/helm/charts/grafana-agent/values.yaml @@ -99,6 +99,8 @@ image: # -- (string) Grafana Agent image tag. When empty, the Chart's appVersion is # used. tag: null + # -- Grafana Agent image's SHA256 digest (either in format "sha256:XYZ" or "XYZ"). When set, will override `image.tag`. + digest: null # -- Grafana Agent image pull policy. pullPolicy: IfNotPresent # -- Optional set of image pull secrets. @@ -128,6 +130,8 @@ configReloader: repository: jimmidyson/configmap-reload # -- Tag of image to use for config reloading. tag: v0.8.0 + # -- SHA256 digest of image to use for config reloading (either in format "sha256:XYZ" or "XYZ"). When set, will override `configReloader.image.tag` + digest: "" # -- Override the args passed to the container. customArgs: [] # -- Resource requests and limits to apply to the config reloader container. diff --git a/pkg/flow/logging/handler.go b/pkg/flow/logging/handler.go index 718130534a36..aacfdb37e02f 100644 --- a/pkg/flow/logging/handler.go +++ b/pkg/flow/logging/handler.go @@ -58,7 +58,7 @@ func (h *handler) buildHandler() slog.Handler { // Fast path: if our cached handler is still valid, immediately return it. h.mut.RLock() if h.currentFormat == expectFormat && h.inner != nil { - h.mut.RUnlock() + defer h.mut.RUnlock() return h.inner } h.mut.RUnlock() diff --git a/pkg/server/tls.go b/pkg/server/tls.go index 3e784b01586e..59fff20c87e8 100644 --- a/pkg/server/tls.go +++ b/pkg/server/tls.go @@ -265,7 +265,7 @@ func (l *tlsListener) applyNormalTLS(c TLSConfig) error { newConfig.ClientCAs = clientCAPool } - clientAuth, err := getClientAuthFromString(c.ClientAuth) + clientAuth, err := GetClientAuthFromString(c.ClientAuth) if err != nil { return err } @@ -290,7 +290,7 @@ func (l *tlsListener) getCertificate(*tls.ClientHelloInfo) (*tls.Certificate, er return &cert, nil } -func getClientAuthFromString(clientAuth string) (tls.ClientAuthType, error) { +func GetClientAuthFromString(clientAuth string) (tls.ClientAuthType, error) { switch clientAuth { case "RequestClientCert": return tls.RequestClientCert, nil diff --git a/pkg/server/tls_certstore_windows.go b/pkg/server/tls_certstore_windows.go index a16fe0b1b522..60a28e689a3e 100644 --- a/pkg/server/tls_certstore_windows.go +++ b/pkg/server/tls_certstore_windows.go @@ -7,15 +7,18 @@ import ( "crypto/x509" "encoding/asn1" "fmt" - "github.com/github/smimesign/certstore" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "regexp" "sort" "sync" "time" + + "github.com/github/smimesign/certstore" + "github.com/go-kit/log" + "github.com/go-kit/log/level" ) +// Documentation on how to setup a certificate store can be found at docs/developer/windows + // winCertStoreHandler handles the finding of certificates, validating them and injecting into the default TLS pipeline type winCertStoreHandler struct { cfg WindowsCertificateFilter @@ -97,7 +100,7 @@ func (l *tlsListener) applyWindowsCertificateStore(c TLSConfig) error { MaxVersion: tls.VersionTLS12, } - ca, err := getClientAuthFromString(c.ClientAuth) + ca, err := GetClientAuthFromString(c.ClientAuth) if err != nil { return err } diff --git a/pkg/traces/promsdprocessor/consumer/consumer.go b/pkg/traces/promsdprocessor/consumer/consumer.go index 7db93a0ec826..79df98fe7aa1 100644 --- a/pkg/traces/promsdprocessor/consumer/consumer.go +++ b/pkg/traces/promsdprocessor/consumer/consumer.go @@ -247,10 +247,12 @@ func GetHostFromLabels(labels discovery.Target) (string, error) { return host, nil } -func CleanupLabels(labels discovery.Target) { - for k := range labels { - if strings.HasPrefix(k, "__") { - delete(labels, k) +func NewTargetsWithNonInternalLabels(labels discovery.Target) discovery.Target { + res := make(discovery.Target) + for k, v := range labels { + if !strings.HasPrefix(k, "__") { + res[k] = v } } + return res } diff --git a/pkg/traces/promsdprocessor/prom_sd_processor.go b/pkg/traces/promsdprocessor/prom_sd_processor.go index 70251f9515ba..8f7b208f18db 100644 --- a/pkg/traces/promsdprocessor/prom_sd_processor.go +++ b/pkg/traces/promsdprocessor/prom_sd_processor.go @@ -172,9 +172,7 @@ func (p *promServiceDiscoProcessor) syncTargets(jobName string, group *targetgro continue } - promsdconsumer.CleanupLabels(labels) - level.Debug(p.logger).Log("msg", "adding host to hostLabels", "host", host) - hostLabels[host] = labels + hostLabels[host] = promsdconsumer.NewTargetsWithNonInternalLabels(labels) } } diff --git a/tools/gen-crd-docs/template/pkg.tpl b/tools/gen-crd-docs/template/pkg.tpl index 37ccfbda86b2..d2341f80e1d5 100644 --- a/tools/gen-crd-docs/template/pkg.tpl +++ b/tools/gen-crd-docs/template/pkg.tpl @@ -4,6 +4,9 @@ --- aliases: - /docs/agent/latest/operator/crd/ +- /docs/grafana-cloud/agent/operator/api/ +- /docs/grafana-cloud/monitor-infrastructure/agent/operator/api/ +- /docs/grafana-cloud/monitor-infrastructure/integrations/agent/operator/api/ canonical: https://grafana.com/docs/agent/latest/operator/api/ title: Custom Resource Definition Reference weight: 500