From 357ae19bfc9f4f8e578875af648b9f6a34e1fe09 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Wed, 27 Mar 2024 12:17:29 -0400 Subject: [PATCH] internal: rename all River references to Alloy This also includes renaming file extensions from `.river` to `.alloy`. --- Dockerfile | 4 +- Dockerfile.windows | 4 +- example-config.river => example-config.alloy | 0 internal/alloy/alloy.go | 6 +- internal/alloy/import_git_test.go | 4 +- internal/alloy/import_test.go | 107 ++++++++++-------- .../alloy/internal/controller/block_node.go | 8 +- .../internal/controller/component_node.go | 2 +- .../controller/component_references.go | 2 +- internal/alloy/internal/controller/loader.go | 10 +- internal/alloy/internal/controller/module.go | 2 +- .../controller/node_builtin_component.go | 16 +-- .../controller/node_config_argument.go | 10 +- .../internal/controller/node_config_export.go | 10 +- .../internal/controller/node_config_import.go | 6 +- .../controller/node_config_logging.go | 10 +- .../controller/node_config_tracing.go | 10 +- .../controller/node_custom_component.go | 14 +-- .../alloy/internal/controller/node_declare.go | 4 +- .../alloy/internal/controller/node_service.go | 4 +- .../alloy/internal/controller/value_cache.go | 4 +- .../internal/controller/value_cache_test.go | 4 +- .../internal/importsource/import_file.go | 6 +- .../alloy/internal/importsource/import_git.go | 4 +- .../internal/importsource/import_http.go | 2 +- .../internal/importsource/import_source.go | 2 +- .../testcomponents/module/file/file.go | 2 +- .../internal/testcomponents/module/git/git.go | 2 +- .../testcomponents/module/http/http.go | 2 +- internal/alloy/module.go | 4 +- internal/alloy/source.go | 6 +- internal/alloy/testdata/.gitignore | 1 + .../import_error/import_error_1.txtar | 14 +-- .../import_error/import_error_2.txtar | 8 +- .../import_error/import_error_3.txtar | 8 +- .../import_error/import_error_4.txtar | 4 +- .../testdata/import_file/import_file_1.txtar | 42 +++---- .../testdata/import_file/import_file_10.txtar | 70 ++++++------ .../testdata/import_file/import_file_11.txtar | 60 +++++----- .../testdata/import_file/import_file_12.txtar | 100 ++++++++-------- .../testdata/import_file/import_file_13.txtar | 76 ++++++------- .../testdata/import_file/import_file_14.txtar | 28 ++--- .../testdata/import_file/import_file_15.txtar | 76 ++++++------- .../testdata/import_file/import_file_16.txtar | 34 +++--- .../testdata/import_file/import_file_2.txtar | 66 +++++------ .../testdata/import_file/import_file_3.txtar | 60 +++++----- .../testdata/import_file/import_file_4.txtar | 60 +++++----- .../testdata/import_file/import_file_5.txtar | 60 +++++----- .../testdata/import_file/import_file_6.txtar | 78 ++++++------- .../testdata/import_file/import_file_7.txtar | 74 ++++++------ .../testdata/import_file/import_file_8.txtar | 60 +++++----- .../testdata/import_file/import_file_9.txtar | 102 ++++++++--------- .../import_file_folder_1.txtar | 58 +++++----- .../import_file_folder_2.txtar | 60 +++++----- .../import_file_folder_3.txtar | 60 +++++----- .../import_file_folder_4.txtar | 42 +++---- .../import_file_folder_5.txtar | 46 ++++---- .../testdata/import_git/import_git_1.txtar | 15 +-- .../testdata/import_git/import_git_2.txtar | 15 +-- .../testdata/import_http/import_http_1.txtar | 14 +-- .../import_string/import_string_1.txtar | 36 +++--- internal/alloy/testdata/repo.git.tar | Bin 0 -> 61440 bytes internal/alloy/tracing/tracing.go | 4 +- internal/alloycli/cmd_convert.go | 4 +- internal/alloycli/cmd_run.go | 6 +- .../internal/syntaxtags/syntaxtags.go | 2 +- internal/cmd/integration-tests/README.md | 2 +- .../{config.river => config.alloy} | 0 .../{config.river => config.alloy} | 0 .../redis/{config.river => config.alloy} | 0 .../{config.river => config.alloy} | 0 .../tests/unix/{config.river => config.alloy} | 0 internal/cmd/integration-tests/utils.go | 2 +- internal/component/common/config/types.go | 4 +- .../component/common/config/types_test.go | 40 +++---- .../component/common/kubernetes/kubernetes.go | 4 +- .../common/kubernetes/kubernetes_test.go | 10 +- internal/component/common/net/config.go | 6 +- internal/component/common/net/config_test.go | 4 +- internal/component/common/net/server.go | 2 +- internal/component/common/relabel/relabel.go | 10 +- internal/component/component.go | 28 ++--- internal/component/component_health.go | 4 +- internal/component/discovery/aws/ec2.go | 4 +- internal/component/discovery/aws/ec2_test.go | 4 +- internal/component/discovery/aws/lightsail.go | 4 +- internal/component/discovery/azure/azure.go | 4 +- .../component/discovery/azure/azure_test.go | 20 ++-- internal/component/discovery/consul/consul.go | 4 +- .../component/discovery/consul/consul_test.go | 12 +- .../discovery/consulagent/consulagent.go | 4 +- .../discovery/consulagent/consulagent_test.go | 16 +-- .../discovery/digitalocean/digitalocean.go | 4 +- .../digitalocean/digitalocean_test.go | 12 +- internal/component/discovery/dns/dns.go | 4 +- internal/component/discovery/dns/dns_test.go | 8 +- internal/component/discovery/docker/docker.go | 4 +- .../component/discovery/docker/docker_test.go | 12 +- .../discovery/dockerswarm/dockerswarm.go | 4 +- .../discovery/dockerswarm/dockerswarm_test.go | 30 ++--- internal/component/discovery/eureka/eureka.go | 4 +- internal/component/discovery/file/file.go | 2 +- internal/component/discovery/gce/gce.go | 2 +- internal/component/discovery/gce/gce_test.go | 12 +- .../component/discovery/hetzner/hetzner.go | 4 +- .../discovery/hetzner/hetzner_test.go | 6 +- internal/component/discovery/http/http.go | 2 +- .../component/discovery/http/http_test.go | 6 +- internal/component/discovery/ionos/ionos.go | 4 +- .../component/discovery/ionos/ionos_test.go | 18 +-- .../component/discovery/kubelet/kubelet.go | 4 +- .../discovery/kubelet/kubelet_test.go | 12 +- .../discovery/kubernetes/kubernetes.go | 4 +- .../discovery/kubernetes/kubernetes_test.go | 16 +-- internal/component/discovery/kuma/kuma.go | 4 +- .../component/discovery/kuma/kuma_test.go | 24 ++-- internal/component/discovery/linode/linode.go | 4 +- .../component/discovery/linode/linode_test.go | 14 +-- .../component/discovery/marathon/marathon.go | 4 +- .../discovery/marathon/marathon_test.go | 50 ++++---- internal/component/discovery/nerve/nerve.go | 4 +- .../component/discovery/nerve/nerve_test.go | 14 +-- internal/component/discovery/nomad/nomad.go | 4 +- .../component/discovery/nomad/nomad_test.go | 14 +-- .../discovery/openstack/openstack.go | 4 +- .../component/discovery/ovhcloud/ovhcloud.go | 4 +- .../component/discovery/puppetdb/puppetdb.go | 4 +- .../discovery/puppetdb/puppetdb_test.go | 20 ++-- .../discovery/relabel/relabel_test.go | 4 +- .../component/discovery/scaleway/scaleway.go | 4 +- .../discovery/serverset/serverset.go | 4 +- internal/component/discovery/triton/triton.go | 4 +- .../component/discovery/triton/triton_test.go | 12 +- internal/component/discovery/uyuni/uyuni.go | 4 +- internal/component/local/file/file.go | 2 +- internal/component/local/file_match/file.go | 2 +- internal/component/loki/echo/echo.go | 2 +- .../component/loki/process/metric/counters.go | 4 +- .../component/loki/process/metric/gauges.go | 4 +- .../loki/process/metric/histograms.go | 4 +- .../component/loki/process/process_test.go | 8 +- .../loki/process/stages/drop_test.go | 4 +- .../loki/process/stages/json_test.go | 12 +- .../loki/process/stages/limit_test.go | 12 +- .../loki/process/stages/logfmt_test.go | 8 +- .../loki/process/stages/match_test.go | 4 +- .../component/loki/process/stages/metric.go | 2 +- .../loki/process/stages/metric_test.go | 10 +- .../loki/process/stages/multiline.go | 4 +- .../loki/process/stages/output_test.go | 6 +- .../component/loki/process/stages/pack.go | 2 +- .../loki/process/stages/pack_test.go | 6 +- .../loki/process/stages/pipeline_test.go | 24 ++-- .../loki/process/stages/regex_test.go | 12 +- .../loki/process/stages/replace_test.go | 24 ++-- .../loki/process/stages/sampling_test.go | 4 +- .../loki/process/stages/tenant_test.go | 4 +- .../loki/process/stages/timestamp_test.go | 6 +- internal/component/loki/relabel/relabel.go | 2 +- .../component/loki/relabel/relabel_test.go | 2 +- .../loki/rules/kubernetes/rules_test.go | 12 +- .../component/loki/rules/kubernetes/types.go | 4 +- internal/component/loki/source/api/api.go | 2 +- .../loki/source/aws_firehose/component.go | 2 +- .../azure_event_hubs/azure_event_hubs.go | 6 +- .../azure_event_hubs/azure_event_hubs_test.go | 18 +-- .../loki/source/cloudflare/cloudflare.go | 4 +- .../component/loki/source/docker/docker.go | 4 +- internal/component/loki/source/file/file.go | 2 +- .../component/loki/source/gcplog/gcplog.go | 4 +- .../loki/source/gcplog/gcptypes/gcptypes.go | 4 +- .../internal/gcplogtarget/pull_target.go | 2 +- internal/component/loki/source/gelf/gelf.go | 2 +- .../component/loki/source/heroku/heroku.go | 4 +- .../component/loki/source/journal/types.go | 2 +- internal/component/loki/source/kafka/kafka.go | 4 +- .../component/loki/source/kafka/kafka_test.go | 24 ++-- .../loki/source/kubernetes/kubernetes.go | 2 +- .../loki/source/kubernetes/kubernetes_test.go | 12 +- .../kubernetes_events/kubernetes_events.go | 4 +- .../component/loki/source/podlogs/podlogs.go | 2 +- .../loki/source/podlogs/podlogs_test.go | 12 +- .../component/loki/source/syslog/types.go | 6 +- .../loki/source/windowsevent/arguments.go | 2 +- internal/component/loki/write/types.go | 6 +- internal/component/loki/write/write_test.go | 12 +- .../mimir/rules/kubernetes/rules_test.go | 12 +- .../component/mimir/rules/kubernetes/types.go | 4 +- internal/component/otelcol/auth/auth.go | 4 +- .../component/otelcol/auth/bearer/bearer.go | 2 +- .../otelcol/auth/bearer/bearer_test.go | 12 +- .../component/otelcol/auth/headers/headers.go | 2 +- .../otelcol/auth/headers/headers_test.go | 2 +- .../component/otelcol/auth/sigv4/sigv4.go | 2 +- .../otelcol/auth/sigv4/sigv4_test.go | 22 ++-- .../component/otelcol/config_debug_metrics.go | 2 +- internal/component/otelcol/config_filter.go | 2 +- internal/component/otelcol/config_queue.go | 2 +- internal/component/otelcol/config_scrape.go | 2 +- internal/component/otelcol/config_tls.go | 2 +- .../connector/host_info/host_info_test.go | 2 +- .../servicegraph/servicegraph_test.go | 2 +- .../connector/spanmetrics/spanmetrics_test.go | 2 +- .../otelcol/exporter/logging/logging.go | 2 +- .../component/otelcol/exporter/otlp/otlp.go | 4 +- .../otelcol/exporter/otlphttp/otlphttp.go | 6 +- .../otelcol/exporter/prometheus/prometheus.go | 4 +- .../exporter/prometheus/prometheus_test.go | 2 +- .../jaeger_remote_sampling.go | 10 +- .../otelcol/processor/batch/batch.go | 4 +- .../otelcol/processor/batch/batch_test.go | 2 +- .../otelcol/processor/filter/filter.go | 4 +- .../otelcol/processor/filter/filter_test.go | 2 +- .../processor/k8sattributes/k8sattributes.go | 4 +- .../processor/memorylimiter/memorylimiter.go | 4 +- .../probabilistic_sampler_test.go | 2 +- .../internal/consul/config.go | 2 +- .../resourcedetection_test.go | 2 +- .../component/otelcol/processor/span/span.go | 4 +- .../otelcol/processor/span/span_test.go | 2 +- .../processor/tail_sampling/tail_sampling.go | 4 +- .../tail_sampling/tail_sampling_test.go | 12 +- .../otelcol/processor/tail_sampling/types.go | 2 +- .../otelcol/processor/transform/transform.go | 4 +- .../processor/transform/transform_test.go | 2 +- .../otelcol/receiver/jaeger/jaeger.go | 12 +- .../otelcol/receiver/jaeger/jaeger_test.go | 2 +- .../component/otelcol/receiver/kafka/kafka.go | 2 +- .../otelcol/receiver/kafka/kafka_test.go | 2 +- .../otelcol/receiver/opencensus/opencensus.go | 2 +- .../receiver/opencensus/opencensus_test.go | 4 +- .../component/otelcol/receiver/otlp/otlp.go | 8 +- .../otelcol/receiver/otlp/otlp_test.go | 12 +- .../otelcol/receiver/vcenter/vcenter.go | 2 +- .../otelcol/receiver/vcenter/vcenter_test.go | 2 +- .../otelcol/receiver/zipkin/zipkin.go | 2 +- .../otelcol/receiver/zipkin/zipkin_test.go | 2 +- .../prometheus/exporter/apache/apache.go | 2 +- .../prometheus/exporter/azure/azure.go | 4 +- .../prometheus/exporter/blackbox/blackbox.go | 6 +- .../exporter/blackbox/blackbox_test.go | 20 ++-- .../prometheus/exporter/cadvisor/cadvisor.go | 2 +- .../exporter/cadvisor/cadvisor_test.go | 6 +- .../prometheus/exporter/cloudwatch/config.go | 6 +- .../prometheus/exporter/consul/consul.go | 2 +- .../prometheus/exporter/dnsmasq/dnsmasq.go | 2 +- .../exporter/dnsmasq/dnsmasq_test.go | 8 +- .../exporter/elasticsearch/elasticsearch.go | 4 +- .../elasticsearch/elasticsearch_test.go | 10 +- .../component/prometheus/exporter/gcp/gcp.go | 4 +- .../prometheus/exporter/gcp/gcp_test.go | 12 +- .../prometheus/exporter/github/github.go | 4 +- .../prometheus/exporter/github/github_test.go | 6 +- .../prometheus/exporter/kafka/kafka.go | 4 +- .../prometheus/exporter/kafka/kafka_test.go | 20 ++-- .../exporter/memcached/memcached.go | 4 +- .../exporter/memcached/memcached_test.go | 28 ++--- .../exporter/mongodb/mongodb_test.go | 10 +- .../prometheus/exporter/mssql/mssql.go | 4 +- .../prometheus/exporter/mssql/mssql_test.go | 30 ++--- .../prometheus/exporter/mysql/mysql.go | 4 +- .../prometheus/exporter/mysql/mysql_test.go | 12 +- .../prometheus/exporter/oracledb/oracledb.go | 4 +- .../exporter/oracledb/oracledb_test.go | 10 +- .../prometheus/exporter/postgres/postgres.go | 2 +- .../exporter/postgres/postgres_test.go | 15 ++- .../prometheus/exporter/process/process.go | 4 +- .../exporter/process/process_test.go | 12 +- .../prometheus/exporter/redis/redis.go | 6 +- .../prometheus/exporter/redis/redis_test.go | 16 +-- .../prometheus/exporter/self/self.go | 2 +- .../prometheus/exporter/snmp/snmp.go | 4 +- .../prometheus/exporter/snmp/snmp_test.go | 14 +-- .../exporter/snowflake/snowflake.go | 2 +- .../exporter/snowflake/snowflake_test.go | 10 +- .../prometheus/exporter/squid/squid.go | 4 +- .../prometheus/exporter/squid/squid_test.go | 10 +- .../prometheus/exporter/statsd/config.go | 2 +- .../prometheus/exporter/statsd/statsd_test.go | 8 +- .../prometheus/exporter/unix/config.go | 2 +- .../windows/config_default_windows_test.go | 2 +- .../exporter/windows/config_windows.go | 2 +- .../exporter/windows/windows_test.go | 8 +- .../component/prometheus/operator/types.go | 4 +- .../prometheus/operator/types_test.go | 6 +- .../prometheus/receive_http/receive_http.go | 2 +- .../component/prometheus/relabel/relabel.go | 4 +- .../component/prometheus/remotewrite/types.go | 16 +-- .../prometheus/remotewrite/types_test.go | 2 +- .../component/prometheus/scrape/scrape.go | 4 +- .../prometheus/scrape/scrape_test.go | 16 +-- .../component/pyroscope/ebpf/ebpf_linux.go | 2 +- internal/component/pyroscope/java/args.go | 2 +- internal/component/pyroscope/scrape/scrape.go | 6 +- internal/component/pyroscope/write/write.go | 6 +- .../component/pyroscope/write/write_test.go | 6 +- internal/component/registry.go | 4 +- internal/component/remote/http/http.go | 4 +- .../component/remote/kubernetes/kubernetes.go | 4 +- .../remote/kubernetes/kubernetes_test.go | 6 +- internal/component/remote/s3/types.go | 4 +- internal/component/remote/vault/auth.go | 18 +-- internal/component/remote/vault/vault.go | 4 +- .../common/{river_utils.go => alloy_utils.go} | 2 +- ...iver_utils_test.go => alloy_utils_test.go} | 0 .../internal/common/convert_appendable.go | 4 +- .../internal/common/convert_logs_receiver.go | 4 +- .../internal/common/convert_targets.go | 8 +- .../internal/common/custom_tokenizer.go | 2 +- .../otelcolconvert/converter_helpers.go | 4 +- .../{attributes.river => attributes.alloy} | 0 .../{basicauth.river => basicauth.alloy} | 0 .../testdata/{batch.river => batch.alloy} | 0 .../{bearertoken.river => bearertoken.alloy} | 0 .../testdata/{filter.river => filter.alloy} | 0 ...eaderssetter.river => headerssetter.alloy} | 0 ...sor.river => inconsistent_processor.alloy} | 0 .../testdata/{jaeger.river => jaeger.alloy} | 0 ...pling.river => jaegerremotesampling.alloy} | 0 ...8sattributes.river => k8sattributes.alloy} | 0 .../testdata/{kafka.river => kafka.alloy} | 0 ...oadbalancing.river => loadbalancing.alloy} | 0 .../testdata/{logging.river => logging.alloy} | 0 ...emorylimiter.river => memorylimiter.alloy} | 0 .../testdata/{oauth2.river => oauth2.alloy} | 0 .../{opencensus.river => opencensus.alloy} | 0 .../testdata/{otlp.river => otlp.alloy} | 0 .../{otlphttp.river => otlphttp.alloy} | 0 ...pler.river => probabilistic_sampler.alloy} | 0 .../testdata/{span.river => span.alloy} | 0 .../{span_full.river => span_full.alloy} | 0 .../{spanmetrics.river => spanmetrics.alloy} | 0 ...rics_full.river => spanmetrics_full.alloy} | 0 ...ail_sampling.river => tail_sampling.alloy} | 0 .../{transform.river => transform.alloy} | 0 .../testdata/{zipkin.river => zipkin.alloy} | 0 .../build/prometheus_blocks.go | 4 +- .../component/dockerswarm.go | 6 +- .../component/remote_write.go | 4 +- .../testdata/{azure.river => azure.alloy} | 0 .../testdata/{consul.river => consul.alloy} | 0 ...{digitalocean.river => digitalocean.alloy} | 0 .../{discovery.river => discovery.alloy} | 0 ..._relabel.river => discovery_relabel.alloy} | 0 .../testdata/{dns.river => dns.alloy} | 0 .../testdata/{docker.river => docker.alloy} | 0 .../{dockerswarm.river => dockerswarm.alloy} | 0 .../testdata/{ec2.river => ec2.alloy} | 0 .../testdata/{empty.river => empty.alloy} | 0 .../testdata/{file.river => file.alloy} | 0 .../testdata/{gce.river => gce.alloy} | 0 .../testdata/{http.river => http.alloy} | 0 .../testdata/{ionos.river => ionos.alloy} | 0 .../{kubernetes.river => kubernetes.alloy} | 0 .../testdata/{kuma.river => kuma.alloy} | 0 .../{lightsail.river => lightsail.alloy} | 0 .../testdata/{linode.river => linode.alloy} | 0 .../{marathon.river => marathon.alloy} | 0 ...ric_relabel.river => metric_relabel.alloy} | 0 .../testdata/{nerve.river => nerve.alloy} | 0 .../{openstack.river => openstack.alloy} | 0 .../{ovhcloud.river => ovhcloud.alloy} | 0 .../{scaleway.river => scaleway.alloy} | 0 .../testdata/{scrape.river => scrape.alloy} | 0 .../{serverset.river => serverset.alloy} | 0 .../testdata/{triton.river => triton.alloy} | 0 .../{unsupported.river => unsupported.alloy} | 0 .../internal/build/scrape_builder.go | 2 +- .../internal/build/service_discovery.go | 4 +- .../promtailconvert/internal/build/stages.go | 2 +- .../testdata/{azure.river => azure.alloy} | 0 ...vent_hubs.river => azure_event_hubs.alloy} | 0 ...relabel.river => cloudflare_relabel.alloy} | 0 .../testdata/{consul.river => consul.alloy} | 0 .../{consulagent.river => consulagent.alloy} | 0 ...{digitalocean.river => digitalocean.alloy} | 0 .../testdata/{docker.river => docker.alloy} | 0 ...ker_relabel.river => docker_relabel.alloy} | 0 .../{dockerswarm.river => dockerswarm.alloy} | 0 .../testdata/{ec2.river => ec2.alloy} | 0 .../testdata/{file.river => file.alloy} | 0 .../testdata/{gce.river => gce.alloy} | 0 .../testdata/{gcplog.river => gcplog.alloy} | 0 .../testdata/{gelf.river => gelf.alloy} | 0 .../testdata/{heroku.river => heroku.alloy} | 0 .../testdata/{journal.river => journal.alloy} | 0 ...al_relabel.river => journal_relabel.alloy} | 0 .../testdata/{kafka.river => kafka.alloy} | 0 .../{kubernetes.river => kubernetes.alloy} | 0 .../{loki_write.river => loki_write.alloy} | 0 .../{marathon.river => marathon.alloy} | 0 ...ed_pipeline.river => mixed_pipeline.alloy} | 0 .../testdata/{nerve.river => nerve.alloy} | 0 .../{openstack.river => openstack.alloy} | 0 ....river => pipeline_stages_cri_empty.alloy} | 0 ..._drop.river => pipeline_stages_drop.alloy} | 0 ...ver => pipeline_stages_match_nested.alloy} | 0 ...art1.river => pipeline_stages_part1.alloy} | 0 ...art2.river => pipeline_stages_part2.alloy} | 0 ...pipeline_stages_structured_metadata.alloy} | 0 .../{push_api.river => push_api.alloy} | 0 ...th.river => remote_write_basic_auth.alloy} | 0 ...2.river => remote_write_basic_auth2.alloy} | 0 ...e.river => remote_write_bearer_file.alloy} | 0 ....river => remote_write_bearer_token.alloy} | 0 ...e_oauth.river => remote_write_oauth.alloy} | 0 ...oauth2.river => remote_write_oauth2.alloy} | 0 ...xample.river => sd_pipeline_example.alloy} | 0 .../{serverset.river => serverset.alloy} | 0 ...le.river => source_pipeline_example.alloy} | 0 ...le.river => static_pipeline_example.alloy} | 0 .../testdata/{syslog.river => syslog.alloy} | 0 .../testdata/{triton.river => triton.alloy} | 0 ...indowsevents.river => windowsevents.alloy} | 0 ...abel.river => windowsevents_relabel.alloy} | 0 ...rations_v2.river => integrations_v2.alloy} | 0 .../{unsupported.river => unsupported.alloy} | 0 ...rations_v2.river => integrations_v2.alloy} | 0 ...{integrations.river => integrations.alloy} | 0 ...te_write.river => prom_remote_write.alloy} | 0 .../{prom_scrape.river => prom_scrape.alloy} | 0 ...romtail_prom.river => promtail_prom.alloy} | 0 ...ail_scrape.river => promtail_scrape.alloy} | 0 .../{sanitize.river => sanitize.alloy} | 0 .../testdata/{traces.river => traces.alloy} | 0 ...{traces_multi.river => traces_multi.alloy} | 0 .../{unsupported.river => unsupported.alloy} | 0 ...{integrations.river => integrations.alloy} | 0 .../converter/internal/test_common/testing.go | 44 +++---- internal/service/service.go | 4 +- .../alloy_linux_packages_test.go | 6 +- internal/util/untar.go | 57 ++++++++++ .../RiverValue.module.css | 0 .../RiverValue.tsx | 18 +-- .../stringify.ts | 20 ++-- .../{river-js => alloy-syntax-js}/types.ts | 20 ++-- .../src/features/component/ComponentBody.tsx | 4 +- .../web/ui/src/features/component/types.ts | 8 +- internal/web/ui/src/utils/partition.ts | 2 +- .../internal/utils.jsonnet | 4 +- operations/helm/charts/alloy/README.md | 4 +- operations/helm/charts/alloy/README.md.gotmpl | 4 +- .../alloy/ci/existing-config-values.yaml | 2 +- .../config/{example.river => example.alloy} | 0 .../helm/charts/alloy/templates/_config.tpl | 2 +- .../charts/alloy/templates/configmap.yaml | 4 +- operations/helm/lintconf.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../clustering/alloy/templates/configmap.yaml | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/deployment.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/deployment.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/statefulset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../envFrom/alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../extra-env/alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../sidecars/alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/deployment.yaml | 2 +- .../alloy/templates/configmap.yaml | 2 +- .../templates/controllers/daemonset.yaml | 2 +- packaging/{alloy.river => alloy.alloy} | 0 packaging/deb/control/postinst | 4 +- packaging/environment-file | 2 +- packaging/rpm/control/postinst | 4 +- .../windows/{config.river => config.alloy} | 0 packaging/windows/install_script.nsis | 18 +-- tools/make/packaging.mk | 4 +- 509 files changed, 1877 insertions(+), 1811 deletions(-) rename example-config.river => example-config.alloy (100%) create mode 100644 internal/alloy/testdata/.gitignore create mode 100644 internal/alloy/testdata/repo.git.tar rename internal/cmd/integration-tests/tests/otlp-metrics/{config.river => config.alloy} (100%) rename internal/cmd/integration-tests/tests/read-log-file/{config.river => config.alloy} (100%) rename internal/cmd/integration-tests/tests/redis/{config.river => config.alloy} (100%) rename internal/cmd/integration-tests/tests/scrape-prom-metrics/{config.river => config.alloy} (100%) rename internal/cmd/integration-tests/tests/unix/{config.river => config.alloy} (100%) rename internal/converter/internal/common/{river_utils.go => alloy_utils.go} (98%) rename internal/converter/internal/common/{river_utils_test.go => alloy_utils_test.go} (100%) rename internal/converter/internal/otelcolconvert/testdata/{attributes.river => attributes.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{basicauth.river => basicauth.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{batch.river => batch.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{bearertoken.river => bearertoken.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{filter.river => filter.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{headerssetter.river => headerssetter.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{inconsistent_processor.river => inconsistent_processor.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{jaeger.river => jaeger.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{jaegerremotesampling.river => jaegerremotesampling.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{k8sattributes.river => k8sattributes.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{kafka.river => kafka.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{loadbalancing.river => loadbalancing.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{logging.river => logging.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{memorylimiter.river => memorylimiter.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{oauth2.river => oauth2.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{opencensus.river => opencensus.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{otlp.river => otlp.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{otlphttp.river => otlphttp.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{probabilistic_sampler.river => probabilistic_sampler.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{span.river => span.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{span_full.river => span_full.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{spanmetrics.river => spanmetrics.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{spanmetrics_full.river => spanmetrics_full.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{tail_sampling.river => tail_sampling.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{transform.river => transform.alloy} (100%) rename internal/converter/internal/otelcolconvert/testdata/{zipkin.river => zipkin.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{azure.river => azure.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{consul.river => consul.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{digitalocean.river => digitalocean.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{discovery.river => discovery.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{discovery_relabel.river => discovery_relabel.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{dns.river => dns.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{docker.river => docker.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{dockerswarm.river => dockerswarm.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{ec2.river => ec2.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{empty.river => empty.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{file.river => file.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{gce.river => gce.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{http.river => http.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{ionos.river => ionos.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{kubernetes.river => kubernetes.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{kuma.river => kuma.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{lightsail.river => lightsail.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{linode.river => linode.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{marathon.river => marathon.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{metric_relabel.river => metric_relabel.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{nerve.river => nerve.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{openstack.river => openstack.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{ovhcloud.river => ovhcloud.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{scaleway.river => scaleway.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{scrape.river => scrape.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{serverset.river => serverset.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{triton.river => triton.alloy} (100%) rename internal/converter/internal/prometheusconvert/testdata/{unsupported.river => unsupported.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{azure.river => azure.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{azure_event_hubs.river => azure_event_hubs.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{cloudflare_relabel.river => cloudflare_relabel.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{consul.river => consul.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{consulagent.river => consulagent.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{digitalocean.river => digitalocean.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{docker.river => docker.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{docker_relabel.river => docker_relabel.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{dockerswarm.river => dockerswarm.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{ec2.river => ec2.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{file.river => file.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{gce.river => gce.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{gcplog.river => gcplog.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{gelf.river => gelf.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{heroku.river => heroku.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{journal.river => journal.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{journal_relabel.river => journal_relabel.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{kafka.river => kafka.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{kubernetes.river => kubernetes.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{loki_write.river => loki_write.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{marathon.river => marathon.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{mixed_pipeline.river => mixed_pipeline.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{nerve.river => nerve.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{openstack.river => openstack.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_cri_empty.river => pipeline_stages_cri_empty.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_drop.river => pipeline_stages_drop.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_match_nested.river => pipeline_stages_match_nested.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_part1.river => pipeline_stages_part1.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_part2.river => pipeline_stages_part2.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{pipeline_stages_structured_metadata.river => pipeline_stages_structured_metadata.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{push_api.river => push_api.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_basic_auth.river => remote_write_basic_auth.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_basic_auth2.river => remote_write_basic_auth2.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_bearer_file.river => remote_write_bearer_file.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_bearer_token.river => remote_write_bearer_token.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_oauth.river => remote_write_oauth.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{remote_write_oauth2.river => remote_write_oauth2.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{sd_pipeline_example.river => sd_pipeline_example.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{serverset.river => serverset.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{source_pipeline_example.river => source_pipeline_example.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{static_pipeline_example.river => static_pipeline_example.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{syslog.river => syslog.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{triton.river => triton.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{windowsevents.river => windowsevents.alloy} (100%) rename internal/converter/internal/promtailconvert/testdata/{windowsevents_relabel.river => windowsevents_relabel.alloy} (100%) rename internal/converter/internal/staticconvert/testdata-v2/{integrations_v2.river => integrations_v2.alloy} (100%) rename internal/converter/internal/staticconvert/testdata-v2/{unsupported.river => unsupported.alloy} (100%) rename internal/converter/internal/staticconvert/testdata-v2_windows/{integrations_v2.river => integrations_v2.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{integrations.river => integrations.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{prom_remote_write.river => prom_remote_write.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{prom_scrape.river => prom_scrape.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{promtail_prom.river => promtail_prom.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{promtail_scrape.river => promtail_scrape.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{sanitize.river => sanitize.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{traces.river => traces.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{traces_multi.river => traces_multi.alloy} (100%) rename internal/converter/internal/staticconvert/testdata/{unsupported.river => unsupported.alloy} (100%) rename internal/converter/internal/staticconvert/testdata_windows/{integrations.river => integrations.alloy} (100%) create mode 100644 internal/util/untar.go rename internal/web/ui/src/features/{river-js => alloy-syntax-js}/RiverValue.module.css (100%) rename internal/web/ui/src/features/{river-js => alloy-syntax-js}/RiverValue.tsx (92%) rename internal/web/ui/src/features/{river-js => alloy-syntax-js}/stringify.ts (87%) rename internal/web/ui/src/features/{river-js => alloy-syntax-js}/types.ts (77%) rename operations/helm/charts/alloy/config/{example.river => example.alloy} (100%) rename packaging/{alloy.river => alloy.alloy} (100%) rename packaging/windows/{config.river => config.alloy} (100%) diff --git a/Dockerfile b/Dockerfile index 9797ad7d71..03394dd3f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN <;%a$W2j_hD3j%{oir`V2iHFG6RJTrGP zcgD7GoI=`C7Gl6#65i0VyvhRQO_$vOh0s7D2@Tra%l6r&#pn*RI=~;E|!B=)4DXz*p()=twaCnUQP;^FKU1G}2|#YuAOPA^n2Sf8Na% zovLf%PTZW1bvxDBddV%-w!WJH*Lb`9e{eL5^`99U?C}5gCh$B<+4=XTZ+3Gve|_j+74vWT|6m&8 zLTCR!&$(@8y{s%`#2RrkBzH{47 z{l(^=M3Bf%XPu$+%!s>rbR?H?hBjxj>D+X7B;#gB+~J|knQVH?%$C7ivXDQuLPK2t zLrcs5*}=i^{HOdsn;pqw{deU56%e}yuYX$GmjjqbF9YgPc-Q%TWZ;1F-1%KS4ju!% zE%p0YynEcg((grRcTIjTdf69lfBgyf+$So<`_9(xn7j6tAH8CJ=3Otm%enThgO@z? z(4H?ncIe!b-yXkrTju^(Jz?zxglTbo;sD+4?uXch9Bn zH~#pSUv&AK9(d2$O!l((|LrsD{b!#x_w4CE*#5!$zjyX0cV7JDJKwtb&R16+^|>G4 z|ABL#PbP1^wM#tyB_^&OwoVClKUin=P<@g@cnB1 zzG2hGtA6yY6My{X+s$V$|JBR?X4jLt|M7}1e!DjPzpB4mdd03M{ncBhKJgdh@BjE| z)am@Rfr0bi|Euna71~*0|L1YPS^vlVzoY+K0jq2C`oQiTHvm$wzmvytf8h6kuXQc9 z=3f4yr=~~W@QEkvnESN{zxKxOzvYK#Mqh(Eou8jG44nV^=V@X2L9ej>GlQ-A|12y5 zIRACz|K;(z7H{`&pSTWixaKc9_iLwK_xhJ#=iPqQrN8|T-`_Oj4GdlpyS#MpS0>+a zN8EhprT0GH{F|q}_vycJX8Z5H`y=1kU9R5$%CElmwO`0y>-1ba`SB+{qrdMdzm>k` zmQP_f{Y%O3{r*hl*zdgJgOyL*{-JmM^}joP&o|C(`$G29 zFMj3QlUJI%GIzcCiK$(c7w!11tDg1Qcb2~W)6|>a_Jh~GrShfg2H$%53tl?-n=jq+ z%y)eEU1uNv_|Jdxo*(Sb96bHy|M9Ko{O_lnyXrf?{jn|2{V%_h_=hjOzxIt!z4PB+ z`jRb&&+Pl>*WC49FZCaO{Hdotf8H0=55DD|T%AIHa=$|&;_WH^H zyZv+i7vFT?(=T^Ne)Ql=?s(M4E`7#F|8mFMo_6xjUz^|b%?Drgn9AS1{p=^df9HF@ z{I0+K=7B#ef9NBpAOFDEC2#uap^HBKj(6U7`=hsg_VHK#@WXfh@Ewmk^}4~Kbb2uJ z>`&jfum8T?XH&ZdlF85X{b}m@2R?t@=RWh9Kg_><&ylZ;B>wF9bJGtzbnmv&8}?it z`@{XPhdugnJs-T}o1;H?`qTT%x4reb@A&ejS3mJpA9(PV?{4Y(`wzwc>7y5)dR_hO zvty6B?2;WH`{AXRJ^ojo_xxYIy!e|(_CI;(uB*TNUq`?D-~&Io|McMZzxJ;EvsYdH z|L(bJ{DD8cuj`H1zis}+Jx{&kcS;8iz2-lid&Qr;=kCvbZtL&;<;EBO%_pC6+r@>) zeS4?-zK5><@@4#jTTy`N4UxbE;nN4I?RRp~4L>YW#@ zJhD??`LVb0!~f^MyH7bd`;_z>{_#xtv-e#5ychO8@7kBV_uIMee(bA5A0DWG{r7Kw z-TUu;=J?ZY{O!MbYgbq16^YM({ZY?9a_V(ox%ZD=c5c%%hqv^;x9`yQ{zCkVPwCoP zylBtYAN~A!zP({|`<=tPxA$+Ef7AQ_^qvEcdqL0L-^kzn&kz2`+aG*V^8V+(`?*~o zyC?S5#dfi^SV2GEFf9MidF7eH>^cpF{C_$7@6b@DS^mpF&D7!l>ogn9V2|Xys(UQf zU3Dv-U#NN2`5CWTa%v~ss$cNRFvg~1-7|%v3pW9mrr9dZxzjWmkDD2%=;K?_n}x?f z)t#wV@(ygbL9ruM)T+U@>{Sc1g>oFt)T>3jP0e{FH>DmGsl0n4HCuINoU)S=$AeU% zTyv{sr)a;@8VtBjDw$$0lhgHbzKCXL+*)o9&^DoEKQ-q%c|WyrOulHteo7loZHyh6 zt~zCuj+Y$mi0#_A(IT<#l3ShSm?FSfHr9-;N8C5N{`0P%s}?FXO!?Xmai#U2$+WKj z!I6&qxAya}7{o*6vQu*NAp2nbZ#8bdP&2i;f^WF+O>cxadQHtUtbzA#q*C&czD^dy z-6P?dUH@R=>ty@~lDPic^#8E-|Lovs$Nqak$SXSkvh}S)tE->?!NKfk$NswxQ?UT# zg85fDYC*a4d9eEV$BCe0|34p;w_SIM`KRdHHjI@Da{iY){|ycfww(WlaRBV-|5n25 zTD<4nwDV(f?ue5gak87UTQVcL&H2$`cht@2hTynA><;BJX?OGHEZ&;~;z)0aVyUGw%h|I6+FgCi~RKkx_~?Ck$*J`all++Yy?ZHj(^re5D95*`e@RerG4kf1_t zT!O@fN!Z7+4Q5ZFj2g8$r)HQ#qh?MPYICM{LoadwxCTl-CKB+ID0z)nHIAuNJq8(@ zlIPco^QKTX69ZyKp7D@x;$)#bYfgIgV%|)h^;;&{ALx zzOJ-3=CnsLk@0h8$ZV?V4GxcI|K4HK3NY#O7v35@j z>P6M!h4qWzPPG!cf9BrX^*`r%$JfmPT%Mi3=>J1r!QJ+xCQ*Z|^%*>mU6!zd3 z=u9IC6Q4s=Bf+@&q%jll-o+*{J#XTWDFKde;>MYQ#AYC5&N;rx&AAjbtoNXJ2SawO z)%^i84T#e&ypJLMmFMAp2ziiIrd_vefk`vFXHXk`u$^;H6>7S5L1-*{<;3&csz-qo zK=EDSoGcWJk-o+@0N^Bn$T0CYr+pU*mY$6bk+kAe;qHhb_z)#gttSK7*zBbXq{p7n z3sS}bY@D1cz{i-+ICLUv+T}3vuxztxmQ@cO*h9=MUlye?PC^l}7=kqsUibM8!?Z4& z+U}eOVK+#-MO5fm-COET5z;q7A*&0Wy6Mnurw)Cj{4BVWUQ=e*-s*(1_kO)nDHbqY zn1-TC`yRk?fIx6L?^N>;!v#31)%$M(`%sG+WvUFClimsIUOIe@mP#BG~Uz4qY+4OE}`j>FnjPs2Y@TYX}t^y z$=nK$c+-0%o!H_eW{&lm-gIw&EQZO2<7^c!>F5=(FonU|PZ+7C7J6}A#)nWSw^C?4Q3b6k0$bv)oRSIHinF9;*1{w(SY3qBLD&@ zd)<>pJ>v&toek{YVr-u=8pa z)U}m*v1NJnYR-i;GKnhO-SMnauOhg?<&H)^rO^$+{@182(GI970)|#bgj1oolyotG zs_dBUIG|&1t-$81Y-4v=+|g&B(F}=|Y4%c0=lG zowx-{#8b9JeIk@yrY11wP?g8lJl8Mx*6_08Dp4g8Xc>LP{vf-&4}piGsD%L0rZF5$ z0c4dxxOMV*OqMxVm@Px;<;~0_Ahc4zA$_oaVaJ6=b50pBvAJ2n3IrsQs7R2Q$SM{F z6q;6NS;)H%rf*{3_1Ev7oVxztv!<@uy=UimPbPSDaNnT=6L^q~9o)4&Gu|^8i>2y* zRpjuBivYPqAvx_F$Bu^Bn@SbfH1#r+vwmMGbz^d+IZY*#D7K*|)z1yEr56xwfL@YB z_)2>-(8IpOF?A?l25zmnH~=D+Z=j#wjaj^dn2BC}k0RRB_|bCQB+X3`0?9d$`tu7Y zLwo1RXBcd9!sZTie*LA6(zbaXbh2U2TPd6UgNJEFfJ+ zJ-PG1)b1TS_fA4c^Vxy2>Ge}L9_>qR+;+4-xv?kJL;z#vXeL#G^rk9t2|~omtR-qy zFagzx7s?5sCFf!=_9+mF_TvqF1`{p|!Af(9=QZ9dzWEk}CfHsExe=TKQI{!(rbwxq zHZ6uBK!pghnr)+L|DW+oUYS9liIWauD@#uK0_^{Y{u^mM|BsHOJNy4?rtx8y#r_}V zJ+TeI=BmkKB@)vw%~3J@DNH5iZ36Tsn#0_PuClCTHy zd@9DP2DcAR^-NTaw+_`863yI~t5>lF)BKd}7Z61UJCnvOqq*ar|Kp{wqe9fNbLKm=K9zsVx@W0*JEd50B0&-eo99^C7AEW zLHDZd2cGpDA+1B9eUAsgygOZ=MGQG-Uzy^;$sIcn8~|TUn*it{FtHm6G(AcZ*Gd}{ zh)9G1WyHWXl?T0mXBK}UL%vJ1w#xpl^`0V!~f zreSCil7>9NB?akAx`%A&Kur&@I>qUnlDQl=v#x$e$*Fvy+SiYPupG9e>O4@DvEOg@ zz4BD$`0Uo0i~Q;Abrq_g0%Y}T5ANGLHg?0ot+DQ&pcIt}!E>Od8&J+rg35afYwq8_ zc+LI$QS%I%FFLTo&P@eNSGwrer%lUqLT1lBG#-?l5=^oNkLG;^zcF@&=jQu*yndO5 zZe4cJm-zK!4UZGsP9s_*cl^wNx$3lhm6dkp48b8Sd@ROZG}W?w=?VZpEir_KWGK#RH0U)e^eTOE|a0tsnvOoYlkRQ@)Ni;a7XMiMd zRG#Q-Z3;80XbVO#C18TN1MZRjADtLCx10)@H9H2PjyDr;JcZU|>0Cp}3EEzd)NBhw z{{=NzA$|5>6oCf%yWng+QT(lf7&&aqQ*A zydP(=Vgb5oZjJ<^Yl)9J%3#dp;=CMy%L_Zzz#D+M)e@=_&P=@uh*fT05OEOVD7&w+ z6&x0YNkz9MITB*EaP^Q&fvcci-$HZ_nDl_j^c(jU6VJt!X)P=z3lEyq){XC|G|=7j z!Zv-&Ek{5+iepgHf~o_@(6uw#b0wK^bHx?$?wxygu+!Z~;_{U2sd>TS$>}C=Y>@iQ zU=qg6kvNGfer!MJQ60)9m?=@j5WvccuYU$=0vN`UEmSv{4nkxc!u#FoZT3Bkc z2*(A|S6Gd4ExB0)MVA;?@Ot6Ugy9^v680DfyM#j<4Gd(9SpQ|uE}lRlS%C)$dkvZs zawZwA)JmZY$%A}d#ADED0HHm`XVn{xYG(X4Xa$a*#y;|}S^Q!Wg=O@RAf%(g-Y+xn zR;yrM&y`9G)-(6q)=jtM9FHtAt+(XH+lH*# zwE3dHmM;To?e4#*v<#wK2~Eoeq}!HgAkaxR%Pdhr1lCC?&!Oz91-e!ygYSp!I>Z4M zhd-xy(wT>HP$iVcaS(esd4y_hg=0Z!E&a7ck;aacU7))Eea0SVRS<7S3eDPb$* zeoguVpF#}*5OzSpiq@4SA$y^)2WWb>E<=*=VS)y6c+{y@oO!9wmUHmV#BMF%xewzo z$K$sPB_22N!ihp2c4gU!v11CIHp%rO5sF;D+*G4x3sX6-xmH44^nlP8PsRHwfj953 za^jTb9v&uyYV-`%dV=ZeH)I5XxCzk{o9+U>*gS-GIBiI+cItT=Qz^XV^k+F&k3H}6 zK!`rbq4manWS6}qf8Oskx87=c?1S9=EPQHvEo+HX#HbG!%7fXlv1hrpiIaIdSxqHw zgGM2B^l0j6ihSjap}|*pRB*OLJt8F9A;87cv9X*5NetO>MT>EW4_jT;skp`%Xwv^W zaQB#pi*;^p&1}Ey?h5wb^ymWruaQxt1n<~?*LbcM1J|zoR~)xw${;Lg^&r&q^k^-0 zluWS2(f!|QXT3_Kw-I}=ni#PidnZ*h(P9q{A@ZoXTBT`Y^jtu+;wHI~Cg4JZP=LNuK8il z>CC2h&sFg=v9UJzY}5LOvcVdm*Tn7<(Ax^@e=sxLn*V1cjg&y0^&cQ`9sjnw{vkUq z zO~OGAd@BQwJC>WMdOqBAVCJIfjsBT(8zoeCIN#t9;+&w@I$yYD~@dF&2@eOc9TO?=@??LNIYVH)lS!@DClHPw;}eq)%o!C{(s^o)J5vbPY#A z*`bs^t!GfPeb1ip2@X1uhi9!x+;;3J z+(B+NCvzr|>lf9(U0pd$$`w}}-MR0Y*iNc%#>{qv2V(UI(d3D{W}*?*G1jtp?mz_% zH8geAAUODGm3&GO(KW*(k)D_uvV)`pJrBrZ<%Y?jE+dlYl{jor%!FzBnUBABS&$6_%f+{i9QF}XG`Kv}^t zq9$-r4cP)FkVXXj!cQ5~CL}FKQ7HITS;{$vUlb^t-HB-3N$+%uvn!Y!QD#*2`-y~h z5`Wd{C!E|wq77kW9rw8o=*2OxK>nk_2F?a+DFCh@|7DQ=uOt-jx8Om3CS&)tq<8&k> zbE&$z_Xkx0&RjG9HCVW{ZA39H(1Ey$Y>c=}wPWj1Qm>;r>GhcTMfvKe>C~ zUicFp+B=Cen22GOQKq&iSJ*!%Cyn$IvB+9;6rq z646u)X{=f=n`pp~1p5SqG%#0>xd6iWKOMFFur?ltbYT4)qG- z*C~5Z-KinnETd7caMNSYbhLTX2W5xJ6k)r5-Ob zcg=)?X`@>RY*sj4mEijUCrre{K_OK$`>vxlOD7E9ucX3s2M<>yA_a-5N3tHS3m@+V zVThU+WF_E{*ki{D=YZ1~5zh`1>bw`>6?M3ESkkq{LVXeJ_s}BKoJNw9d_WQ6(q3K} z1J0)kZZvMsU}##d8^T1?I2mq;+@$F zq%u7ikX3@S3y_t>p-N^jV`nfY)z#|qAph7^YK>b!r1{(BW?DWHl44nji zrNoKCiH52=Ys4h^NxTM#pVN-^W7K+1vBFfQ1vw!uZVcw9=d@iyXBe>ted0}#>e(f# zt0cky7pWd#H{KKJhb9APJivkj3Sg|T=$H9!X)PXhQfKfcaXwivb4qAonu5iqF5n>W zDFRuG2e2?^h08s&4OXymJ$yri;s-_$aQ(&uxI5!V_0&NWkd6oqWR6)B(kq(343ku{Y%myh zi6NU7!y)M@<;m)YSz*V%i7D}77Hfgsltsw#of&r)wi1|qln9iA2K(`xV`II7Ezt@L zA75hxe-WcHsiLykyA>YkG&_hQlnnha( zx-h_|(HzQadJ-lF+N}nUGNbv>o9Q|%WsyA(#qku;Wb6g&yG|9EXF#mj(%@YJ!-PiK zMe)rRa#&9`+KqT2+jRs0#%O8<*--g0=$zP{Q4jwx`!>=MNGL-Uh}1FFdD#=}2&nXw zJs45+>?quEfh|UDQMJyN#4vVRHGfn6#hCE&@54=$O|ziMl)G{KD=#U zGY-fn(hEeXfc&L$4(Sof^lr7O2`s9BPd$)eB#3;)fM917s3aN5N5!V2w69jdU;?EZ zKrqP$v}J{DIe@@ZRho8ST$6Ctz@R7wMhxw01eJPR^*STAOD-(Cq$xq90AN=FgjQX6 zdLmf^W*K?WAH|_n-@LPXuWPR%7&3Co>oYjN0IK z5q1+s{YXp{IEiA`%8Jk$aWcs~WVvWVec0?_`3}tb=m7Y?MjjzzT|ria%~iB277ct!2lrtPD>Xjq)brK0*n@03}i~M zj`}MiFenpl0kK$Y`v8W({cA$bY0*u^rAZ&Gd^vO z&nKE#!t*<-K$d3ve1u~2u%v=AdIm8`deXKd=)!dY+YdopJ&z;Ki~}vHFcgXV5C)J_!%L`RXvp$CQ592^npJtRvP zPAwvD(+@Ohwlm)NfxwBBYIhl`xR+w<5b3LFkeUIK`wm*LU#Q>>mD=>{;5H;~^-{G( z`U`T6h7*(w7}o(!%GzfUI)-rUCim^wNB6&+ zJ14>NRz!^YBg^DNLPhL+RaOCpAYv*r*SL8K7(q9ua*WEGLK08vEfHo01uebpRA~;s zOg1+bc0e>`i!{~eCTEk(l>>hpX&q}1C;4u=n=+y-Y|bv;h3)J_k`svcp);x$R5H~e zHjy7-bMuFNBrym@3cDO<@R`PY(V?`xj#D2c8?&^>dO8#tggi@Dii?iK+GG@Et80#a zj~+ZV6-1*^xX>b*g`8jpu+n7e{MtN9>Wm^sYAu(H_6A&tSp*nK7~Bj>{}$FDZ&Y<2zG>o7QUIf~4OpWdT^N=o z)crx-arknFdKXh;Uoz9x{GGJ=j?v-5`ClR_5ZsO;+h z1^01llK*MVm%Uawud2MyUwmCb{!fn#xB7pLjCSPz^T&HT5E}A71)XIM0Byv70RX%+ z8U&ALyg$U49iu}z>VG&m^6rg`fq1HwuCxL000B)7Fa2nZ7?0`=meLx)he_ha0Y%%6wh5)7C{I;N zTg!Oy#)2b1)Y6t?SJO}9~p;Sh0YHAKN zTU#;of1%qQMbAhIa=;4emT34v{5|cg=nc(G+$$!!=Z0b1ryq6^p)QsDTPJ*b2lk14RW6c$eoh zb2?H|Mzq4*FsYkmlC5d@h&1&@b*Vt(3O$i>RHh5Y7j}b5yo1mKnP$x7!_l=v}dPD9F3zdG#P_t1GHwf=7pr7*n#K zPk;!$zK&jl7MCUskX}Qy;GT+VAX+nF{oW-dr(Gke5XKsTb1go@XA{drKM%^S4y2m7tgiLbM698@MM#!U(k@ zk`FWj<<$*D9c$&nu=!9!#m4Bk-(1-sWj8JXTjY{N#X&1h^QUA55?asbdf z*kS^~mYzP)+KulDWWg}&yb%mBkxRC^u+d;1gp3?k?c7cnLmY5pc;ViP{JnJKr`vmc_z~?}j6{r?_K{HuIUHoN{%H?F7dtO-sD(zA7csdA?W8$?||Ft1ttVYvroA##+}`Q$nTMbl@5-b@YYi?SSAc_kf#3Ef|hwld%X7 zR^UL;pj6gCWxVrK+@Vq%2lQA2q{E(5FDIHdQar>Nu3F>mcbu*9p40Zzh7AoEbl$Z? zYh8X#iBtlH76e9fekZ}ZT3dx1bW^LC7WFS_?B>b@Bcu}qPB$p$5WG}G-ORlZT*(1( zC47Tx|HO_(fk>S6>?P!&&kEes;6-6cDe!H_;K156B)c)@jRQJ8iZ@FoXsHDi`U1~a zM8pm{?@@5j&3hFi4no5h?IoJlF1F5Vbi%^5-_%QJ;9HU?1zg>1Yh*Aol0d2Daz0tQ zlfZj#P^CBYB2gY#TSeYpi?Y z&(9r~>vnj41ORT*|3GT0CDvXEL^)`5c$jtodiF*C@>M!JI^3fF8Oe6^{}+b1+SUJ9 z1u;Yks&blSY!QCwLrhmD$in%0X&TwboHDLIsD_s?w(V>eAwnv}B}W2H{7RR|qgq8X zi2|;)?qn1@e;R3C|F~~FQS(B7n>Eq|bB!;v{)Y#l>}}Tnj%G$W`rq@P+%_OI)<0J6 z(&m3FKj0Y4V=pgFg*O)cu;{^xi%+pWndeIlL!wj-j7PW|M4|=Z8Gur7#FCU-$a9=K z&HymUi-6h?b?McL<1tF1E0Q&g+9z$9!4NZ$fDjl(e_oidm^q?xSkveQ0Y=poYXb*IJ`n8P#ljaaP}+Sf=80Eqy#`VBGf!UqJh zst#T(h7#E!rJ;;~`jjK4EwNB(3`OUK7dinI0r6n!pl%kd;3M~!DomIH$+|cKz_g3l zyaK{jwxZrii5rxTAp#Qb7+PC(B}S8%3afoN@Q)0u0t^C9c-Ny-l_QrV0+5{z^Nfrn z1=O{AZ)i!V>{c5E&?=p^bfVxDp_*_6nc{@pnxawdOtAAxOc?X5T5fg3La+HTn=hP~ z2czt6xi(AEpD1iiZyL#cLRwcc5*!I-^#x0eHz)&&?}@KE@0ZjF8#y9Nc}?OeF1gM0 z2cK77*P+g~a^#?qGv2c?%&$N%;|*pXLW#AL5yh)bkiPXI6DZSy zyTYb%`LQHR;RRlH)_nvj!%##UloBjqMFM>nLv4fAb2>$0tOvPcir8*KFyHW@0 z`Uo!~B$Q+qnFWVQ;WaE9jG07Q)NUaUa2 zArXy$!U{fsqbC?EzX@{?4$sI}eJ8Y|)QUOO{D%yNwlf5O5Tw}&=hzOTX^w^EA{8Pt z_SifvWa&CCc8D&jmS-V2^CT}z<>R1H@sOD016kBqG7eTGoEC6jF|WtwG%=MkB~M_O zTp8#Fr-9F}<(Ctf_dMCU=|MsGBDh`a#~ptI%biAqDd&`|^S5Z;UqFzgGcs7&`yu#cMteZ)Dyr4|>w80>e9O;aNIIM+|IomkF)u+JrpM`vKvpoJb(CG-nl; z?LmoH$IRjxm>OeltJ6s=W(xZo?ZhCID@~lP z^>H(1c3!`K^4G>~F3CzHKinBe(uWN0X=_X+ese3eGF=ivO8&EhVgbS67A(z*X*y{4lH zE&@p=@Ziz-eay^b51#wwi#9wx_}kU>OQ!4b$3D{4^@2C!^|$o5>!b5C?|R`~&b4

p;?pH5)@edxjxR!p;C28z?@BQYj6EEQ) zF7S_C|74i!*0QYeW!8T>8?JvF|D8<_4R_+d*KI-~fFW3kAD*A$9`2_Y&)C^DBM5qg ze@vz#%qq1$gXQ{PM*qv#!TxX8|6pb?+hvB=r#sD1f5G!VG|#`?UzgbTni1FjH%{Cw@2hyS;a;fG%`@8)nh6mr2iaYic#&egzRWxT literal 0 HcmV?d00001 diff --git a/internal/alloy/tracing/tracing.go b/internal/alloy/tracing/tracing.go index 49464f8209..c271736164 100644 --- a/internal/alloy/tracing/tracing.go +++ b/internal/alloy/tracing/tracing.go @@ -62,12 +62,12 @@ type JaegerRemoteSamplerOptions struct { RefreshInterval time.Duration `alloy:"refresh_interval,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (opts *Options) SetToDefault() { *opts = DefaultOptions } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (opts *JaegerRemoteSamplerOptions) SetToDefault() { *opts = DefaultJaegerRemoteSamplerOptions } diff --git a/internal/alloycli/cmd_convert.go b/internal/alloycli/cmd_convert.go index aa6ca51474..16eb62a103 100644 --- a/internal/alloycli/cmd_convert.go +++ b/internal/alloycli/cmd_convert.go @@ -125,7 +125,7 @@ func convert(r io.Reader, fc *alloyConvert) error { return err } - riverBytes, diags := converter.Convert(inputBytes, converter.Input(fc.sourceFormat), ea) + alloyBytes, diags := converter.Convert(inputBytes, converter.Input(fc.sourceFormat), ea) err = generateConvertReport(diags, fc) if err != nil { return err @@ -138,7 +138,7 @@ func convert(r io.Reader, fc *alloyConvert) error { } var buf bytes.Buffer - buf.WriteString(string(riverBytes)) + buf.WriteString(string(alloyBytes)) if fc.output == "" { _, err := io.Copy(os.Stdout, &buf) diff --git a/internal/alloycli/cmd_run.go b/internal/alloycli/cmd_run.go index 3092241675..2329eae02c 100644 --- a/internal/alloycli/cmd_run.go +++ b/internal/alloycli/cmd_run.go @@ -73,7 +73,7 @@ dirirectory or file path to use. If the configuration directory or file path wasn't specified, can't be loaded, or contains errors, run will exit immediately. -If path is a directory, all *.river files in that directory will be combined +If path is a directory, all *.alloy files in that directory will be combined into a single unit. Subdirectories are not recursively searched for further merging. run starts an HTTP server which can be used to debug Grafana Alloy or @@ -415,8 +415,8 @@ func loadAlloySource(path string, converterSourceFormat string, converterBypassE } return nil } - // Ignore files not ending in .river extension - if !strings.HasSuffix(curPath, ".river") { + // Ignore files not ending in .alloy extension + if !strings.HasSuffix(curPath, ".alloy") { return nil } diff --git a/internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go b/internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go index 5d91ccbdad..47ff1cb660 100644 --- a/internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go +++ b/internal/cmd/alloylint/internal/syntaxtags/syntaxtags.go @@ -44,7 +44,7 @@ var ( // - Fields marked as blocks must be the appropriate type. // - Label tags must have an empty value for NAME. // - Non-empty values for NAME must be snake_case. -// - Non-empty NAME values must be valid River identifiers. +// - Non-empty NAME values must be valid Alloy identifiers. // - Attributes may not have a NAME with a `.` in it. func run(p *analysis.Pass) (interface{}, error) { diff --git a/internal/cmd/integration-tests/README.md b/internal/cmd/integration-tests/README.md index e4df4c257b..680eb1fecf 100644 --- a/internal/cmd/integration-tests/README.md +++ b/internal/cmd/integration-tests/README.md @@ -25,7 +25,7 @@ Follow these steps to add a new integration test to the project: 1. If the test requires external resources, define them as Docker images within the `docker-compose.yaml` file. 2. Create a new directory under the tests directory to house the files for the new test. -3. Within the new test directory, create a file named `config.river` to hold the pipeline configuration you want to test. +3. Within the new test directory, create a file named `config.alloy` to hold the pipeline configuration you want to test. 4. Create a `_test.go` file within the new test directory. This file should contain the Go code necessary to run the test and verify the data processing through the pipeline. _NOTE_: The tests run concurrently. Each Alloy instance must tag its data with a label that corresponds to its specific configuration. This ensures the correct data verification during the Go testing process. diff --git a/internal/cmd/integration-tests/tests/otlp-metrics/config.river b/internal/cmd/integration-tests/tests/otlp-metrics/config.alloy similarity index 100% rename from internal/cmd/integration-tests/tests/otlp-metrics/config.river rename to internal/cmd/integration-tests/tests/otlp-metrics/config.alloy diff --git a/internal/cmd/integration-tests/tests/read-log-file/config.river b/internal/cmd/integration-tests/tests/read-log-file/config.alloy similarity index 100% rename from internal/cmd/integration-tests/tests/read-log-file/config.river rename to internal/cmd/integration-tests/tests/read-log-file/config.alloy diff --git a/internal/cmd/integration-tests/tests/redis/config.river b/internal/cmd/integration-tests/tests/redis/config.alloy similarity index 100% rename from internal/cmd/integration-tests/tests/redis/config.river rename to internal/cmd/integration-tests/tests/redis/config.alloy diff --git a/internal/cmd/integration-tests/tests/scrape-prom-metrics/config.river b/internal/cmd/integration-tests/tests/scrape-prom-metrics/config.alloy similarity index 100% rename from internal/cmd/integration-tests/tests/scrape-prom-metrics/config.river rename to internal/cmd/integration-tests/tests/scrape-prom-metrics/config.alloy diff --git a/internal/cmd/integration-tests/tests/unix/config.river b/internal/cmd/integration-tests/tests/unix/config.alloy similarity index 100% rename from internal/cmd/integration-tests/tests/unix/config.river rename to internal/cmd/integration-tests/tests/unix/config.alloy diff --git a/internal/cmd/integration-tests/utils.go b/internal/cmd/integration-tests/utils.go index 611894898d..acadf61261 100644 --- a/internal/cmd/integration-tests/utils.go +++ b/internal/cmd/integration-tests/utils.go @@ -53,7 +53,7 @@ func runSingleTest(testDir string, port int) { dirName := filepath.Base(testDir) var alloyLogBuffer bytes.Buffer - cmd := exec.Command(alloyBinaryPath, "run", "config.river", "--server.http.listen-addr", fmt.Sprintf("0.0.0.0:%d", port)) + cmd := exec.Command(alloyBinaryPath, "run", "config.alloy", "--server.http.listen-addr", fmt.Sprintf("0.0.0.0:%d", port)) cmd.Dir = testDir cmd.Stdout = &alloyLogBuffer cmd.Stderr = &alloyLogBuffer diff --git a/internal/component/common/config/types.go b/internal/component/common/config/types.go index 85ebf2637a..2cedf45372 100644 --- a/internal/component/common/config/types.go +++ b/internal/component/common/config/types.go @@ -1,5 +1,5 @@ // Package config contains types from github.com/prometheus/common/config, -// but modifies them to be serializable with River. +// but modifies them to be serializable with Alloy. package config import ( @@ -26,7 +26,7 @@ type HTTPClientConfig struct { EnableHTTP2 bool `alloy:"enable_http2,attr,optional"` } -// SetToDefault implements the river.Defaulter +// SetToDefault implements the syntax.Defaulter func (h *HTTPClientConfig) SetToDefault() { *h = DefaultHTTPClientConfig } diff --git a/internal/component/common/config/types_test.go b/internal/component/common/config/types_test.go index 4231e6480e..cb364f4d0b 100644 --- a/internal/component/common/config/types_test.go +++ b/internal/component/common/config/types_test.go @@ -8,7 +8,7 @@ import ( ) func TestHTTPClientConfigBearerToken(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` bearer_token = "token" proxy_url = "http://0.0.0.0:11111" follow_redirects = true @@ -25,12 +25,12 @@ func TestHTTPClientConfigBearerToken(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigBearerTokenFile(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` bearer_token_file = "/path/to/file.token" proxy_url = "http://0.0.0.0:11111" follow_redirects = true @@ -38,12 +38,12 @@ func TestHTTPClientConfigBearerTokenFile(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigBasicAuthPassword(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -55,12 +55,12 @@ func TestHTTPClientConfigBasicAuthPassword(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigBasicAuthPasswordFile(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -72,12 +72,12 @@ func TestHTTPClientConfigBasicAuthPasswordFile(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigAuthorizationCredentials(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -89,12 +89,12 @@ func TestHTTPClientConfigAuthorizationCredentials(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigAuthorizationCredentialsFile(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -106,12 +106,12 @@ func TestHTTPClientConfigAuthorizationCredentialsFile(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigOath2ClientSecret(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -135,12 +135,12 @@ func TestHTTPClientConfigOath2ClientSecret(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestHTTPClientConfigOath2ClientSecretFile(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` proxy_url = "http://0.0.0.0:11111" follow_redirects = true enable_http2 = true @@ -156,12 +156,12 @@ func TestHTTPClientConfigOath2ClientSecretFile(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) } func TestOath2TLSConvert(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` oauth2 { client_id = "client_id" client_secret_file = "/path/to/file.oath2" @@ -172,14 +172,14 @@ func TestOath2TLSConvert(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.NoError(t, err) newCfg := httpClientConfig.Convert() require.NotNil(t, newCfg) } func TestHTTPClientBadConfig(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` bearer_token = "token" bearer_token_file = "/path/to/file.token" proxy_url = "http://0.0.0.0:11111" @@ -227,6 +227,6 @@ func TestHTTPClientBadConfig(t *testing.T) { ` var httpClientConfig HTTPClientConfig - err := syntax.Unmarshal([]byte(exampleRiverConfig), &httpClientConfig) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &httpClientConfig) require.ErrorContains(t, err, "at most one of basic_auth password & password_file must be configured") } diff --git a/internal/component/common/kubernetes/kubernetes.go b/internal/component/common/kubernetes/kubernetes.go index 949a49e2cd..7933d8c950 100644 --- a/internal/component/common/kubernetes/kubernetes.go +++ b/internal/component/common/kubernetes/kubernetes.go @@ -25,12 +25,12 @@ var DefaultClientArguments = ClientArguments{ HTTPClientConfig: commoncfg.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ClientArguments) SetToDefault() { *args = DefaultClientArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *ClientArguments) Validate() error { if args.APIServer.URL != nil && args.KubeConfig != "" { return fmt.Errorf("only one of api_server and kubeconfig_file can be set") diff --git a/internal/component/common/kubernetes/kubernetes_test.go b/internal/component/common/kubernetes/kubernetes_test.go index 7c8efb5d1a..1829056983 100644 --- a/internal/component/common/kubernetes/kubernetes_test.go +++ b/internal/component/common/kubernetes/kubernetes_test.go @@ -7,20 +7,20 @@ import ( "github.com/stretchr/testify/require" ) -func TestUnmarshalRiver(t *testing.T) { - var exampleRiverConfig = ` +func TestUnmarshalAlloy(t *testing.T) { + var exampleAlloyConfig = ` api_server = "localhost:9091" proxy_url = "http://0.0.0.0:11111" ` var args ClientArguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) - exampleRiverConfig = ` + exampleAlloyConfig = ` kubeconfig_file = "/etc/k8s/kubeconfig.yaml" ` var args1 ClientArguments - err = syntax.Unmarshal([]byte(exampleRiverConfig), &args1) + err = syntax.Unmarshal([]byte(exampleAlloyConfig), &args1) require.NoError(t, err) } diff --git a/internal/component/common/net/config.go b/internal/component/common/net/config.go index 6f7c40479e..d25ef9375d 100644 --- a/internal/component/common/net/config.go +++ b/internal/component/common/net/config.go @@ -1,4 +1,4 @@ -// Package http contains a River serializable definition of the dskit config in +// Package http contains a Alloy-serializable definition of the dskit config in // https://github.com/grafana/dskit/blob/main/server/server.go#L72. package net @@ -21,7 +21,7 @@ const ( size4MB = 4 << 20 ) -// ServerConfig is a River configuration that allows one to configure a dskit.Server. It +// ServerConfig is an Alloy configuration that allows one to configure a dskit.Server. It // exposes a subset of the available configurations. type ServerConfig struct { // HTTP configures the HTTP dskit. Note that despite the block being present or not, @@ -82,7 +82,7 @@ func (g *GRPCConfig) Into(c *dskit.Config) { c.GRPCServerMaxConcurrentStreams = g.ServerMaxConcurrentStreams } -// Convert converts the River-based ServerConfig into a dskit.Config object. +// Convert converts the Alloy-based ServerConfig into a dskit.Config object. func (c *ServerConfig) convert() dskit.Config { cfg := newdskitDefaultConfig() // use the configured http/grpc blocks, and if not, use a mixin of our defaults, and diff --git a/internal/component/common/net/config_test.go b/internal/component/common/net/config_test.go index 33ee7216ea..7fea244f83 100644 --- a/internal/component/common/net/config_test.go +++ b/internal/component/common/net/config_test.go @@ -11,12 +11,12 @@ import ( ) // testArguments mimics an arguments type used by a component, applying the defaults to ServerConfig -// from it's UnmarshalRiver implementation, since the block is squashed. +// from it's UnmarshalAlloy implementation, since the block is squashed. type testArguments struct { Server *ServerConfig `alloy:",squash"` } -func (t *testArguments) UnmarshalRiver(f func(v interface{}) error) error { +func (t *testArguments) UnmarshalAlloy(f func(v interface{}) error) error { // apply server defaults from here since the fields are squashed *t = testArguments{ Server: DefaultServerConfig(), diff --git a/internal/component/common/net/server.go b/internal/component/common/net/server.go index 67ad00f807..8162345aee 100644 --- a/internal/component/common/net/server.go +++ b/internal/component/common/net/server.go @@ -38,7 +38,7 @@ func NewTargetServer(logger log.Logger, metricsNamespace string, reg prometheus. config = DefaultServerConfig() } - // convert from River into the dskit config + // convert from Alloy into the dskit config serverCfg := config.convert() // Set the config to the new combined config. // Avoid logging entire received request on failures diff --git a/internal/component/common/relabel/relabel.go b/internal/component/common/relabel/relabel.go index a0b3f8a9cf..4bd3fb2970 100644 --- a/internal/component/common/relabel/relabel.go +++ b/internal/component/common/relabel/relabel.go @@ -126,7 +126,7 @@ var DefaultRelabelConfig = Config{ Replacement: "$1", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (c *Config) SetToDefault() { *c = Config{ Action: Replace, @@ -138,7 +138,7 @@ func (c *Config) SetToDefault() { var relabelTarget = regexp.MustCompile(`^(?:(?:[a-zA-Z_]|\$(?:\{\w+\}|\w+))+\w*)+$`) -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (rc *Config) Validate() error { if rc.Action == "" { return fmt.Errorf("relabel action cannot be empty") @@ -213,6 +213,6 @@ func ComponentToPromRelabelConfigs(rcs []*Config) []*relabel.Config { // Rules returns the relabel configs in use for a relabeling component. type Rules []*Config -// RiverCapsule marks the alias defined above as a "capsule type" so that it -// cannot be invoked by River code. -func (r Rules) RiverCapsule() {} +// AlloyCapsule marks the alias defined above as a "capsule type" so that it +// cannot be invoked by Alloy code. +func (r Rules) AlloyCapsule() {} diff --git a/internal/component/component.go b/internal/component/component.go index 43bbb41481..9f4f320bc6 100644 --- a/internal/component/component.go +++ b/internal/component/component.go @@ -9,20 +9,20 @@ // configuration changes. A component may also update its Exports throughout // its lifetime, such as a component which outputs the current day of the week. // -// Components are built by users with River, where they can use River -// expressions to refer to any input or exported field from other components. -// This allows users to connect components together to declaratively form a -// pipeline. +// Components are built by users with Alloy configuration, where they can use +// Alloy expressions to refer to any input or exported field from other +// components. This allows users to connect components together to +// declaratively form a pipeline. // // # Defining Arguments and Exports structs // // Arguments and Exports implemented by new components must be able to be -// encoded to and from River. "river" struct field tags are used for encoding; -// refer to the package documentation at pkg/river for a description of how to +// encoded to and from Alloy. "alloy" struct field tags are used for encoding; +// refer to the package documentation at syntax for a description of how to // write these tags. // -// The set of River element names of a given component's Arguments and Exports -// types must not overlap. Additionally, the following River field and block +// The set of Alloy element names of a given component's Arguments and Exports +// types must not overlap. Additionally, the following Alloy field and block // names are reserved for use by the Alloy controller: // // - for_each @@ -31,7 +31,7 @@ // - debug // // Default values for Arguments may be provided by implementing -// river.Unmarshaler. +// syntax.Unmarshaler. // // # Arguments and Exports immutability // @@ -44,11 +44,11 @@ // Similarly, Exports and the fields within Exports must be considered // immutable after they are written for the same reason. // -// # Mapping River strings to custom types +// # Mapping Alloy strings to custom types // // Custom encoding and decoding of fields is available by implementing // encoding.TextMarshaler and encoding.TextUnmarshaler. Types implementing -// these interfaces will be represented as strings in River. +// these interfaces will be represented as strings in Alloy. // // # Component registration // @@ -63,14 +63,14 @@ import ( ) // The Arguments contains the input fields for a specific component, which is -// unmarshaled from River. +// unmarshaled from Alloy. // // Refer to the package documentation for details around how to build proper // Arguments implementations. type Arguments interface{} // Exports contains the current set of outputs for a specific component, which -// is then marshaled to River. +// is then marshaled to Alloy. // // Refer to the package documentation for details around how to build proper // Exports implementations. @@ -105,7 +105,7 @@ type DebugComponent interface { // DebugInfo returns the current debug information of the component. May // return nil if there is no debug info to currently report. The result of - // DebugInfo must be encodable to River like Arguments and Exports. + // DebugInfo must be encodable to Alloy like Arguments and Exports. // // Values from DebugInfo are not exposed to other components for use in // expressions. diff --git a/internal/component/component_health.go b/internal/component/component_health.go index 6ce71fdec2..f949b3c065 100644 --- a/internal/component/component_health.go +++ b/internal/component/component_health.go @@ -10,7 +10,7 @@ import ( // report health information. // // Health information is exposed to the end user for informational purposes and -// cannot be referened in a River expression. +// cannot be referened in an Alloy expression. type HealthComponent interface { Component @@ -23,7 +23,7 @@ type HealthComponent interface { } // Health is the reported health state of a component. It can be encoded to -// River. +// Alloy. type Health struct { // The specific health value. Health HealthType `alloy:"state,attr"` diff --git a/internal/component/discovery/aws/ec2.go b/internal/component/discovery/aws/ec2.go index ba0d2016fe..ad9de95026 100644 --- a/internal/component/discovery/aws/ec2.go +++ b/internal/component/discovery/aws/ec2.go @@ -77,12 +77,12 @@ var DefaultEC2SDConfig = EC2Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *EC2Arguments) SetToDefault() { *args = DefaultEC2SDConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *EC2Arguments) Validate() error { if args.Region == "" { cfgCtx := context.TODO() diff --git a/internal/component/discovery/aws/ec2_test.go b/internal/component/discovery/aws/ec2_test.go index 845c1e0ceb..6ef5dd865d 100644 --- a/internal/component/discovery/aws/ec2_test.go +++ b/internal/component/discovery/aws/ec2_test.go @@ -21,13 +21,13 @@ func TestConvert(t *testing.T) { } // example configuration - riverArgs := EC2Arguments{ + alloyArgs := EC2Arguments{ Region: "us-east-1", HTTPClientConfig: httpClientConfig, } // ensure values are set - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() assert.Equal(t, "us-east-1", promArgs.Region) assert.Equal(t, "http://example:8080", promArgs.HTTPClientConfig.ProxyURL.String()) } diff --git a/internal/component/discovery/aws/lightsail.go b/internal/component/discovery/aws/lightsail.go index 97d93b3537..092a7a4006 100644 --- a/internal/component/discovery/aws/lightsail.go +++ b/internal/component/discovery/aws/lightsail.go @@ -64,12 +64,12 @@ var DefaultLightsailSDConfig = LightsailArguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *LightsailArguments) SetToDefault() { *args = DefaultLightsailSDConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *LightsailArguments) Validate() error { if args.Region == "" { cfgCtx := context.TODO() diff --git a/internal/component/discovery/azure/azure.go b/internal/component/discovery/azure/azure.go index 61c8ea6403..6b9940a78c 100644 --- a/internal/component/discovery/azure/azure.go +++ b/internal/component/discovery/azure/azure.go @@ -61,12 +61,12 @@ var DefaultArguments = Arguments{ EnableHTTP2: true, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.OAuth == nil && a.ManagedIdentity == nil || a.OAuth != nil && a.ManagedIdentity != nil { return fmt.Errorf("exactly one of oauth or managed_identity must be specified") diff --git a/internal/component/discovery/azure/azure_test.go b/internal/component/discovery/azure/azure_test.go index c1ef359388..a8d9637ced 100644 --- a/internal/component/discovery/azure/azure_test.go +++ b/internal/component/discovery/azure/azure_test.go @@ -12,8 +12,8 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` environment = "AzureTestCloud" port = 8080 subscription_id = "subid" @@ -29,7 +29,7 @@ func TestRiverUnmarshal(t *testing.T) { proxy_url = "http://example:8080"` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, "AzureTestCloud", args.Environment) @@ -45,8 +45,8 @@ func TestRiverUnmarshal(t *testing.T) { assert.Equal(t, "http://example:8080", args.ProxyConfig.ProxyURL.String()) } -func TestRiverUnmarshal_OAuthRequiredFields(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal_OAuthRequiredFields(t *testing.T) { + alloyCfg := ` environment = "AzureTestCloud" port = 8080 subscription_id = "subid" @@ -56,7 +56,7 @@ func TestRiverUnmarshal_OAuthRequiredFields(t *testing.T) { client_id = "clientid" }` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.Error(t, err) } @@ -110,7 +110,7 @@ func TestValidate(t *testing.T) { func TestConvert(t *testing.T) { proxyUrl, _ := url.Parse("http://example:8080") - riverArgsOAuth := Arguments{ + alloyArgsOAuth := Arguments{ Environment: "AzureTestCloud", Port: 8080, SubscriptionID: "subid", @@ -130,7 +130,7 @@ func TestConvert(t *testing.T) { }, } - promArgs := riverArgsOAuth.Convert() + promArgs := alloyArgsOAuth.Convert() assert.Equal(t, "AzureTestCloud", promArgs.Environment) assert.Equal(t, 8080, promArgs.Port) assert.Equal(t, "subid", promArgs.SubscriptionID) @@ -143,7 +143,7 @@ func TestConvert(t *testing.T) { assert.Equal(t, false, promArgs.HTTPClientConfig.EnableHTTP2) assert.Equal(t, "http://example:8080", promArgs.HTTPClientConfig.ProxyURL.String()) - riverArgsManagedIdentity := Arguments{ + alloyArgsManagedIdentity := Arguments{ Environment: "AzureTestCloud", Port: 8080, SubscriptionID: "subid", @@ -161,7 +161,7 @@ func TestConvert(t *testing.T) { }, } - promArgs = riverArgsManagedIdentity.Convert() + promArgs = alloyArgsManagedIdentity.Convert() assert.Equal(t, "AzureTestCloud", promArgs.Environment) assert.Equal(t, 8080, promArgs.Port) assert.Equal(t, "subid", promArgs.SubscriptionID) diff --git a/internal/component/discovery/consul/consul.go b/internal/component/discovery/consul/consul.go index a5ce3dbb68..64fad1ba77 100644 --- a/internal/component/discovery/consul/consul.go +++ b/internal/component/discovery/consul/consul.go @@ -55,12 +55,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/consul/consul_test.go b/internal/component/discovery/consul/consul_test.go index baef1eba47..64b953b306 100644 --- a/internal/component/discovery/consul/consul_test.go +++ b/internal/component/discovery/consul/consul_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "consul.example.com:8500" services = ["my-service"] token = "my-token" @@ -17,12 +17,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "consul.example.com:8500" services = ["my-service"] basic_auth { @@ -34,6 +34,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth password & password_file must be configured") } diff --git a/internal/component/discovery/consulagent/consulagent.go b/internal/component/discovery/consulagent/consulagent.go index 762ff6512f..49ab409b86 100644 --- a/internal/component/discovery/consulagent/consulagent.go +++ b/internal/component/discovery/consulagent/consulagent.go @@ -47,12 +47,12 @@ var DefaultArguments = Arguments{ RefreshInterval: 30 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/consulagent/consulagent_test.go b/internal/component/discovery/consulagent/consulagent_test.go index 9415faf036..6135be8cba 100644 --- a/internal/component/discovery/consulagent/consulagent_test.go +++ b/internal/component/discovery/consulagent/consulagent_test.go @@ -12,7 +12,7 @@ import ( ) func TestConvert(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` server = "localhost:8500" token = "token" datacenter = "dc" @@ -29,7 +29,7 @@ func TestConvert(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) converted := args.Convert() @@ -49,8 +49,8 @@ func TestConvert(t *testing.T) { assert.Equal(t, "/path/to/ca_file", converted.TLSConfig.CAFile) } -func TestBadTLSRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadTLSAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "localhost:8500" token = "token" datacenter = "dc" @@ -69,12 +69,12 @@ func TestBadTLSRiverConfig(t *testing.T) { // Make sure the TLSConfig Validate function is being utilized correctly. var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of ca_pem and ca_file must be configured") } -func TestBadRefreshIntervalRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadRefreshIntervalAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "localhost:8500" token = "token" datacenter = "dc" @@ -92,6 +92,6 @@ func TestBadRefreshIntervalRiverConfig(t *testing.T) { // Make sure the Refresh Interval is tested correctly. var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "refresh_interval must be greater than 0") } diff --git a/internal/component/discovery/digitalocean/digitalocean.go b/internal/component/discovery/digitalocean/digitalocean.go index 1a305b201f..d121528525 100644 --- a/internal/component/discovery/digitalocean/digitalocean.go +++ b/internal/component/discovery/digitalocean/digitalocean.go @@ -45,12 +45,12 @@ var DefaultArguments = Arguments{ EnableHTTP2: true, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. // // Validate validates the arguments. Specifically, it checks that a BearerToken or // BearerTokenFile is specified, as the DigitalOcean API requires a Bearer Token for diff --git a/internal/component/discovery/digitalocean/digitalocean_test.go b/internal/component/discovery/digitalocean/digitalocean_test.go index 629dec3910..c2d15e9661 100644 --- a/internal/component/discovery/digitalocean/digitalocean_test.go +++ b/internal/component/discovery/digitalocean/digitalocean_test.go @@ -13,22 +13,22 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` refresh_interval = "5m" port = 8181 bearer_token = "token" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) assert.Equal(t, 5*time.Minute, args.RefreshInterval) assert.Equal(t, 8181, args.Port) assert.Equal(t, "token", string(args.BearerToken)) - var fullerExampleRiverConfig = ` + var fullerExampleAlloyConfig = ` refresh_interval = "3m" port = 9119 proxy_url = "http://proxy:8080" @@ -36,7 +36,7 @@ func TestRiverUnmarshal(t *testing.T) { enable_http2 = false bearer_token = "token" ` - err = syntax.Unmarshal([]byte(fullerExampleRiverConfig), &args) + err = syntax.Unmarshal([]byte(fullerExampleAlloyConfig), &args) require.NoError(t, err) assert.Equal(t, 3*time.Minute, args.RefreshInterval) assert.Equal(t, 9119, args.Port) @@ -45,7 +45,7 @@ func TestRiverUnmarshal(t *testing.T) { assert.Equal(t, false, args.EnableHTTP2) } -func TestBadRiverConfig(t *testing.T) { +func TestBadAlloyConfig(t *testing.T) { var badConfigTooManyBearerTokens = ` refresh_interval = "5m" port = 8181 diff --git a/internal/component/discovery/dns/dns.go b/internal/component/discovery/dns/dns.go index 749a778c3d..1a03c4228f 100644 --- a/internal/component/discovery/dns/dns.go +++ b/internal/component/discovery/dns/dns.go @@ -39,12 +39,12 @@ var DefaultArguments = Arguments{ Type: "SRV", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { switch strings.ToUpper(args.Type) { case "SRV": diff --git a/internal/component/discovery/dns/dns_test.go b/internal/component/discovery/dns/dns_test.go index da0d3e4411..9215ad05a5 100644 --- a/internal/component/discovery/dns/dns_test.go +++ b/internal/component/discovery/dns/dns_test.go @@ -11,8 +11,8 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` refresh_interval = "5m" port = 54 names = ["foo.com"] @@ -20,7 +20,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) assert.Equal(t, 5*time.Minute, args.RefreshInterval) @@ -28,7 +28,7 @@ func TestRiverUnmarshal(t *testing.T) { assert.Equal(t, "foo.com", strings.Join(args.Names, ",")) } -func TestBadRiverConfig(t *testing.T) { +func TestBadAlloyConfig(t *testing.T) { var tests = []struct { Desc string Config string diff --git a/internal/component/discovery/docker/docker.go b/internal/component/discovery/docker/docker.go index 54b2afc963..5b4cbd72b9 100644 --- a/internal/component/discovery/docker/docker.go +++ b/internal/component/discovery/docker/docker.go @@ -60,12 +60,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Host == "" { return fmt.Errorf("host attribute must not be empty") diff --git a/internal/component/discovery/docker/docker_test.go b/internal/component/discovery/docker/docker_test.go index ce927fcade..df91cb6453 100644 --- a/internal/component/discovery/docker/docker_test.go +++ b/internal/component/discovery/docker/docker_test.go @@ -7,18 +7,18 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` host = "unix:///var/run/docker.sock" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` host = "unix:///var/run/docker.sock" bearer_token = "token" bearer_token_file = "/path/to/file.token" @@ -26,6 +26,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/discovery/dockerswarm/dockerswarm.go b/internal/component/discovery/dockerswarm/dockerswarm.go index 4d5ac4fd60..d40a087b0f 100644 --- a/internal/component/discovery/dockerswarm/dockerswarm.go +++ b/internal/component/discovery/dockerswarm/dockerswarm.go @@ -46,12 +46,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if _, err := url.Parse(a.Host); err != nil { return err diff --git a/internal/component/discovery/dockerswarm/dockerswarm_test.go b/internal/component/discovery/dockerswarm/dockerswarm_test.go index c56b1fde59..4a73cf3ce3 100644 --- a/internal/component/discovery/dockerswarm/dockerswarm_test.go +++ b/internal/component/discovery/dockerswarm/dockerswarm_test.go @@ -13,8 +13,8 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` host = "unix:///var/run/docker.sock" role = "nodes" port = 81 @@ -34,7 +34,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.ElementsMatch(t, []Filter{{"n1", []string{"v11", "v12"}}, {"n2", []string{"v21"}}}, args.Filters) assert.Equal(t, "unix:///var/run/docker.sock", args.Host) @@ -46,7 +46,7 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Host: "host", Role: "nodes", Port: 81, @@ -60,7 +60,7 @@ func TestConvert(t *testing.T) { }, } - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() assert.Equal(t, 2, len(promArgs.Filters)) assert.Equal(t, "n1", promArgs.Filters[0].Name) require.ElementsMatch(t, []string{"v11", "v12"}, promArgs.Filters[0].Values) @@ -75,33 +75,33 @@ func TestConvert(t *testing.T) { } func TestValidateRole(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Host: "host", Role: "nodes", RefreshInterval: time.Second, } - err := riverArgs.Validate() + err := alloyArgs.Validate() require.NoError(t, err) - riverArgs.Role = "services" - err = riverArgs.Validate() + alloyArgs.Role = "services" + err = alloyArgs.Validate() require.NoError(t, err) - riverArgs.Role = "tasks" - err = riverArgs.Validate() + alloyArgs.Role = "tasks" + err = alloyArgs.Validate() require.NoError(t, err) - riverArgs.Role = "wrong" - err = riverArgs.Validate() + alloyArgs.Role = "wrong" + err = alloyArgs.Validate() assert.Error(t, err, "invalid role wrong, expected tasks, services, or nodes") } func TestValidateUrl(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Host: "::", Role: "nodes", RefreshInterval: time.Second, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "parse \"::\": missing protocol scheme") } diff --git a/internal/component/discovery/eureka/eureka.go b/internal/component/discovery/eureka/eureka.go index ba4516b252..618d7c31d6 100644 --- a/internal/component/discovery/eureka/eureka.go +++ b/internal/component/discovery/eureka/eureka.go @@ -38,12 +38,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { url, err := url.Parse(a.Server) if err != nil { diff --git a/internal/component/discovery/file/file.go b/internal/component/discovery/file/file.go index a98163a593..30e1f2d5e3 100644 --- a/internal/component/discovery/file/file.go +++ b/internal/component/discovery/file/file.go @@ -32,7 +32,7 @@ var DefaultArguments = Arguments{ RefreshInterval: 5 * time.Minute, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/discovery/gce/gce.go b/internal/component/discovery/gce/gce.go index 60af462035..f1d4d6305f 100644 --- a/internal/component/discovery/gce/gce.go +++ b/internal/component/discovery/gce/gce.go @@ -41,7 +41,7 @@ var DefaultArguments = Arguments{ RefreshInterval: 60 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } diff --git a/internal/component/discovery/gce/gce_test.go b/internal/component/discovery/gce/gce_test.go index 6d646794c3..8d4c52bbd5 100644 --- a/internal/component/discovery/gce/gce_test.go +++ b/internal/component/discovery/gce/gce_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestUnmarshalRiver(t *testing.T) { - var riverConfig = ` +func TestUnmarshalAlloy(t *testing.T) { + var alloyConfig = ` project = "project" zone = "zone" filter = "filter" @@ -19,12 +19,12 @@ func TestUnmarshalRiver(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) } -func TestUnmarshalRiverInvalid(t *testing.T) { - var riverConfig = ` +func TestUnmarshalAlloyInvalid(t *testing.T) { + var alloyConfig = ` filter = "filter" refresh_interval = "60s" port = 80 @@ -32,7 +32,7 @@ func TestUnmarshalRiverInvalid(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) // Validate that project and zone are required. require.Error(t, err) diff --git a/internal/component/discovery/hetzner/hetzner.go b/internal/component/discovery/hetzner/hetzner.go index 631583da87..55092953fb 100644 --- a/internal/component/discovery/hetzner/hetzner.go +++ b/internal/component/discovery/hetzner/hetzner.go @@ -38,12 +38,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { switch args.Role { case string(prom_discovery.HetznerRoleRobot), string(prom_discovery.HetznerRoleHcloud): diff --git a/internal/component/discovery/hetzner/hetzner_test.go b/internal/component/discovery/hetzner/hetzner_test.go index 6b11bcf8d6..a16a94579b 100644 --- a/internal/component/discovery/hetzner/hetzner_test.go +++ b/internal/component/discovery/hetzner/hetzner_test.go @@ -10,14 +10,14 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` port = 8080 refresh_interval = "10m" role = "robot"` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, 8080, args.Port) diff --git a/internal/component/discovery/http/http.go b/internal/component/discovery/http/http.go index 257c9f6af3..bb5ea328d7 100644 --- a/internal/component/discovery/http/http.go +++ b/internal/component/discovery/http/http.go @@ -35,7 +35,7 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -func (args *Arguments) UnmarshalRiver(f func(interface{}) error) error { +func (args *Arguments) UnmarshalAlloy(f func(interface{}) error) error { *args = DefaultArguments type arguments Arguments diff --git a/internal/component/discovery/http/http_test.go b/internal/component/discovery/http/http_test.go index fb99660a38..fc03fd40d3 100644 --- a/internal/component/discovery/http/http_test.go +++ b/internal/component/discovery/http/http_test.go @@ -19,8 +19,8 @@ import ( "gotest.tools/assert" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` url = "https://www.example.com:12345/foo" refresh_interval = "14s" basic_auth { @@ -29,7 +29,7 @@ func TestRiverConfig(t *testing.T) { } ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) assert.Equal(t, args.HTTPClientConfig.BasicAuth.Username, "123") } diff --git a/internal/component/discovery/ionos/ionos.go b/internal/component/discovery/ionos/ionos.go index 4d42caa04f..5a0ef45813 100644 --- a/internal/component/discovery/ionos/ionos.go +++ b/internal/component/discovery/ionos/ionos.go @@ -38,12 +38,12 @@ var DefaultArguments = Arguments{ Port: 80, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.DatacenterID == "" { return fmt.Errorf("datacenter_id can't be empty") diff --git a/internal/component/discovery/ionos/ionos_test.go b/internal/component/discovery/ionos/ionos_test.go index 14a9adf08f..687af5f2ca 100644 --- a/internal/component/discovery/ionos/ionos_test.go +++ b/internal/component/discovery/ionos/ionos_test.go @@ -13,8 +13,8 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` datacenter_id = "datacenter_id" refresh_interval = "20s" port = 60 @@ -25,7 +25,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, "datacenter_id", args.DatacenterID) assert.Equal(t, 20*time.Second, args.RefreshInterval) @@ -35,7 +35,7 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ DatacenterID: "datacenter_id", RefreshInterval: 20 * time.Second, Port: 81, @@ -46,7 +46,7 @@ func TestConvert(t *testing.T) { }, }, } - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() assert.Equal(t, "datacenter_id", promArgs.DatacenterID) assert.Equal(t, model.Duration(20*time.Second), promArgs.RefreshInterval) assert.Equal(t, 81, promArgs.Port) @@ -55,20 +55,20 @@ func TestConvert(t *testing.T) { } func TestValidateNoDatacenterId(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ RefreshInterval: 20 * time.Second, Port: 81, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "datacenter_id can't be empty") } func TestValidateRefreshIntervalZero(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ DatacenterID: "datacenter_id", RefreshInterval: 0, Port: 81, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "refresh_interval must be greater than 0") } diff --git a/internal/component/discovery/kubelet/kubelet.go b/internal/component/discovery/kubelet/kubelet.go index 5777b25565..4130643bd8 100644 --- a/internal/component/discovery/kubelet/kubelet.go +++ b/internal/component/discovery/kubelet/kubelet.go @@ -78,7 +78,7 @@ type Arguments struct { Namespaces []string `alloy:"namespaces,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { cloneDefaultKubeletUrl := *defaultKubeletURL *args = Arguments{ @@ -89,7 +89,7 @@ func (args *Arguments) SetToDefault() { } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { // We must explicitly Validate because HTTPClientConfig is squashed and it won't run otherwise return args.HTTPClientConfig.Validate() diff --git a/internal/component/discovery/kubelet/kubelet_test.go b/internal/component/discovery/kubelet/kubelet_test.go index 29098ac7dd..d0f308f094 100644 --- a/internal/component/discovery/kubelet/kubelet_test.go +++ b/internal/component/discovery/kubelet/kubelet_test.go @@ -13,25 +13,25 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` bearer_token_file = "/path/to/file.token" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` bearer_token = "token" bearer_token_file = "/path/to/file.token" ` // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") // Make sure that URL defaults to https://localhost:10250 diff --git a/internal/component/discovery/kubernetes/kubernetes.go b/internal/component/discovery/kubernetes/kubernetes.go index e3a5b0bf6c..3ffb5e791d 100644 --- a/internal/component/discovery/kubernetes/kubernetes.go +++ b/internal/component/discovery/kubernetes/kubernetes.go @@ -38,12 +38,12 @@ var DefaultConfig = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { // We must explicitly Validate because HTTPClientConfig is squashed and it won't run otherwise return args.HTTPClientConfig.Validate() diff --git a/internal/component/discovery/kubernetes/kubernetes_test.go b/internal/component/discovery/kubernetes/kubernetes_test.go index 69779f42e3..90cb6f4b40 100644 --- a/internal/component/discovery/kubernetes/kubernetes_test.go +++ b/internal/component/discovery/kubernetes/kubernetes_test.go @@ -7,19 +7,19 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` role = "pod" kubeconfig_file = "/etc/k8s/kubeconfig.yaml" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` role = "pod" namespaces { names = ["myapp"] @@ -30,12 +30,12 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } func TestAttachMetadata(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` role = "pod" attach_metadata { node = true @@ -43,6 +43,6 @@ func TestAttachMetadata(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } diff --git a/internal/component/discovery/kuma/kuma.go b/internal/component/discovery/kuma/kuma.go index 4fdb2e2971..1f534794c3 100644 --- a/internal/component/discovery/kuma/kuma.go +++ b/internal/component/discovery/kuma/kuma.go @@ -42,12 +42,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/kuma/kuma_test.go b/internal/component/discovery/kuma/kuma_test.go index c82e97bd50..46a570bef0 100644 --- a/internal/component/discovery/kuma/kuma_test.go +++ b/internal/component/discovery/kuma/kuma_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "http://kuma-control-plane.kuma-system.svc:5676" refresh_interval = "10s" @@ -20,12 +20,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` server = "http://kuma-control-plane.kuma-system.svc:5676" tls_config { ca_file = "/path/to/ca_file" @@ -35,12 +35,12 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the TLSConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of ca_pem and ca_file must be configured") } func TestConvert(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Server: "srv", RefreshInterval: 30 * time.Second, FetchTimeout: 10 * time.Second, @@ -52,7 +52,7 @@ func TestConvert(t *testing.T) { }, } - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() require.Equal(t, "srv", promArgs.Server) require.Equal(t, model.Duration(30*time.Second), promArgs.RefreshInterval) require.Equal(t, model.Duration(10*time.Second), promArgs.FetchTimeout) @@ -62,17 +62,17 @@ func TestConvert(t *testing.T) { func TestValidateNoServers(t *testing.T) { t.Run("validate fetch timeout", func(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ RefreshInterval: 10 * time.Second, } - err := riverArgs.Validate() + err := alloyArgs.Validate() require.ErrorContains(t, err, "fetch_timeout must be greater than 0") }) t.Run("validate refresh interval", func(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ FetchTimeout: 10 * time.Second, } - err := riverArgs.Validate() + err := alloyArgs.Validate() require.ErrorContains(t, err, "refresh_interval must be greater than 0") }) } diff --git a/internal/component/discovery/linode/linode.go b/internal/component/discovery/linode/linode.go index 8d5691ebbf..3694fdf306 100644 --- a/internal/component/discovery/linode/linode.go +++ b/internal/component/discovery/linode/linode.go @@ -42,12 +42,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/linode/linode_test.go b/internal/component/discovery/linode/linode_test.go index 4512a6ff59..5b429dfb54 100644 --- a/internal/component/discovery/linode/linode_test.go +++ b/internal/component/discovery/linode/linode_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` refresh_interval = "10s" port = 8080 tag_separator = ";" @@ -22,12 +22,12 @@ func TestRiverConfig(t *testing.T) { } ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } func TestConvert(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Port: 8080, RefreshInterval: 15 * time.Second, TagSeparator: ";", @@ -40,7 +40,7 @@ func TestConvert(t *testing.T) { }, } - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() require.Equal(t, 8080, promArgs.Port) require.Equal(t, model.Duration(15*time.Second), promArgs.RefreshInterval) require.Equal(t, ";", promArgs.TagSeparator) @@ -51,10 +51,10 @@ func TestConvert(t *testing.T) { func TestValidate(t *testing.T) { t.Run("validate RefreshInterval", func(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ RefreshInterval: 0, } - err := riverArgs.Validate() + err := alloyArgs.Validate() require.ErrorContains(t, err, "refresh_interval must be greater than 0") }) } diff --git a/internal/component/discovery/marathon/marathon.go b/internal/component/discovery/marathon/marathon.go index 20081722a4..112fccc606 100644 --- a/internal/component/discovery/marathon/marathon.go +++ b/internal/component/discovery/marathon/marathon.go @@ -40,12 +40,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/marathon/marathon_test.go b/internal/component/discovery/marathon/marathon_test.go index fcc094bdfb..860abef176 100644 --- a/internal/component/discovery/marathon/marathon_test.go +++ b/internal/component/discovery/marathon/marathon_test.go @@ -13,15 +13,15 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshalWithAuthToken(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshalWithAuthToken(t *testing.T) { + alloyCfg := ` servers = ["serv1", "serv2"] refresh_interval = "20s" auth_token = "auth_token" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.ElementsMatch(t, []string{"serv1", "serv2"}, args.Servers) @@ -29,15 +29,15 @@ func TestRiverUnmarshalWithAuthToken(t *testing.T) { assert.Equal(t, alloytypes.Secret("auth_token"), args.AuthToken) } -func TestRiverUnmarshalWithAuthTokenFile(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshalWithAuthTokenFile(t *testing.T) { + alloyCfg := ` servers = ["serv1", "serv2"] refresh_interval = "20s" auth_token_file = "auth_token_file" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.ElementsMatch(t, []string{"serv1", "serv2"}, args.Servers) @@ -45,8 +45,8 @@ func TestRiverUnmarshalWithAuthTokenFile(t *testing.T) { assert.Equal(t, "auth_token_file", args.AuthTokenFile) } -func TestRiverUnmarshalWithBasicAuth(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshalWithBasicAuth(t *testing.T) { + alloyCfg := ` servers = ["serv1", "serv2"] refresh_interval = "20s" basic_auth { @@ -56,7 +56,7 @@ func TestRiverUnmarshalWithBasicAuth(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.ElementsMatch(t, []string{"serv1", "serv2"}, args.Servers) @@ -66,7 +66,7 @@ func TestRiverUnmarshalWithBasicAuth(t *testing.T) { } func TestConvert(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: time.Minute, AuthToken: "auth_token", @@ -79,7 +79,7 @@ func TestConvert(t *testing.T) { }, } - promArgs := riverArgs.Convert() + promArgs := alloyArgs.Convert() require.ElementsMatch(t, []string{"serv1", "serv2"}, promArgs.Servers) assert.Equal(t, model.Duration(time.Minute), promArgs.RefreshInterval) assert.Equal(t, promConfig.Secret("auth_token"), promArgs.AuthToken) @@ -89,27 +89,27 @@ func TestConvert(t *testing.T) { } func TestValidateNoServers(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{}, RefreshInterval: 10 * time.Second, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at least one Marathon server must be specified") } func TestValidateAuthTokenAndAuthTokenFile(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 10 * time.Second, AuthToken: "auth_token", AuthTokenFile: "auth_token_file", } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at most one of auth_token and auth_token_file must be configured") } func TestValidateAuthTokenAndBasicAuth(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 10 * time.Second, AuthToken: "auth_token", @@ -120,12 +120,12 @@ func TestValidateAuthTokenAndBasicAuth(t *testing.T) { }, }, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at most one of basic_auth, auth_token & auth_token_file must be configured") } func TestValidateAuthTokenAndBearerToken(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 10 * time.Second, AuthToken: "auth_token", @@ -133,12 +133,12 @@ func TestValidateAuthTokenAndBearerToken(t *testing.T) { BearerToken: "bearerToken", }, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at most one of bearer_token, bearer_token_file, auth_token & auth_token_file must be configured") } func TestValidateAuthTokenAndBearerTokenFile(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 10 * time.Second, AuthToken: "auth_token", @@ -146,12 +146,12 @@ func TestValidateAuthTokenAndBearerTokenFile(t *testing.T) { BearerTokenFile: "bearerToken", }, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at most one of bearer_token, bearer_token_file, auth_token & auth_token_file must be configured") } func TestValidateAuthTokenAndAuthorization(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 10 * time.Second, AuthToken: "auth_token", @@ -161,15 +161,15 @@ func TestValidateAuthTokenAndAuthorization(t *testing.T) { }, }, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "at most one of auth_token, auth_token_file & authorization must be configured") } func TestValidateRefreshInterval(t *testing.T) { - riverArgs := Arguments{ + alloyArgs := Arguments{ Servers: []string{"serv1", "serv2"}, RefreshInterval: 0, } - err := riverArgs.Validate() + err := alloyArgs.Validate() assert.Error(t, err, "refresh_interval must be greater than 0") } diff --git a/internal/component/discovery/nerve/nerve.go b/internal/component/discovery/nerve/nerve.go index 85faad6cc8..fbb71fdc86 100644 --- a/internal/component/discovery/nerve/nerve.go +++ b/internal/component/discovery/nerve/nerve.go @@ -36,12 +36,12 @@ var DefaultArguments = Arguments{ Timeout: 10 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Timeout <= 0 { return fmt.Errorf("timeout must be greater than 0") diff --git a/internal/component/discovery/nerve/nerve_test.go b/internal/component/discovery/nerve/nerve_test.go index 269ca5b057..44b2ee7d9e 100644 --- a/internal/component/discovery/nerve/nerve_test.go +++ b/internal/component/discovery/nerve/nerve_test.go @@ -7,29 +7,29 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` servers = ["1.2.3.4"] paths = ["/nerve/services/your_http_service/services", "/nerve/services/your_tcp_service/services"] timeout = "15s" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { +func TestBadAlloyConfig(t *testing.T) { var ( args Arguments - riverConfig string + alloyConfig string ) - riverConfig = ` + alloyConfig = ` servers = ["1.2.3.4"] paths = ["/nerve/services/your_http_service/services", "/nerve/services/your_tcp_service/services"] timeout = "0s" ` - require.ErrorContains(t, syntax.Unmarshal([]byte(riverConfig), &args), "timeout must be greater than 0") + require.ErrorContains(t, syntax.Unmarshal([]byte(alloyConfig), &args), "timeout must be greater than 0") } diff --git a/internal/component/discovery/nomad/nomad.go b/internal/component/discovery/nomad/nomad.go index 22f06de73b..32b7bfccc6 100644 --- a/internal/component/discovery/nomad/nomad.go +++ b/internal/component/discovery/nomad/nomad.go @@ -46,12 +46,12 @@ var DefaultArguments = Arguments{ TagSeparator: ",", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if strings.TrimSpace(a.Server) == "" { return fmt.Errorf("nomad SD configuration requires a server address") diff --git a/internal/component/discovery/nomad/nomad_test.go b/internal/component/discovery/nomad/nomad_test.go index 24597cce83..3f71ab11ab 100644 --- a/internal/component/discovery/nomad/nomad_test.go +++ b/internal/component/discovery/nomad/nomad_test.go @@ -10,8 +10,8 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` allow_stale = false namespace = "foo" refresh_interval = "20s" @@ -23,7 +23,7 @@ func TestRiverUnmarshal(t *testing.T) { proxy_url = "http://example:8080"` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, false, args.AllowStale) @@ -38,7 +38,7 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverArgsOAuth := Arguments{ + alloyArgsOAuth := Arguments{ AllowStale: false, Namespace: "test", RefreshInterval: time.Minute, @@ -47,7 +47,7 @@ func TestConvert(t *testing.T) { TagSeparator: ";", } - promArgs := riverArgsOAuth.Convert() + promArgs := alloyArgsOAuth.Convert() assert.Equal(t, false, promArgs.AllowStale) assert.Equal(t, "test", promArgs.Namespace) assert.Equal(t, "a", promArgs.Region) @@ -57,9 +57,9 @@ func TestConvert(t *testing.T) { } func TestValidate(t *testing.T) { - riverArgsNoServer := Arguments{ + alloyArgsNoServer := Arguments{ Server: "", } - err := riverArgsNoServer.Validate() + err := alloyArgsNoServer.Validate() assert.Error(t, err, "nomad SD configuration requires a server address") } diff --git a/internal/component/discovery/openstack/openstack.go b/internal/component/discovery/openstack/openstack.go index 5ac5f038d1..38dc18e466 100644 --- a/internal/component/discovery/openstack/openstack.go +++ b/internal/component/discovery/openstack/openstack.go @@ -54,12 +54,12 @@ var DefaultArguments = Arguments{ Availability: "public", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { switch args.Availability { case "public", "internal", "admin": diff --git a/internal/component/discovery/ovhcloud/ovhcloud.go b/internal/component/discovery/ovhcloud/ovhcloud.go index c6a51bf641..b7b8e595a2 100644 --- a/internal/component/discovery/ovhcloud/ovhcloud.go +++ b/internal/component/discovery/ovhcloud/ovhcloud.go @@ -42,12 +42,12 @@ var DefaultArguments = Arguments{ RefreshInterval: 60 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Endpoint == "" { return fmt.Errorf("endpoint cannot be empty") diff --git a/internal/component/discovery/puppetdb/puppetdb.go b/internal/component/discovery/puppetdb/puppetdb.go index 297060cea4..5c5e8d35f2 100644 --- a/internal/component/discovery/puppetdb/puppetdb.go +++ b/internal/component/discovery/puppetdb/puppetdb.go @@ -41,12 +41,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { parsedURL, err := url.Parse(args.URL) if err != nil { diff --git a/internal/component/discovery/puppetdb/puppetdb_test.go b/internal/component/discovery/puppetdb/puppetdb_test.go index e40f51fa55..4b5a404855 100644 --- a/internal/component/discovery/puppetdb/puppetdb_test.go +++ b/internal/component/discovery/puppetdb/puppetdb_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/assert" ) -var exampleRiverConfig = ` +var exampleAlloyConfig = ` url = "https://www.example.com" query = "abc" include_parameters = true @@ -22,9 +22,9 @@ basic_auth { } ` -func TestRiverConfig(t *testing.T) { +func TestAlloyConfig(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) assert.Equal(t, args.HTTPClientConfig.BasicAuth.Username, "123") assert.Equal(t, args.RefreshInterval, time.Minute) @@ -36,7 +36,7 @@ func TestRiverConfig(t *testing.T) { func TestConvert(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) sd := args.Convert() @@ -48,21 +48,21 @@ func TestConvert(t *testing.T) { } func TestValidate(t *testing.T) { - riverArgsBadUrl := Arguments{ + alloyArgsBadUrl := Arguments{ URL: string([]byte{0x7f}), // a control character to make url.Parse fail } - err := riverArgsBadUrl.Validate() + err := alloyArgsBadUrl.Validate() assert.ErrorContains(t, err, "net/url: invalid") - riverArgsBadScheme := Arguments{ + alloyArgsBadScheme := Arguments{ URL: "smtp://foo.bar", } - err = riverArgsBadScheme.Validate() + err = alloyArgsBadScheme.Validate() assert.ErrorContains(t, err, "URL scheme must be") - riverArgsNoHost := Arguments{ + alloyArgsNoHost := Arguments{ URL: "http://#abc", } - err = riverArgsNoHost.Validate() + err = alloyArgsNoHost.Validate() assert.ErrorContains(t, err, "host is missing in URL") } diff --git a/internal/component/discovery/relabel/relabel_test.go b/internal/component/discovery/relabel/relabel_test.go index 5550c4d722..8340b4d8e4 100644 --- a/internal/component/discovery/relabel/relabel_test.go +++ b/internal/component/discovery/relabel/relabel_test.go @@ -13,7 +13,7 @@ import ( ) func TestRelabelConfigApplication(t *testing.T) { - riverArguments := ` + alloyArguments := ` targets = [ { "__meta_foo" = "foo", "__meta_bar" = "bar", "__address__" = "localhost", "instance" = "one", "app" = "backend", "__tmp_a" = "tmp" }, { "__meta_foo" = "foo", "__meta_bar" = "bar", "__address__" = "localhost", "instance" = "two", "app" = "db", "__tmp_b" = "tmp" }, @@ -60,7 +60,7 @@ rule { } var args relabel.Arguments - require.NoError(t, syntax.Unmarshal([]byte(riverArguments), &args)) + require.NoError(t, syntax.Unmarshal([]byte(alloyArguments), &args)) tc, err := componenttest.NewControllerFromID(nil, "discovery.relabel") require.NoError(t, err) diff --git a/internal/component/discovery/scaleway/scaleway.go b/internal/component/discovery/scaleway/scaleway.go index c760a4d965..d5d627efa9 100644 --- a/internal/component/discovery/scaleway/scaleway.go +++ b/internal/component/discovery/scaleway/scaleway.go @@ -60,12 +60,12 @@ var DefaultArguments = Arguments{ EnableHTTP2: true, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Project == "" { return fmt.Errorf("project_id must not be empty") diff --git a/internal/component/discovery/serverset/serverset.go b/internal/component/discovery/serverset/serverset.go index 58e7844f34..0bd8391961 100644 --- a/internal/component/discovery/serverset/serverset.go +++ b/internal/component/discovery/serverset/serverset.go @@ -36,12 +36,12 @@ var DefaultArguments = Arguments{ Timeout: 10 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if len(args.Servers) == 0 { return errors.New("discovery.serverset config must contain at least one Zookeeper server") diff --git a/internal/component/discovery/triton/triton.go b/internal/component/discovery/triton/triton.go index 7b7e990e6b..a70d2a89d4 100644 --- a/internal/component/discovery/triton/triton.go +++ b/internal/component/discovery/triton/triton.go @@ -44,12 +44,12 @@ var DefaultArguments = Arguments{ Version: 1, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.RefreshInterval <= 0 { return fmt.Errorf("refresh_interval must be greater than 0") diff --git a/internal/component/discovery/triton/triton_test.go b/internal/component/discovery/triton/triton_test.go index a4339caf0a..b8a0d26b44 100644 --- a/internal/component/discovery/triton/triton_test.go +++ b/internal/component/discovery/triton/triton_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` account = "TRITON-987654" dns_suffix = "triton.example.com" endpoint = "triton.example.com" @@ -19,12 +19,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` account = "TRITON-987654" dns_suffix = "triton.example.com" endpoint = "triton.example.com" @@ -37,6 +37,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the TLSConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of ca_pem and ca_file must be configured") } diff --git a/internal/component/discovery/uyuni/uyuni.go b/internal/component/discovery/uyuni/uyuni.go index 6af2cea094..894a16f9b3 100644 --- a/internal/component/discovery/uyuni/uyuni.go +++ b/internal/component/discovery/uyuni/uyuni.go @@ -50,12 +50,12 @@ var DefaultArguments = Arguments{ FollowRedirects: config.DefaultHTTPClientConfig.FollowRedirects, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { _, err := url.Parse(a.Server) if err != nil { diff --git a/internal/component/local/file/file.go b/internal/component/local/file/file.go index 193f7a2791..c4b2984a8b 100644 --- a/internal/component/local/file/file.go +++ b/internal/component/local/file/file.go @@ -58,7 +58,7 @@ var DefaultArguments = Arguments{ PollFrequency: time.Minute, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/local/file_match/file.go b/internal/component/local/file_match/file.go index 15c9fdae95..47fa2e4e6a 100644 --- a/internal/component/local/file_match/file.go +++ b/internal/component/local/file_match/file.go @@ -62,7 +62,7 @@ func getDefault() Arguments { return Arguments{SyncPeriod: 10 * time.Second} } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = getDefault() } diff --git a/internal/component/loki/echo/echo.go b/internal/component/loki/echo/echo.go index 556042fc75..fb54b352cc 100644 --- a/internal/component/loki/echo/echo.go +++ b/internal/component/loki/echo/echo.go @@ -35,7 +35,7 @@ type Exports struct { // DefaultArguments defines the default settings for log scraping. var DefaultArguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } diff --git a/internal/component/loki/process/metric/counters.go b/internal/component/loki/process/metric/counters.go index c5b6e15d21..0fbfffa80a 100644 --- a/internal/component/loki/process/metric/counters.go +++ b/internal/component/loki/process/metric/counters.go @@ -36,12 +36,12 @@ var DefaultCounterConfig = CounterConfig{ MaxIdle: 5 * time.Minute, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (c *CounterConfig) SetToDefault() { *c = DefaultCounterConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (c *CounterConfig) Validate() error { if c.MaxIdle < 1*time.Second { return fmt.Errorf("max_idle_duration must be greater or equal than 1s") diff --git a/internal/component/loki/process/metric/gauges.go b/internal/component/loki/process/metric/gauges.go index 62d3c258df..4f56dd2462 100644 --- a/internal/component/loki/process/metric/gauges.go +++ b/internal/component/loki/process/metric/gauges.go @@ -40,12 +40,12 @@ type GaugeConfig struct { Action string `alloy:"action,attr"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (g *GaugeConfig) SetToDefault() { *g = DefaultGaugeConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (g *GaugeConfig) Validate() error { if g.MaxIdle < 1*time.Second { return fmt.Errorf("max_idle_duration must be greater or equal than 1s") diff --git a/internal/component/loki/process/metric/histograms.go b/internal/component/loki/process/metric/histograms.go index 447ad62ae6..e7d8f27ec1 100644 --- a/internal/component/loki/process/metric/histograms.go +++ b/internal/component/loki/process/metric/histograms.go @@ -29,12 +29,12 @@ type HistogramConfig struct { Buckets []float64 `alloy:"buckets,attr"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (h *HistogramConfig) SetToDefault() { *h = DefaultHistogramConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (h *HistogramConfig) Validate() error { if h.MaxIdle < 1*time.Second { return fmt.Errorf("max_idle_duration must be greater or equal than 1s") diff --git a/internal/component/loki/process/process_test.go b/internal/component/loki/process/process_test.go index b874f4a0de..a9780e6c67 100644 --- a/internal/component/loki/process/process_test.go +++ b/internal/component/loki/process/process_test.go @@ -60,7 +60,7 @@ func TestJSONLabelsStage(t *testing.T) { } }` - // Unmarshal the River relabel rules into a custom struct, as we don't have + // Unmarshal the Alloy relabel rules into a custom struct, as we don't have // an easy way to refer to a loki.LogsReceiver value for the forward_to // argument. type cfg struct { @@ -147,7 +147,7 @@ stage.label_keep { values = [ "foo", "baz", "filename" ] }` - // Unmarshal the River relabel rules into a custom struct, as we don't have + // Unmarshal the Alloy relabel rules into a custom struct, as we don't have // an easy way to refer to a loki.LogsReceiver value for the forward_to // argument. type cfg struct { @@ -242,7 +242,7 @@ stage.labels { values = { src = "stream" } }` - // Unmarshal the River relabel rules into a custom struct, as we don't have + // Unmarshal the Alloy relabel rules into a custom struct, as we don't have // an easy way to refer to a loki.LogsReceiver value for the forward_to // argument. type cfg struct { @@ -408,7 +408,7 @@ func TestDeadlockWithFrequentUpdates(t *testing.T) { } }` - // Unmarshal the River relabel rules into a custom struct, as we don't have + // Unmarshal the Alloy relabel rules into a custom struct, as we don't have // an easy way to refer to a loki.LogsReceiver value for the forward_to // argument. type cfg struct { diff --git a/internal/component/loki/process/stages/drop_test.go b/internal/component/loki/process/stages/drop_test.go index f7fc44f8a5..736ddfe5d1 100644 --- a/internal/component/loki/process/stages/drop_test.go +++ b/internal/component/loki/process/stages/drop_test.go @@ -16,7 +16,7 @@ import ( ) // Not all these are tested but are here to make sure the different types marshal without error -var testDropRiver = ` +var testDropAlloy = ` stage.json { expressions = { "app" = "", "msg" = "" } } @@ -432,7 +432,7 @@ func TestDropPipeline(t *testing.T) { registry := prometheus.NewRegistry() plName := "test_drop_pipeline" logger := util.TestAlloyLogger(t) - pl, err := NewPipeline(logger, loadConfig(testDropRiver), &plName, registry) + pl, err := NewPipeline(logger, loadConfig(testDropAlloy), &plName, registry) require.NoError(t, err) out := processEntries(pl, newEntry(nil, nil, testMatchLogLineApp1, time.Now()), diff --git a/internal/component/loki/process/stages/json_test.go b/internal/component/loki/process/stages/json_test.go index b157aa815c..79bb01c2ee 100644 --- a/internal/component/loki/process/stages/json_test.go +++ b/internal/component/loki/process/stages/json_test.go @@ -14,13 +14,13 @@ import ( "github.com/grafana/alloy/syntax" ) -var testJSONRiverSingleStageWithoutSource = ` +var testJSONAlloySingleStageWithoutSource = ` stage.json { expressions = {"out" = "message", "app" = "", "nested" = "", duration = "", unknown = "" } } ` -var testJSONRiverMultiStageWithSource = ` +var testJSONAlloyMultiStageWithSource = ` stage.json { expressions = { "extra" = "" } } @@ -53,7 +53,7 @@ func TestPipeline_JSON(t *testing.T) { expectedExtract map[string]interface{} }{ "successfully run a pipeline with 1 json stage without source": { - testJSONRiverSingleStageWithoutSource, + testJSONAlloySingleStageWithoutSource, testJSONLogLine, map[string]interface{}{ "out": "this is a log line", @@ -64,7 +64,7 @@ func TestPipeline_JSON(t *testing.T) { }, }, "successfully run a pipeline with 2 json stages with source": { - testJSONRiverMultiStageWithSource, + testJSONAlloyMultiStageWithSource, testJSONLogLine, map[string]interface{}{ "extra": "{\"user\":\"marco\"}", @@ -95,10 +95,10 @@ var jsonCfg = ` ` // nolint -func TestRiver(t *testing.T) { +func TestAlloy(t *testing.T) { t.Parallel() - // testing that we can use river data into the config structure. + // testing that we can use Alloy data into the config structure. var got JSONConfig err := syntax.Unmarshal([]byte(jsonCfg), &got) assert.NoError(t, err, "error while un-marshalling config: %s", err) diff --git a/internal/component/loki/process/stages/limit_test.go b/internal/component/loki/process/stages/limit_test.go index 1a77afad27..22fbbaf87e 100644 --- a/internal/component/loki/process/stages/limit_test.go +++ b/internal/component/loki/process/stages/limit_test.go @@ -13,7 +13,7 @@ import ( ) // Not all these are tested but are here to make sure the different types marshal without error -var testLimitWaitRiver = ` +var testLimitWaitAlloy = ` stage.json { expressions = { "app" = "", "msg" = "" } } @@ -24,7 +24,7 @@ stage.limit { }` // Not all these are tested but are here to make sure the different types marshal without error -var testLimitDropRiver = ` +var testLimitDropAlloy = ` stage.json { expressions = { "app" = "", "msg" = "" } } @@ -34,7 +34,7 @@ stage.limit { drop = true }` -var testLimitByLabelRiver = ` +var testLimitByLabelAlloy = ` stage.json { expressions = { "app" = "", "msg" = "" } } @@ -58,7 +58,7 @@ var plName = "testPipeline" // TestLimitPipeline is used to verify we properly parse the yaml config and create a working pipeline func TestLimitWaitPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitWaitRiver), &plName, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitWaitAlloy), &plName, registry) logs := make([]Entry, 0) logCount := 5 for i := 0; i < logCount; i++ { @@ -76,7 +76,7 @@ func TestLimitWaitPipeline(t *testing.T) { // TestLimitPipeline is used to verify we properly parse the yaml config and create a working pipeline func TestLimitDropPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitDropRiver), &plName, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitDropAlloy), &plName, registry) logs := make([]Entry, 0) logCount := 10 for i := 0; i < logCount; i++ { @@ -94,7 +94,7 @@ func TestLimitDropPipeline(t *testing.T) { // TestLimitByLabelPipeline is used to verify we properly parse the yaml config and create a working pipeline func TestLimitByLabelPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitByLabelRiver), &plName, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testLimitByLabelAlloy), &plName, registry) logs := make([]Entry, 0) logCount := 5 for i := 0; i < logCount; i++ { diff --git a/internal/component/loki/process/stages/logfmt_test.go b/internal/component/loki/process/stages/logfmt_test.go index 6923466bef..47503ce7fc 100644 --- a/internal/component/loki/process/stages/logfmt_test.go +++ b/internal/component/loki/process/stages/logfmt_test.go @@ -11,12 +11,12 @@ import ( util_log "github.com/grafana/loki/pkg/util/log" ) -var testLogfmtRiverSingleStageWithoutSource = ` +var testLogfmtAlloySingleStageWithoutSource = ` stage.logfmt { mapping = { "out" = "message", "app" = "", "duration" = "", "unknown" = "" } }` -var testLogfmtRiverMultiStageWithSource = ` +var testLogfmtAlloyMultiStageWithSource = ` stage.logfmt { mapping = { "extra" = "" } } @@ -37,7 +37,7 @@ func TestLogfmt(t *testing.T) { expectedExtract map[string]interface{} }{ "successfully run a pipeline with 1 logfmt stage without source": { - testLogfmtRiverSingleStageWithoutSource, + testLogfmtAlloySingleStageWithoutSource, testLogfmtLogLine, map[string]interface{}{ "out": "this is a log line", @@ -46,7 +46,7 @@ func TestLogfmt(t *testing.T) { }, }, "successfully run a pipeline with 2 logfmt stages with source": { - testLogfmtRiverMultiStageWithSource, + testLogfmtAlloyMultiStageWithSource, testLogfmtLogLine, map[string]interface{}{ "extra": "user=foo", diff --git a/internal/component/loki/process/stages/match_test.go b/internal/component/loki/process/stages/match_test.go index 9f8be461ca..d1f5e05027 100644 --- a/internal/component/loki/process/stages/match_test.go +++ b/internal/component/loki/process/stages/match_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" ) -var testMatchRiver = ` +var testMatchAlloy = ` stage.json { expressions = { "app" = "" } } @@ -65,7 +65,7 @@ func TestMatchStage(t *testing.T) { registry := prometheus.NewRegistry() plName := "test_match_pipeline" logger := util.TestAlloyLogger(t) - pl, err := NewPipeline(logger, loadConfig(testMatchRiver), &plName, registry) + pl, err := NewPipeline(logger, loadConfig(testMatchAlloy), &plName, registry) if err != nil { t.Fatal(err) } diff --git a/internal/component/loki/process/stages/metric.go b/internal/component/loki/process/stages/metric.go index 7d39460eb0..e364bf9ca6 100644 --- a/internal/component/loki/process/stages/metric.go +++ b/internal/component/loki/process/stages/metric.go @@ -33,7 +33,7 @@ var ( ) // MetricConfig is a single metrics configuration. -// TODO(@tpaschalis) Rework once River squashing is implemented. +// TODO(@tpaschalis) Rework once Alloy squashing is implemented. type MetricConfig struct { Counter *metric.CounterConfig `alloy:"counter,block,optional"` Gauge *metric.GaugeConfig `alloy:"gauge,block,optional"` diff --git a/internal/component/loki/process/stages/metric_test.go b/internal/component/loki/process/stages/metric_test.go index 23f06f1ce0..9bc1747faf 100644 --- a/internal/component/loki/process/stages/metric_test.go +++ b/internal/component/loki/process/stages/metric_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" ) -var testMetricRiver = ` +var testMetricAlloy = ` stage.json { expressions = { "app" = "app", "payload" = "payload" } } @@ -108,7 +108,7 @@ loki_process_custom_total_lines_count{test="app"} 2 func TestMetricsPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testMetricRiver), nil, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testMetricAlloy), nil, registry) if err != nil { t.Fatal(err) } @@ -159,7 +159,7 @@ func TestPipelineWithMissingKey_Metrics(t *testing.T) { var buf bytes.Buffer w := log.NewSyncWriter(&buf) logger := log.NewLogfmtLogger(w) - pl, err := NewPipeline(logger, loadConfig(testMetricRiver), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testMetricAlloy), nil, prometheus.DefaultRegisterer) if err != nil { t.Fatal(err) } @@ -171,7 +171,7 @@ func TestPipelineWithMissingKey_Metrics(t *testing.T) { } } -var testMetricWithDropRiver = ` +var testMetricWithDropAlloy = ` stage.json { expressions = { "app" = "app", "drop" = "drop" } } @@ -198,7 +198,7 @@ loki_process_custom_loki_count 1 func TestMetricsWithDropInPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testMetricWithDropRiver), nil, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testMetricWithDropAlloy), nil, registry) if err != nil { t.Fatal(err) } diff --git a/internal/component/loki/process/stages/multiline.go b/internal/component/loki/process/stages/multiline.go index 5647a2aa2b..d0853a00e5 100644 --- a/internal/component/loki/process/stages/multiline.go +++ b/internal/component/loki/process/stages/multiline.go @@ -36,12 +36,12 @@ var DefaultMultilineConfig = MultilineConfig{ MaxWaitTime: 3 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *MultilineConfig) SetToDefault() { *args = DefaultMultilineConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *MultilineConfig) Validate() error { if args.MaxWaitTime <= 0 { return fmt.Errorf("max_wait_time must be greater than 0") diff --git a/internal/component/loki/process/stages/output_test.go b/internal/component/loki/process/stages/output_test.go index eb06048fcc..925fa15ede 100644 --- a/internal/component/loki/process/stages/output_test.go +++ b/internal/component/loki/process/stages/output_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ) -var testOutputRiver = ` +var testOutputAlloy = ` stage.json { expressions = { "out" = "message" } } @@ -44,7 +44,7 @@ var testOutputLogLineWithMissingKey = ` func TestPipeline_Output(t *testing.T) { logger := util.TestAlloyLogger(t) - pl, err := NewPipeline(logger, loadConfig(testOutputRiver), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testOutputAlloy), nil, prometheus.DefaultRegisterer) require.NoError(t, err) out := processEntries(pl, newEntry(nil, nil, testOutputLogLine, time.Now()))[0] @@ -55,7 +55,7 @@ func TestPipelineWithMissingKey_Output(t *testing.T) { var buf bytes.Buffer w := log.NewSyncWriter(&buf) logger := log.NewLogfmtLogger(w) - pl, err := NewPipeline(logger, loadConfig(testOutputRiver), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testOutputAlloy), nil, prometheus.DefaultRegisterer) require.NoError(t, err) _ = processEntries(pl, newEntry(nil, nil, testOutputLogLineWithMissingKey, time.Now())) diff --git a/internal/component/loki/process/stages/pack.go b/internal/component/loki/process/stages/pack.go index 32117861c3..a8cd50ca09 100644 --- a/internal/component/loki/process/stages/pack.go +++ b/internal/component/loki/process/stages/pack.go @@ -110,7 +110,7 @@ var DefaultPackConfig = PackConfig{ IngestTimestamp: true, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (p *PackConfig) SetToDefault() { *p = DefaultPackConfig } diff --git a/internal/component/loki/process/stages/pack_test.go b/internal/component/loki/process/stages/pack_test.go index a2602560f2..a7e24d3cd1 100644 --- a/internal/component/loki/process/stages/pack_test.go +++ b/internal/component/loki/process/stages/pack_test.go @@ -16,7 +16,7 @@ import ( ) // Not all these are tested but are here to make sure the different types marshal without error -var testPackRiver = ` +var testPackAlloy = ` stage.match { selector = "{container=\"foo\"}" stage.pack { @@ -32,13 +32,13 @@ stage.match { } }` -// TestDropPipeline is used to verify we properly parse the river config and +// TestDropPipeline is used to verify we properly parse the Alloy config and // create a working pipeline. func TestPackPipeline(t *testing.T) { registry := prometheus.NewRegistry() plName := "test_pack_pipeline" logger := util.TestAlloyLogger(t) - pl, err := NewPipeline(logger, loadConfig(testPackRiver), &plName, registry) + pl, err := NewPipeline(logger, loadConfig(testPackAlloy), &plName, registry) require.NoError(t, err) l1Lbls := model.LabelSet{ diff --git a/internal/component/loki/process/stages/pipeline_test.go b/internal/component/loki/process/stages/pipeline_test.go index 62b4c91124..980c82b5a1 100644 --- a/internal/component/loki/process/stages/pipeline_test.go +++ b/internal/component/loki/process/stages/pipeline_test.go @@ -64,7 +64,7 @@ var ( processedTestLine = `11.11.11.11 - frank [25/Jan/2000:14:00:01 -0500] "GET /1986.js HTTP/1.1" 200 932 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 GTB6"` ) -var testMultiStageRiver = ` +var testMultiStageAlloy = ` stage.match { selector = "{match=\"true\"}" stage.docker {} @@ -88,7 +88,7 @@ stage.match { action = "drop" }` -var testLabelsFromJSONRiver = ` +var testLabelsFromJSONAlloy = ` stage.json { expressions = { "app" = "", "message" = "" } } @@ -100,7 +100,7 @@ stage.output { }` func TestNewPipeline(t *testing.T) { - p, err := NewPipeline(util_log.Logger, loadConfig(testMultiStageRiver), nil, prometheus.DefaultRegisterer) + p, err := NewPipeline(util_log.Logger, loadConfig(testMultiStageAlloy), nil, prometheus.DefaultRegisterer) if err != nil { panic(err) } @@ -125,7 +125,7 @@ func TestPipeline_Process(t *testing.T) { expectedLabels model.LabelSet }{ "happy path": { - testMultiStageRiver, + testMultiStageAlloy, rawTestLine, processedTestLine, time.Now(), @@ -141,7 +141,7 @@ func TestPipeline_Process(t *testing.T) { }, }, "no match": { - testMultiStageRiver, + testMultiStageAlloy, rawTestLine, rawTestLine, ct, @@ -154,7 +154,7 @@ func TestPipeline_Process(t *testing.T) { }, }, "should initialize the extracted map with the initial labels": { - testMultiStageRiver, + testMultiStageAlloy, rawTestLine, processedTestLine, time.Now(), @@ -173,7 +173,7 @@ func TestPipeline_Process(t *testing.T) { }, }, "should set a label from value extracted from JSON": { - testLabelsFromJSONRiver, + testLabelsFromJSONAlloy, `{"message":"hello world","app":"api"}`, "hello world", ct, @@ -184,7 +184,7 @@ func TestPipeline_Process(t *testing.T) { }, }, "should not set a label if the field does not exist in the JSON": { - testLabelsFromJSONRiver, + testLabelsFromJSONAlloy, `{"message":"hello world"}`, "hello world", ct, @@ -193,7 +193,7 @@ func TestPipeline_Process(t *testing.T) { map[model.LabelName]model.LabelValue{}, }, "should not set a label if the value extracted from JSON is null": { - testLabelsFromJSONRiver, + testLabelsFromJSONAlloy, `{"message":"hello world","app":null}`, "hello world", ct, @@ -241,13 +241,13 @@ func BenchmarkPipeline(b *testing.B) { }{ { "two stage info level", - loadConfig(testMultiStageRiver), + loadConfig(testMultiStageAlloy), infoLogger, rawTestLine, }, { "two stage debug level", - loadConfig(testMultiStageRiver), + loadConfig(testMultiStageAlloy), debugLogger, rawTestLine, }, @@ -279,7 +279,7 @@ func BenchmarkPipeline(b *testing.B) { func TestPipeline_Wrap(t *testing.T) { now := time.Now() - p, err := NewPipeline(util_log.Logger, loadConfig(testMultiStageRiver), nil, prometheus.DefaultRegisterer) + p, err := NewPipeline(util_log.Logger, loadConfig(testMultiStageAlloy), nil, prometheus.DefaultRegisterer) if err != nil { panic(err) } diff --git a/internal/component/loki/process/stages/regex_test.go b/internal/component/loki/process/stages/regex_test.go index 3adc3bd7d8..ecd4d3486c 100644 --- a/internal/component/loki/process/stages/regex_test.go +++ b/internal/component/loki/process/stages/regex_test.go @@ -16,13 +16,13 @@ import ( var protocolStr = "protocol" -var testRegexRiverSingleStageWithoutSource = ` +var testRegexAlloySingleStageWithoutSource = ` stage.regex { expression = "^(?P\\S+) (?P\\S+) (?P\\S+) \\[(?P[\\w:/]+\\s[+\\-]\\d{4})\\] \"(?P\\S+)\\s?(?P\\S+)?\\s?(?P\\S+)?\" (?P\\d{3}|-) (?P\\d+|-)\\s?\"?(?P[^\"]*)\"?\\s?\"?(?P[^\"]*)?\"?$" } ` -var testRegexRiverMultiStageWithSource = ` +var testRegexAlloyMultiStageWithSource = ` stage.regex { expression = "^(?P\\S+) (?P\\S+) (?P\\S+) \\[(?P[\\w:/]+\\s[+\\-]\\d{4})\\] \"(?P\\S+)\\s?(?P\\S+)?\\s?(?P\\S+)?\" (?P\\d{3}|-) (?P\\d+|-)\\s?\"?(?P[^\"]*)\"?\\s?\"?(?P[^\"]*)?\"?$" } @@ -32,7 +32,7 @@ stage.regex { } ` -var testRegexRiverSourceWithMissingKey = ` +var testRegexAlloySourceWithMissingKey = ` stage.json { expressions = { "time" = "" } } @@ -65,7 +65,7 @@ func TestPipeline_Regex(t *testing.T) { expectedExtract map[string]interface{} }{ "successfully run a pipeline with 1 regex stage without source": { - testRegexRiverSingleStageWithoutSource, + testRegexAlloySingleStageWithoutSource, testRegexLogLine, map[string]interface{}{ "ip": "11.11.11.11", @@ -82,7 +82,7 @@ func TestPipeline_Regex(t *testing.T) { }, }, "successfully run a pipeline with 2 regex stages with source": { - testRegexRiverMultiStageWithSource, + testRegexAlloyMultiStageWithSource, testRegexLogLine, map[string]interface{}{ "ip": "11.11.11.11", @@ -123,7 +123,7 @@ func TestPipelineWithMissingKey_Regex(t *testing.T) { var buf bytes.Buffer w := log.NewSyncWriter(&buf) logger := log.NewLogfmtLogger(w) - pl, err := NewPipeline(logger, loadConfig(testRegexRiverSourceWithMissingKey), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testRegexAlloySourceWithMissingKey), nil, prometheus.DefaultRegisterer) if err != nil { t.Fatal(err) } diff --git a/internal/component/loki/process/stages/replace_test.go b/internal/component/loki/process/stages/replace_test.go index 2f2430c5ff..021961180f 100644 --- a/internal/component/loki/process/stages/replace_test.go +++ b/internal/component/loki/process/stages/replace_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" ) -var testReplaceRiverSingleStageWithoutSource = ` +var testReplaceAlloySingleStageWithoutSource = ` stage.replace { expression = "11.11.11.11 - (\\S+) .*" replace = "dummy" } ` -var testReplaceRiverMultiStageWithSource = ` +var testReplaceAlloyMultiStageWithSource = ` stage.json { expressions = { "level" = "", "msg" = "" } } @@ -29,28 +29,28 @@ stage.replace { } ` -var testReplaceRiverWithNamedCapturedGroupWithTemplate = ` +var testReplaceAlloyWithNamedCapturedGroupWithTemplate = ` stage.replace { expression = "^(?P\\S+) (?P\\S+) (?P\\S+) \\[(?P[\\w:/]+\\s[+\\-]\\d{4})\\] \"(?P\\S+)\\s?(?P\\S+)?\\s?(?P\\S+)?\" (?P\\d{3}|-) (\\d+|-)\\s?\"?(?P[^\"]*)\"?\\s?\"?(?P[^\"]*)?\"?$" replace = "{{ if eq .Value \"200\" }}{{ Replace .Value \"200\" \"HttpStatusOk\" -1 }}{{ else }}{{ .Value | ToUpper }}{{ end }}" } ` -var testReplaceRiverWithNestedCapturedGroups = ` +var testReplaceAlloyWithNestedCapturedGroups = ` stage.replace { expression = "(?P^(?P\\S+) (?P\\S+) (?P\\S+)) \\[(?P[\\w:/]+\\s[+\\-]\\d{4})\\] \"(?P(?P\\S+)\\s?(?P\\S+)?)\\s?(?P\\S+)?\" (?P\\d{3}|-) (\\d+|-)\\s?\"?(?P[^\"]*)\"?\\s?\"?(?P[^\"]*)?\"?$" replace = "{{ if eq .Value \"200\" }}{{ Replace .Value \"200\" \"HttpStatusOk\" -1 }}{{ else }}{{ .Value | ToUpper }}{{ end }}" } ` -var testReplaceRiverWithTemplate = ` +var testReplaceAlloyWithTemplate = ` stage.replace { expression = "^(\\S+) (\\S+) (\\S+) \\[([\\w:/]+\\s[+\\-]\\d{4})\\] \"(\\S+)\\s?(\\S+)?\\s?(\\S+)?\" (\\d{3}|-) (\\d+|-)\\s?\"?([^\"]*)\"?\\s?\"?([^\"]*)?\"?$" replace = "{{ if eq .Value \"200\" }}{{ Replace .Value \"200\" \"HttpStatusOk\" -1 }}{{ else }}{{ .Value | ToUpper }}{{ end }}" } ` -var testReplaceRiverWithEmptyReplace = ` +var testReplaceAlloyWithEmptyReplace = ` stage.replace { expression = "11.11.11.11 - (\\S+\\s)" replace = "" @@ -79,13 +79,13 @@ func TestReplace(t *testing.T) { expectedEntry string }{ "successfully run a pipeline with 1 regex stage without source": { - testReplaceRiverSingleStageWithoutSource, + testReplaceAlloySingleStageWithoutSource, testReplaceLogLine, map[string]interface{}{}, `11.11.11.11 - dummy [25/Jan/2000:14:00:01 -0500] "GET /1986.js HTTP/1.1" 200 932 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 GTB6"`, }, "successfully run a pipeline with multi stage with": { - testReplaceRiverMultiStageWithSource, + testReplaceAlloyMultiStageWithSource, testReplaceLogJSONLine, map[string]interface{}{ "level": "info", @@ -94,7 +94,7 @@ func TestReplace(t *testing.T) { `{"time":"2019-01-01T01:00:00.000000001Z", "level": "info", "msg": "11.11.11.11 - \"POST /loki/api/push/ HTTP/1.1\" 200 932 \"-\" \"Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 GTB6\""}`, }, "successfully run a pipeline with 1 regex stage with named captured group and with template and without source": { - testReplaceRiverWithNamedCapturedGroupWithTemplate, + testReplaceAlloyWithNamedCapturedGroupWithTemplate, testReplaceLogLine, map[string]interface{}{ "ip": "11.11.11.11", @@ -111,7 +111,7 @@ func TestReplace(t *testing.T) { `11.11.11.11 - FRANK [25/JAN/2000:14:00:01 -0500] "GET /1986.JS HTTP/1.1" HttpStatusOk 932 "-" "MOZILLA/5.0 (WINDOWS; U; WINDOWS NT 5.1; DE; RV:1.9.1.7) GECKO/20091221 FIREFOX/3.5.7 GTB6"`, }, "successfully run a pipeline with 1 regex stage with nested captured groups and with template and without source": { - testReplaceRiverWithNestedCapturedGroups, + testReplaceAlloyWithNestedCapturedGroups, testReplaceLogLine, map[string]interface{}{ "ip_user": "11.11.11.11 - FRANK", @@ -130,13 +130,13 @@ func TestReplace(t *testing.T) { `11.11.11.11 - FRANK [25/JAN/2000:14:00:01 -0500] "GET /1986.JS HTTP/1.1" HttpStatusOk 932 "-" "MOZILLA/5.0 (WINDOWS; U; WINDOWS NT 5.1; DE; RV:1.9.1.7) GECKO/20091221 FIREFOX/3.5.7 GTB6"`, }, "successfully run a pipeline with 1 regex stage with template and without source": { - testReplaceRiverWithTemplate, + testReplaceAlloyWithTemplate, testReplaceLogLine, map[string]interface{}{}, `11.11.11.11 - FRANK [25/JAN/2000:14:00:01 -0500] "GET /1986.JS HTTP/1.1" HttpStatusOk 932 "-" "MOZILLA/5.0 (WINDOWS; U; WINDOWS NT 5.1; DE; RV:1.9.1.7) GECKO/20091221 FIREFOX/3.5.7 GTB6"`, }, "successfully run a pipeline with empty replace value": { - testReplaceRiverWithEmptyReplace, + testReplaceAlloyWithEmptyReplace, testReplaceLogLine, map[string]interface{}{}, `11.11.11.11 - [25/Jan/2000:14:00:01 -0500] "GET /1986.js HTTP/1.1" 200 932 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 GTB6"`, diff --git a/internal/component/loki/process/stages/sampling_test.go b/internal/component/loki/process/stages/sampling_test.go index 916125b019..8a493ca7e5 100644 --- a/internal/component/loki/process/stages/sampling_test.go +++ b/internal/component/loki/process/stages/sampling_test.go @@ -12,7 +12,7 @@ import ( util_log "github.com/grafana/loki/pkg/util/log" ) -var testSamplingRiver = ` +var testSamplingAlloy = ` stage.sampling { rate = 0.5 } @@ -20,7 +20,7 @@ stage.sampling { func TestSamplingPipeline(t *testing.T) { registry := prometheus.NewRegistry() - pl, err := NewPipeline(util_log.Logger, loadConfig(testSamplingRiver), &plName, registry) + pl, err := NewPipeline(util_log.Logger, loadConfig(testSamplingAlloy), &plName, registry) require.NoError(t, err) entries := make([]Entry, 0) diff --git a/internal/component/loki/process/stages/tenant_test.go b/internal/component/loki/process/stages/tenant_test.go index d715db6f31..4fc8109dac 100644 --- a/internal/component/loki/process/stages/tenant_test.go +++ b/internal/component/loki/process/stages/tenant_test.go @@ -18,7 +18,7 @@ import ( util_log "github.com/grafana/loki/pkg/util/log" ) -var testTenantRiverExtractedData = ` +var testTenantAlloyExtractedData = ` stage.json { expressions = { "customer_id" = "" } } @@ -39,7 +39,7 @@ func TestPipelineWithMissingKey_Tenant(t *testing.T) { var buf bytes.Buffer w := log.NewSyncWriter(&buf) logger := log.NewLogfmtLogger(w) - pl, err := NewPipeline(logger, loadConfig(testTenantRiverExtractedData), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testTenantAlloyExtractedData), nil, prometheus.DefaultRegisterer) if err != nil { t.Fatal(err) } diff --git a/internal/component/loki/process/stages/timestamp_test.go b/internal/component/loki/process/stages/timestamp_test.go index 8e624e4009..6e6c2cb56a 100644 --- a/internal/component/loki/process/stages/timestamp_test.go +++ b/internal/component/loki/process/stages/timestamp_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" ) -var testTimestampRiver = ` +var testTimestampAlloy = ` stage.json { expressions = { ts = "time" } } @@ -43,7 +43,7 @@ var testTimestampLogLineWithMissingKey = ` func TestTimestampPipeline(t *testing.T) { logger := util.TestAlloyLogger(t) - pl, err := NewPipeline(logger, loadConfig(testTimestampRiver), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testTimestampAlloy), nil, prometheus.DefaultRegisterer) require.NoError(t, err) out := processEntries(pl, newEntry(nil, nil, testTimestampLogLine, time.Now()))[0] @@ -60,7 +60,7 @@ func TestPipelineWithMissingKey_Timestamp(t *testing.T) { var buf bytes.Buffer w := log.NewSyncWriter(&buf) logger := log.NewLogfmtLogger(w) - pl, err := NewPipeline(logger, loadConfig(testTimestampRiver), nil, prometheus.DefaultRegisterer) + pl, err := NewPipeline(logger, loadConfig(testTimestampAlloy), nil, prometheus.DefaultRegisterer) require.NoError(t, err) _ = processEntries(pl, newEntry(nil, nil, testTimestampLogLineWithMissingKey, time.Now())) diff --git a/internal/component/loki/relabel/relabel.go b/internal/component/loki/relabel/relabel.go index 9a78a334d0..f6f6ff791a 100644 --- a/internal/component/loki/relabel/relabel.go +++ b/internal/component/loki/relabel/relabel.go @@ -47,7 +47,7 @@ var DefaultArguments = Arguments{ MaxCacheSize: 10_000, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/loki/relabel/relabel_test.go b/internal/component/loki/relabel/relabel_test.go index 3d1f056562..6b863dd4d4 100644 --- a/internal/component/loki/relabel/relabel_test.go +++ b/internal/component/loki/relabel/relabel_test.go @@ -41,7 +41,7 @@ var rc = `rule { }` func TestRelabeling(t *testing.T) { - // Unmarshal the River relabel rules into a custom struct, as we don't have + // Unmarshal the Alloy relabel rules into a custom struct, as we don't have // an easy way to refer to a loki.LogsReceiver value for the forward_to // argument. type cfg struct { diff --git a/internal/component/loki/rules/kubernetes/rules_test.go b/internal/component/loki/rules/kubernetes/rules_test.go index 196759512a..7c65b6975a 100644 --- a/internal/component/loki/rules/kubernetes/rules_test.go +++ b/internal/component/loki/rules/kubernetes/rules_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` address = "GRAFANA_CLOUD_METRICS_URL" basic_auth { username = "GRAFANA_CLOUD_USER" @@ -17,12 +17,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` address = "GRAFANA_CLOUD_METRICS_URL" bearer_token = "token" bearer_token_file = "/path/to/file.token" @@ -30,6 +30,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/loki/rules/kubernetes/types.go b/internal/component/loki/rules/kubernetes/types.go index 8bba8a994a..b869fab0c3 100644 --- a/internal/component/loki/rules/kubernetes/types.go +++ b/internal/component/loki/rules/kubernetes/types.go @@ -26,12 +26,12 @@ var DefaultArguments = Arguments{ HTTPClientConfig: config.DefaultHTTPClientConfig, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.SyncInterval <= 0 { return fmt.Errorf("sync_interval must be greater than 0") diff --git a/internal/component/loki/source/api/api.go b/internal/component/loki/source/api/api.go index 244bc4dfaf..ce8d94570e 100644 --- a/internal/component/loki/source/api/api.go +++ b/internal/component/loki/source/api/api.go @@ -36,7 +36,7 @@ type Arguments struct { UseIncomingTimestamp bool `alloy:"use_incoming_timestamp,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ Server: fnet.DefaultServerConfig(), diff --git a/internal/component/loki/source/aws_firehose/component.go b/internal/component/loki/source/aws_firehose/component.go index 8031d84b62..4026ecec78 100644 --- a/internal/component/loki/source/aws_firehose/component.go +++ b/internal/component/loki/source/aws_firehose/component.go @@ -41,7 +41,7 @@ type Arguments struct { RelabelRules alloy_relabel.Rules `alloy:"relabel_rules,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ Server: fnet.DefaultServerConfig(), diff --git a/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go b/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go index 45b3413f36..edb006abb9 100644 --- a/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go +++ b/internal/component/loki/source/azure_event_hubs/azure_event_hubs.go @@ -63,12 +63,12 @@ func getDefault() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = getDefault() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { return a.validateAssignor() } @@ -155,7 +155,7 @@ func (c *Component) Update(args component.Arguments) error { return nil } -// Convert is used to bridge between the River and Promtail types. +// Convert is used to bridge between the Alloy and Promtail types. func (a *Arguments) Convert() (kt.Config, error) { lbls := make(model.LabelSet, len(a.Labels)) for k, v := range a.Labels { diff --git a/internal/component/loki/source/azure_event_hubs/azure_event_hubs_test.go b/internal/component/loki/source/azure_event_hubs/azure_event_hubs_test.go index efb6cd94b6..962ec608c7 100644 --- a/internal/component/loki/source/azure_event_hubs/azure_event_hubs_test.go +++ b/internal/component/loki/source/azure_event_hubs/azure_event_hubs_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfigOAuth(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigOAuth(t *testing.T) { + var exampleAlloyConfig = ` fully_qualified_namespace = "my-ns.servicebus.windows.net:9093" event_hubs = ["test"] @@ -20,12 +20,12 @@ func TestRiverConfigOAuth(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestRiverConfigConnectionString(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigConnectionString(t *testing.T) { + var exampleAlloyConfig = ` fully_qualified_namespace = "my-ns.servicebus.windows.net:9093" event_hubs = ["test"] @@ -38,12 +38,12 @@ func TestRiverConfigConnectionString(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestRiverConfigValidateAssignor(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigValidateAssignor(t *testing.T) { + var exampleAlloyConfig = ` fully_qualified_namespace = "my-ns.servicebus.windows.net:9093" event_hubs = ["test"] @@ -57,6 +57,6 @@ func TestRiverConfigValidateAssignor(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.EqualError(t, err, "assignor value invalid-value is invalid, must be one of: [sticky roundrobin range]") } diff --git a/internal/component/loki/source/cloudflare/cloudflare.go b/internal/component/loki/source/cloudflare/cloudflare.go index 34ff6e317f..ca1ab3896d 100644 --- a/internal/component/loki/source/cloudflare/cloudflare.go +++ b/internal/component/loki/source/cloudflare/cloudflare.go @@ -72,12 +72,12 @@ var DefaultArguments = Arguments{ FieldsType: string(cft.FieldsTypeDefault), } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (c *Arguments) SetToDefault() { *c = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (c *Arguments) Validate() error { if c.PullRange < 0 { return fmt.Errorf("pull_range must be a positive duration") diff --git a/internal/component/loki/source/docker/docker.go b/internal/component/loki/source/docker/docker.go index f669bd46c7..2564f49208 100644 --- a/internal/component/loki/source/docker/docker.go +++ b/internal/component/loki/source/docker/docker.go @@ -71,12 +71,12 @@ func GetDefaultArguments() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = GetDefaultArguments() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if _, err := url.Parse(a.Host); err != nil { return fmt.Errorf("failed to parse Docker host %q: %w", a.Host, err) diff --git a/internal/component/loki/source/file/file.go b/internal/component/loki/source/file/file.go index a21210be9b..65dbb327ea 100644 --- a/internal/component/loki/source/file/file.go +++ b/internal/component/loki/source/file/file.go @@ -59,7 +59,7 @@ var DefaultArguments = Arguments{ }, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/loki/source/gcplog/gcplog.go b/internal/component/loki/source/gcplog/gcplog.go index 01a18dbc2b..323c55e3d2 100644 --- a/internal/component/loki/source/gcplog/gcplog.go +++ b/internal/component/loki/source/gcplog/gcplog.go @@ -40,12 +40,12 @@ type Arguments struct { RelabelRules alloy_relabel.Rules `alloy:"relabel_rules,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{} } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if (a.PullTarget != nil) == (a.PushTarget != nil) { return fmt.Errorf("exactly one of 'push' or 'pull' must be provided") diff --git a/internal/component/loki/source/gcplog/gcptypes/gcptypes.go b/internal/component/loki/source/gcplog/gcptypes/gcptypes.go index 20ecf42f14..b4e0156c8e 100644 --- a/internal/component/loki/source/gcplog/gcptypes/gcptypes.go +++ b/internal/component/loki/source/gcplog/gcptypes/gcptypes.go @@ -25,14 +25,14 @@ type PushConfig struct { UseFullLine bool `alloy:"use_full_line,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (p *PushConfig) SetToDefault() { *p = PushConfig{ Server: fnet.DefaultServerConfig(), } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (p *PushConfig) Validate() error { if p.PushTimeout < 0 { return fmt.Errorf("push_timeout must be greater than zero") diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go index 5dc4a8a619..593824df6e 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/pull_target.go @@ -45,7 +45,7 @@ type PullTarget struct { msgs chan *pubsub.Message } -// TODO(@tpaschalis) Expose this as River configuration in the future. +// TODO(@tpaschalis) Expose this as Alloy configuration in the future. var defaultBackoff = backoff.Config{ MinBackoff: 1 * time.Second, MaxBackoff: 10 * time.Second, diff --git a/internal/component/loki/source/gelf/gelf.go b/internal/component/loki/source/gelf/gelf.go index a7f851dcc9..be50c62b9d 100644 --- a/internal/component/loki/source/gelf/gelf.go +++ b/internal/component/loki/source/gelf/gelf.go @@ -105,7 +105,7 @@ func defaultArgs() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *Arguments) SetToDefault() { *r = defaultArgs() } diff --git a/internal/component/loki/source/heroku/heroku.go b/internal/component/loki/source/heroku/heroku.go index 317bc41093..cfb8a2e215 100644 --- a/internal/component/loki/source/heroku/heroku.go +++ b/internal/component/loki/source/heroku/heroku.go @@ -40,7 +40,7 @@ type Arguments struct { RelabelRules alloy_relabel.Rules `alloy:"relabel_rules,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ Server: fnet.DefaultServerConfig(), @@ -159,7 +159,7 @@ func (c *Component) Update(args component.Arguments) error { return nil } -// Convert is used to bridge between the River and Promtail types. +// Convert is used to bridge between the Alloy and Promtail types. func (args *Arguments) Convert() *ht.HerokuDrainTargetConfig { lbls := make(model.LabelSet, len(args.Labels)) for k, v := range args.Labels { diff --git a/internal/component/loki/source/journal/types.go b/internal/component/loki/source/journal/types.go index 35f54b56ec..1e85caef56 100644 --- a/internal/component/loki/source/journal/types.go +++ b/internal/component/loki/source/journal/types.go @@ -26,7 +26,7 @@ func defaultArgs() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *Arguments) SetToDefault() { *r = defaultArgs() } diff --git a/internal/component/loki/source/kafka/kafka.go b/internal/component/loki/source/kafka/kafka.go index 65bde3c2e8..e682cf7454 100644 --- a/internal/component/loki/source/kafka/kafka.go +++ b/internal/component/loki/source/kafka/kafka.go @@ -82,7 +82,7 @@ var DefaultArguments = Arguments{ UseIncomingTimestamp: false, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } @@ -172,7 +172,7 @@ func (c *Component) Update(args component.Arguments) error { return nil } -// Convert is used to bridge between the River and Promtail types. +// Convert is used to bridge between the Alloy and Promtail types. func (args *Arguments) Convert() kt.Config { lbls := make(model.LabelSet, len(args.Labels)) for k, v := range args.Labels { diff --git a/internal/component/loki/source/kafka/kafka_test.go b/internal/component/loki/source/kafka/kafka_test.go index 0efd59bd51..7b3ec9abf9 100644 --- a/internal/component/loki/source/kafka/kafka_test.go +++ b/internal/component/loki/source/kafka/kafka_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` brokers = ["localhost:9092","localhost:23456"] topics = ["quickstart-events"] labels = {component = "loki.source.kafka"} @@ -17,12 +17,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestTLSRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestTLSAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` brokers = ["localhost:9092","localhost:23456"] topics = ["quickstart-events"] authentication { @@ -37,12 +37,12 @@ func TestTLSRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestSASLRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestSASLAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` brokers = ["localhost:9092","localhost:23456"] topics = ["quickstart-events"] authentication { @@ -57,12 +57,12 @@ func TestSASLRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestSASLOAuthRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestSASLOAuthAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` brokers = ["localhost:9092", "localhost:23456"] topics = ["quickstart-events"] @@ -81,6 +81,6 @@ func TestSASLOAuthRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } diff --git a/internal/component/loki/source/kubernetes/kubernetes.go b/internal/component/loki/source/kubernetes/kubernetes.go index 9d95ae4566..79c884fd37 100644 --- a/internal/component/loki/source/kubernetes/kubernetes.go +++ b/internal/component/loki/source/kubernetes/kubernetes.go @@ -52,7 +52,7 @@ var DefaultArguments = Arguments{ Client: commonk8s.DefaultClientArguments, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } diff --git a/internal/component/loki/source/kubernetes/kubernetes_test.go b/internal/component/loki/source/kubernetes/kubernetes_test.go index d709823cd0..c834f75c3f 100644 --- a/internal/component/loki/source/kubernetes/kubernetes_test.go +++ b/internal/component/loki/source/kubernetes/kubernetes_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` targets = [ {"__address__" = "localhost:9090", "foo" = "bar"}, {"__address__" = "localhost:8080", "foo" = "buzz"}, @@ -20,12 +20,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` targets = [ {"__address__" = "localhost:9090", "foo" = "bar"}, {"__address__" = "localhost:8080", "foo" = "buzz"}, @@ -40,6 +40,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/loki/source/kubernetes_events/kubernetes_events.go b/internal/component/loki/source/kubernetes_events/kubernetes_events.go index bb2116b998..94cce90113 100644 --- a/internal/component/loki/source/kubernetes_events/kubernetes_events.go +++ b/internal/component/loki/source/kubernetes_events/kubernetes_events.go @@ -59,12 +59,12 @@ var DefaultArguments = Arguments{ Client: kubernetes.DefaultClientArguments, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.JobName == "" { return fmt.Errorf("job_name must not be an empty string") diff --git a/internal/component/loki/source/podlogs/podlogs.go b/internal/component/loki/source/podlogs/podlogs.go index 9d5618942b..0710e10c61 100644 --- a/internal/component/loki/source/podlogs/podlogs.go +++ b/internal/component/loki/source/podlogs/podlogs.go @@ -56,7 +56,7 @@ var DefaultArguments = Arguments{ Client: commonk8s.DefaultClientArguments, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } diff --git a/internal/component/loki/source/podlogs/podlogs_test.go b/internal/component/loki/source/podlogs/podlogs_test.go index b76b13b211..eede26b848 100644 --- a/internal/component/loki/source/podlogs/podlogs_test.go +++ b/internal/component/loki/source/podlogs/podlogs_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` forward_to = [] client { api_server = "localhost:9091" @@ -16,12 +16,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` forward_to = [] client { api_server = "localhost:9091" @@ -32,6 +32,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/loki/source/syslog/types.go b/internal/component/loki/source/syslog/types.go index 18d4300df7..2a07e1311b 100644 --- a/internal/component/loki/source/syslog/types.go +++ b/internal/component/loki/source/syslog/types.go @@ -30,12 +30,12 @@ var DefaultListenerConfig = ListenerConfig{ MaxMessageLength: st.DefaultMaxMessageLength, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (sc *ListenerConfig) SetToDefault() { *sc = DefaultListenerConfig } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (sc *ListenerConfig) Validate() error { if sc.ListenProtocol != "tcp" && sc.ListenProtocol != "udp" { return fmt.Errorf("syslog listener protocol should be either 'tcp' or 'udp', got %s", sc.ListenProtocol) @@ -44,7 +44,7 @@ func (sc *ListenerConfig) Validate() error { return nil } -// Convert is used to bridge between the River and Promtail types. +// Convert is used to bridge between the Alloy and Promtail types. func (sc ListenerConfig) Convert() *scrapeconfig.SyslogTargetConfig { lbls := make(model.LabelSet, len(sc.Labels)) for k, v := range sc.Labels { diff --git a/internal/component/loki/source/windowsevent/arguments.go b/internal/component/loki/source/windowsevent/arguments.go index ae08fc1a00..e3e8e15384 100644 --- a/internal/component/loki/source/windowsevent/arguments.go +++ b/internal/component/loki/source/windowsevent/arguments.go @@ -40,7 +40,7 @@ func defaultArgs() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *Arguments) SetToDefault() { *r = defaultArgs() } diff --git a/internal/component/loki/write/types.go b/internal/component/loki/write/types.go index 943201893a..9bfb9880be 100644 --- a/internal/component/loki/write/types.go +++ b/internal/component/loki/write/types.go @@ -52,12 +52,12 @@ func GetDefaultEndpointOptions() EndpointOptions { return defaultEndpointOptions } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *EndpointOptions) SetToDefault() { *r = GetDefaultEndpointOptions() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (r *EndpointOptions) Validate() error { if _, err := url.Parse(r.URL); err != nil { return fmt.Errorf("failed to parse remote url %q: %w", r.URL, err) @@ -78,7 +78,7 @@ type QueueConfig struct { DrainTimeout time.Duration `alloy:"drain_timeout,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (q *QueueConfig) SetToDefault() { *q = QueueConfig{ Capacity: 10 * units.MiB, // considering the default BatchSize of 1MiB, this gives us a default buffered channel of size 10 diff --git a/internal/component/loki/write/write_test.go b/internal/component/loki/write/write_test.go index cb5c4b33b6..0b58a5a8d1 100644 --- a/internal/component/loki/write/write_test.go +++ b/internal/component/loki/write/write_test.go @@ -25,8 +25,8 @@ import ( loki_util "github.com/grafana/loki/pkg/util" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` endpoint { name = "test-url" url = "http://0.0.0.0:11111/loki/api/v1/push" @@ -35,12 +35,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` endpoint { name = "test-url" url = "http://0.0.0.0:11111/loki/api/v1/push" @@ -52,7 +52,7 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/mimir/rules/kubernetes/rules_test.go b/internal/component/mimir/rules/kubernetes/rules_test.go index 196759512a..7c65b6975a 100644 --- a/internal/component/mimir/rules/kubernetes/rules_test.go +++ b/internal/component/mimir/rules/kubernetes/rules_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` address = "GRAFANA_CLOUD_METRICS_URL" basic_auth { username = "GRAFANA_CLOUD_USER" @@ -17,12 +17,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` address = "GRAFANA_CLOUD_METRICS_URL" bearer_token = "token" bearer_token_file = "/path/to/file.token" @@ -30,6 +30,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/mimir/rules/kubernetes/types.go b/internal/component/mimir/rules/kubernetes/types.go index 1e05a1549a..f7072b2dce 100644 --- a/internal/component/mimir/rules/kubernetes/types.go +++ b/internal/component/mimir/rules/kubernetes/types.go @@ -28,12 +28,12 @@ var DefaultArguments = Arguments{ PrometheusHTTPPrefix: "/prometheus", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.SyncInterval <= 0 { return fmt.Errorf("sync_interval must be greater than 0") diff --git a/internal/component/otelcol/auth/auth.go b/internal/component/otelcol/auth/auth.go index 720d2f5fd9..cc2712641a 100644 --- a/internal/component/otelcol/auth/auth.go +++ b/internal/component/otelcol/auth/auth.go @@ -56,8 +56,8 @@ type Handler struct { var _ syntax.Capsule = Handler{} -// RiverCapsule marks Handler as a capsule type. -func (Handler) RiverCapsule() {} +// AlloyCapsule marks Handler as a capsule type. +func (Handler) AlloyCapsule() {} // Auth is an Alloy component shim which manages an OpenTelemetry Collector // authentication extension. diff --git a/internal/component/otelcol/auth/bearer/bearer.go b/internal/component/otelcol/auth/bearer/bearer.go index 41ad2f779a..6429e1b576 100644 --- a/internal/component/otelcol/auth/bearer/bearer.go +++ b/internal/component/otelcol/auth/bearer/bearer.go @@ -40,7 +40,7 @@ var DefaultArguments = Arguments{ Scheme: "Bearer", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } diff --git a/internal/component/otelcol/auth/bearer/bearer_test.go b/internal/component/otelcol/auth/bearer/bearer_test.go index 0854109aa0..99cf0d3585 100644 --- a/internal/component/otelcol/auth/bearer/bearer_test.go +++ b/internal/component/otelcol/auth/bearer/bearer_test.go @@ -23,21 +23,21 @@ func Test(t *testing.T) { type TestDefinition struct { testName string expectedHeaderVal string - riverConfig string + alloyConfig string } tests := []TestDefinition{ { testName: "Test1", expectedHeaderVal: "Bearer example_access_key_id", - riverConfig: ` + alloyConfig: ` token = "example_access_key_id" `, }, { testName: "Test2", expectedHeaderVal: "Bearer example_access_key_id", - riverConfig: ` + alloyConfig: ` token = "example_access_key_id" scheme = "Bearer" `, @@ -45,7 +45,7 @@ func Test(t *testing.T) { { testName: "Test3", expectedHeaderVal: "MyScheme example_access_key_id", - riverConfig: ` + alloyConfig: ` token = "example_access_key_id" scheme = "MyScheme" `, @@ -53,7 +53,7 @@ func Test(t *testing.T) { { testName: "Test4", expectedHeaderVal: "example_access_key_id", - riverConfig: ` + alloyConfig: ` token = "example_access_key_id" scheme = "" `, @@ -82,7 +82,7 @@ func Test(t *testing.T) { require.NoError(t, err) var args bearer.Arguments - require.NoError(t, syntax.Unmarshal([]byte(tt.riverConfig), &args)) + require.NoError(t, syntax.Unmarshal([]byte(tt.alloyConfig), &args)) go func() { err := ctrl.Run(ctx, args) diff --git a/internal/component/otelcol/auth/headers/headers.go b/internal/component/otelcol/auth/headers/headers.go index 21aeec00fd..e7c7625550 100644 --- a/internal/component/otelcol/auth/headers/headers.go +++ b/internal/component/otelcol/auth/headers/headers.go @@ -100,7 +100,7 @@ func (a *Action) Validate() error { return nil } -// Convert the River type to the Otel type. +// Convert the Alloy type to the Otel type. // TODO: When headerssetterextension.actionValue is made external, // remove the input parameter and make this output the Otel type. func (a *Action) Convert(hc *headerssetterextension.HeaderConfig) error { diff --git a/internal/component/otelcol/auth/headers/headers_test.go b/internal/component/otelcol/auth/headers/headers_test.go index 86ec8a6a19..636bee8ea0 100644 --- a/internal/component/otelcol/auth/headers/headers_test.go +++ b/internal/component/otelcol/auth/headers/headers_test.go @@ -80,7 +80,7 @@ func Test(t *testing.T) { require.Equal(t, http.StatusOK, resp.StatusCode) } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { cfg string expectedKey string diff --git a/internal/component/otelcol/auth/sigv4/sigv4.go b/internal/component/otelcol/auth/sigv4/sigv4.go index 636a4accc9..29bbaa11c0 100644 --- a/internal/component/otelcol/auth/sigv4/sigv4.go +++ b/internal/component/otelcol/auth/sigv4/sigv4.go @@ -49,7 +49,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) { return &res, nil } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args Arguments) Validate() error { _, err := args.Convert() return err diff --git a/internal/component/otelcol/auth/sigv4/sigv4_test.go b/internal/component/otelcol/auth/sigv4/sigv4_test.go index 32110de00d..5aff71024b 100644 --- a/internal/component/otelcol/auth/sigv4/sigv4_test.go +++ b/internal/component/otelcol/auth/sigv4/sigv4_test.go @@ -31,7 +31,7 @@ func Test(t *testing.T) { assumeRoleARN string assumeRoleSessionName string assumeRoleStsRegion string - riverConfig string + alloyConfig string } tests := []TestDefinition{ @@ -44,7 +44,7 @@ func Test(t *testing.T) { assumeRoleARN: "", assumeRoleSessionName: "role_session_name", assumeRoleStsRegion: "", - riverConfig: "", + alloyConfig: "", }, { testName: "Test2", @@ -55,7 +55,7 @@ func Test(t *testing.T) { assumeRoleARN: "", assumeRoleSessionName: "", assumeRoleStsRegion: "region", - riverConfig: "", + alloyConfig: "", }, { testName: "Test3", @@ -66,7 +66,7 @@ func Test(t *testing.T) { assumeRoleARN: "", assumeRoleSessionName: "", assumeRoleStsRegion: "", - riverConfig: "", + alloyConfig: "", }, { testName: "Test4", @@ -77,13 +77,13 @@ func Test(t *testing.T) { assumeRoleARN: "", assumeRoleSessionName: "", assumeRoleStsRegion: "", - riverConfig: "", + alloyConfig: "", }, } { var tt = &tests[0] - tt.riverConfig = fmt.Sprintf(` + tt.alloyConfig = fmt.Sprintf(` assume_role { session_name = "%s" } @@ -93,7 +93,7 @@ func Test(t *testing.T) { } { var tt = &tests[1] - tt.riverConfig = fmt.Sprintf(` + tt.alloyConfig = fmt.Sprintf(` assume_role { sts_region = "%s" } @@ -103,13 +103,13 @@ func Test(t *testing.T) { } { var tt = &tests[2] - tt.riverConfig = fmt.Sprintf(` + tt.alloyConfig = fmt.Sprintf(` region = "%s" `, tt.region) } { var tt = &tests[3] - tt.riverConfig = fmt.Sprintf(` + tt.alloyConfig = fmt.Sprintf(` service = "%s" `, tt.service) } @@ -157,8 +157,8 @@ func Test(t *testing.T) { ctrl, err := componenttest.NewControllerFromID(l, "otelcol.auth.sigv4") require.NoError(t, err) - cfg := tt.riverConfig - t.Logf("River configuration: %s", cfg) + cfg := tt.alloyConfig + t.Logf("Alloy configuration: %s", cfg) var args sigv4.Arguments require.NoError(t, syntax.Unmarshal([]byte(cfg), &args)) diff --git a/internal/component/otelcol/config_debug_metrics.go b/internal/component/otelcol/config_debug_metrics.go index 977dc6177e..1f6fa4db4b 100644 --- a/internal/component/otelcol/config_debug_metrics.go +++ b/internal/component/otelcol/config_debug_metrics.go @@ -5,7 +5,7 @@ type DebugMetricsArguments struct { DisableHighCardinalityMetrics bool `alloy:"disable_high_cardinality_metrics,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *DebugMetricsArguments) SetToDefault() { *args = DebugMetricsArguments{ DisableHighCardinalityMetrics: true, diff --git a/internal/component/otelcol/config_filter.go b/internal/component/otelcol/config_filter.go index 77536944c0..6a9076efb4 100644 --- a/internal/component/otelcol/config_filter.go +++ b/internal/component/otelcol/config_filter.go @@ -104,7 +104,7 @@ func (args *MatchProperties) Convert() (map[string]interface{}, error) { if args.LogSeverity != nil { // The Otel config's field is called "log_severity_number" because it uses a number. - // The River config's field is called just "log_severity" because it uses a a textual + // The Alloy config's field is called just "log_severity" because it uses a a textual // representation of the log severity instead of a number. logSevNum, err := args.LogSeverity.convert() if err != nil { diff --git a/internal/component/otelcol/config_queue.go b/internal/component/otelcol/config_queue.go index e3ed5e35ea..04b4c08197 100644 --- a/internal/component/otelcol/config_queue.go +++ b/internal/component/otelcol/config_queue.go @@ -16,7 +16,7 @@ type QueueArguments struct { // TODO(rfratto): queues can send to persistent storage through an extension. } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *QueueArguments) SetToDefault() { *args = QueueArguments{ Enabled: true, diff --git a/internal/component/otelcol/config_scrape.go b/internal/component/otelcol/config_scrape.go index 24b18d2347..5c3aff540e 100644 --- a/internal/component/otelcol/config_scrape.go +++ b/internal/component/otelcol/config_scrape.go @@ -28,7 +28,7 @@ var DefaultScraperControllerArguments = ScraperControllerArguments{ Timeout: 0 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ScraperControllerArguments) SetToDefault() { *args = DefaultScraperControllerArguments } diff --git a/internal/component/otelcol/config_tls.go b/internal/component/otelcol/config_tls.go index b3f6091cc8..ac9d23f2db 100644 --- a/internal/component/otelcol/config_tls.go +++ b/internal/component/otelcol/config_tls.go @@ -83,7 +83,7 @@ func (args *TLSSetting) Convert() *otelconfigtls.TLSSetting { } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (t *TLSSetting) Validate() error { if len(t.CA) > 0 && len(t.CAFile) > 0 { return fmt.Errorf("at most one of ca_pem and ca_file must be configured") diff --git a/internal/component/otelcol/connector/host_info/host_info_test.go b/internal/component/otelcol/connector/host_info/host_info_test.go index 6e3ad58011..bc52d78b78 100644 --- a/internal/component/otelcol/connector/host_info/host_info_test.go +++ b/internal/component/otelcol/connector/host_info/host_info_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/connector/servicegraph/servicegraph_test.go b/internal/component/otelcol/connector/servicegraph/servicegraph_test.go index 5b9b129809..abd357c2d1 100644 --- a/internal/component/otelcol/connector/servicegraph/servicegraph_test.go +++ b/internal/component/otelcol/connector/servicegraph/servicegraph_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go b/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go index fb7025e9ff..d55e1dd44c 100644 --- a/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go +++ b/internal/component/otelcol/connector/spanmetrics/spanmetrics_test.go @@ -19,7 +19,7 @@ func getStringPtr(str string) *string { return &newStr } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/exporter/logging/logging.go b/internal/component/otelcol/exporter/logging/logging.go index 45cff77cde..6341c03c0a 100644 --- a/internal/component/otelcol/exporter/logging/logging.go +++ b/internal/component/otelcol/exporter/logging/logging.go @@ -38,7 +38,7 @@ type Arguments struct { var _ exporter.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ Verbosity: configtelemetry.LevelNormal, diff --git a/internal/component/otelcol/exporter/otlp/otlp.go b/internal/component/otelcol/exporter/otlp/otlp.go index 56cd2835fd..e0ab869b11 100644 --- a/internal/component/otelcol/exporter/otlp/otlp.go +++ b/internal/component/otelcol/exporter/otlp/otlp.go @@ -43,7 +43,7 @@ type Arguments struct { var _ exporter.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ Timeout: otelcol.DefaultTimeout, @@ -86,7 +86,7 @@ func (args Arguments) DebugMetricsConfig() otelcol.DebugMetricsArguments { // component-specific defaults. type GRPCClientArguments otelcol.GRPCClientArguments -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *GRPCClientArguments) SetToDefault() { *args = GRPCClientArguments{ Headers: map[string]string{}, diff --git a/internal/component/otelcol/exporter/otlphttp/otlphttp.go b/internal/component/otelcol/exporter/otlphttp/otlphttp.go index bb9124dbae..14cb21d26e 100644 --- a/internal/component/otelcol/exporter/otlphttp/otlphttp.go +++ b/internal/component/otelcol/exporter/otlphttp/otlphttp.go @@ -48,7 +48,7 @@ type Arguments struct { var _ exporter.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{} args.Queue.SetToDefault() @@ -84,7 +84,7 @@ func (args Arguments) DebugMetricsConfig() otelcol.DebugMetricsArguments { return args.DebugMetrics } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Client.Endpoint == "" && args.TracesEndpoint == "" && args.MetricsEndpoint == "" && args.LogsEndpoint == "" { return errors.New("at least one endpoint must be specified") @@ -102,7 +102,7 @@ var ( DefaultIdleConnTimeout = 90 * time.Second ) -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *HTTPClientArguments) SetToDefault() { maxIdleConns := DefaultMaxIdleConns idleConnTimeout := DefaultIdleConnTimeout diff --git a/internal/component/otelcol/exporter/prometheus/prometheus.go b/internal/component/otelcol/exporter/prometheus/prometheus.go index 0150b03fad..929d28a0df 100644 --- a/internal/component/otelcol/exporter/prometheus/prometheus.go +++ b/internal/component/otelcol/exporter/prometheus/prometheus.go @@ -52,12 +52,12 @@ var DefaultArguments = Arguments{ ResourceToTelemetryConversion: false, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.GCFrequency == 0 { return fmt.Errorf("gc_frequency must be greater than 0") diff --git a/internal/component/otelcol/exporter/prometheus/prometheus_test.go b/internal/component/otelcol/exporter/prometheus/prometheus_test.go index 3945c3ab96..d3130df6a3 100644 --- a/internal/component/otelcol/exporter/prometheus/prometheus_test.go +++ b/internal/component/otelcol/exporter/prometheus/prometheus_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go index babc653419..454333b87b 100644 --- a/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go +++ b/internal/component/otelcol/extension/jaeger_remote_sampling/jaeger_remote_sampling.go @@ -80,7 +80,7 @@ func (args Arguments) Exporters() map[otelcomponent.DataType]map[otelcomponent.I return nil } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.GRPC == nil && a.HTTP == nil { return fmt.Errorf("http or grpc must be configured to serve the sampling document") @@ -89,7 +89,7 @@ func (a *Arguments) Validate() error { return nil } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *ArgumentsSource) Validate() error { // remote config, local file and contents are all mutually exclusive sourcesSet := 0 @@ -113,7 +113,7 @@ func (a *ArgumentsSource) Validate() error { return nil } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *GRPCServerArguments) SetToDefault() { *args = GRPCServerArguments{ Endpoint: "0.0.0.0:14250", @@ -121,7 +121,7 @@ func (args *GRPCServerArguments) SetToDefault() { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *HTTPServerArguments) SetToDefault() { *args = HTTPServerArguments{ Endpoint: "0.0.0.0:5778", @@ -133,7 +133,7 @@ func (args *HTTPServerArguments) SetToDefault() { // component-specific defaults. type GRPCClientArguments otelcol.GRPCClientArguments -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *GRPCClientArguments) SetToDefault() { *args = GRPCClientArguments{ Headers: map[string]string{}, diff --git a/internal/component/otelcol/processor/batch/batch.go b/internal/component/otelcol/processor/batch/batch.go index db433d4c62..d53e0f8c16 100644 --- a/internal/component/otelcol/processor/batch/batch.go +++ b/internal/component/otelcol/processor/batch/batch.go @@ -51,12 +51,12 @@ var DefaultArguments = Arguments{ MetadataCardinalityLimit: 1000, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.SendBatchMaxSize > 0 && args.SendBatchMaxSize < args.SendBatchSize { return fmt.Errorf("send_batch_max_size must be greater or equal to send_batch_size when not 0") diff --git a/internal/component/otelcol/processor/batch/batch_test.go b/internal/component/otelcol/processor/batch/batch_test.go index 78b9e13f0a..8e6aed93d3 100644 --- a/internal/component/otelcol/processor/batch/batch_test.go +++ b/internal/component/otelcol/processor/batch/batch_test.go @@ -118,7 +118,7 @@ func createTestTraces() ptrace.Traces { return data } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { cfg string expectedArguments batch.Arguments diff --git a/internal/component/otelcol/processor/filter/filter.go b/internal/component/otelcol/processor/filter/filter.go index 19dcdd3d37..94b32ce826 100644 --- a/internal/component/otelcol/processor/filter/filter.go +++ b/internal/component/otelcol/processor/filter/filter.go @@ -46,12 +46,12 @@ var DefaultArguments = Arguments{ ErrorMode: ottl.PropagateError, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { otelArgs, err := args.convertImpl() if err != nil { diff --git a/internal/component/otelcol/processor/filter/filter_test.go b/internal/component/otelcol/processor/filter/filter_test.go index eff73e6aef..f0af7316bf 100644 --- a/internal/component/otelcol/processor/filter/filter_test.go +++ b/internal/component/otelcol/processor/filter/filter_test.go @@ -11,7 +11,7 @@ import ( ) // Source: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/filterprocessor/README.md#filter-spans-from-traces -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/processor/k8sattributes/k8sattributes.go b/internal/component/otelcol/processor/k8sattributes/k8sattributes.go index 08616ff6ea..9f7b4045fd 100644 --- a/internal/component/otelcol/processor/k8sattributes/k8sattributes.go +++ b/internal/component/otelcol/processor/k8sattributes/k8sattributes.go @@ -43,7 +43,7 @@ type Arguments struct { Output *otelcol.ConsumerArguments `alloy:"output,block"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { // These are default excludes from upstream opentelemetry-collector-contrib // Source: https://github.com/open-telemetry/opentelemetry-collector-contrib/blame/main/processor/k8sattributesprocessor/factory.go#L21 @@ -55,7 +55,7 @@ func (args *Arguments) SetToDefault() { } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { cfg, err := args.Convert() if err != nil { diff --git a/internal/component/otelcol/processor/memorylimiter/memorylimiter.go b/internal/component/otelcol/processor/memorylimiter/memorylimiter.go index 3ec6ef0b8d..90977c1c20 100644 --- a/internal/component/otelcol/processor/memorylimiter/memorylimiter.go +++ b/internal/component/otelcol/processor/memorylimiter/memorylimiter.go @@ -54,12 +54,12 @@ var DefaultArguments = Arguments{ MemorySpikePercentage: 0, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.CheckInterval <= 0 { return fmt.Errorf("check_interval must be greater than zero") diff --git a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go index b6a7497ebc..48e6829917 100644 --- a/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go +++ b/internal/component/otelcol/processor/probabilistic_sampler/probabilistic_sampler_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go b/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go index 7c7f1320b4..317869334b 100644 --- a/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go +++ b/internal/component/otelcol/processor/resourcedetection/internal/consul/config.go @@ -25,7 +25,7 @@ type Config struct { // is enabled. Token alloytypes.Secret `alloy:"token,attr,optional"` - // TokenFile is not necessary in River because users can use the local.file + // TokenFile is not necessary in Alloy because users can use the local.file // Alloy component instead. // // TokenFile string `alloy:"token_file"` diff --git a/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go b/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go index ae2374405e..a2455df9b4 100644 --- a/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go +++ b/internal/component/otelcol/processor/resourcedetection/resourcedetection_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { var defaultArgs system.Config defaultArgs.SetToDefault() diff --git a/internal/component/otelcol/processor/span/span.go b/internal/component/otelcol/processor/span/span.go index 66e317f863..0d5cee3461 100644 --- a/internal/component/otelcol/processor/span/span.go +++ b/internal/component/otelcol/processor/span/span.go @@ -47,7 +47,7 @@ var ( _ processor.Arguments = Arguments{} ) -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args == nil { return nil @@ -180,7 +180,7 @@ var DefaultToAttributes = ToAttributes{ BreakAfterMatch: false, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ToAttributes) SetToDefault() { if args == nil { return diff --git a/internal/component/otelcol/processor/span/span_test.go b/internal/component/otelcol/processor/span/span_test.go index 3c10842f1b..98ce61e076 100644 --- a/internal/component/otelcol/processor/span/span_test.go +++ b/internal/component/otelcol/processor/span/span_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { alloyCfg string otelCfg map[string]interface{} diff --git a/internal/component/otelcol/processor/tail_sampling/tail_sampling.go b/internal/component/otelcol/processor/tail_sampling/tail_sampling.go index f2bf705a09..602e49aa2d 100644 --- a/internal/component/otelcol/processor/tail_sampling/tail_sampling.go +++ b/internal/component/otelcol/processor/tail_sampling/tail_sampling.go @@ -49,12 +49,12 @@ var DefaultArguments = Arguments{ ExpectedNewTracesPerSec: 0, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.DecisionWait.Milliseconds() <= 0 { return fmt.Errorf("decision_wait must be greater than zero") diff --git a/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go b/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go index 5c8b66ad48..4a26635d76 100644 --- a/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go +++ b/internal/component/otelcol/processor/tail_sampling/tail_sampling_test.go @@ -18,8 +18,8 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" ) -func TestBadRiverConfig(t *testing.T) { - exampleBadRiverConfig := ` +func TestBadAlloyConfig(t *testing.T) { + exampleBadAlloyConfig := ` decision_wait = "10s" num_traces = 0 expected_new_traces_per_sec = 10 @@ -33,11 +33,11 @@ func TestBadRiverConfig(t *testing.T) { ` var args Arguments - require.Error(t, syntax.Unmarshal([]byte(exampleBadRiverConfig), &args), "num_traces must be greater than zero") + require.Error(t, syntax.Unmarshal([]byte(exampleBadAlloyConfig), &args), "num_traces must be greater than zero") } -func TestBadRiverConfigErrorMode(t *testing.T) { - exampleBadRiverConfig := ` +func TestBadAlloyConfigErrorMode(t *testing.T) { + exampleBadAlloyConfig := ` decision_wait = "10s" num_traces = 5 expected_new_traces_per_sec = 10 @@ -62,7 +62,7 @@ func TestBadRiverConfigErrorMode(t *testing.T) { ` var args Arguments - require.ErrorContains(t, syntax.Unmarshal([]byte(exampleBadRiverConfig), &args), "\"\" unknown error mode") + require.ErrorContains(t, syntax.Unmarshal([]byte(exampleBadAlloyConfig), &args), "\"\" unknown error mode") } func TestBadOtelConfig(t *testing.T) { diff --git a/internal/component/otelcol/processor/tail_sampling/types.go b/internal/component/otelcol/processor/tail_sampling/types.go index 3c35a36189..debd82e8cb 100644 --- a/internal/component/otelcol/processor/tail_sampling/types.go +++ b/internal/component/otelcol/processor/tail_sampling/types.go @@ -229,7 +229,7 @@ func (e *ErrorMode) Validate() error { return ottlError.UnmarshalText([]byte(string(*e))) } -// Convert the River type to the Otel type +// Convert the Alloy type to the Otel type func (e *ErrorMode) Convert() ottl.ErrorMode { if e == nil || *e == "" { return ottl.ErrorMode("") diff --git a/internal/component/otelcol/processor/transform/transform.go b/internal/component/otelcol/processor/transform/transform.go index 75f7168007..fb5666e7f7 100644 --- a/internal/component/otelcol/processor/transform/transform.go +++ b/internal/component/otelcol/processor/transform/transform.go @@ -81,12 +81,12 @@ var DefaultArguments = Arguments{ ErrorMode: ottl.PropagateError, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { otelArgs, err := args.convertImpl() if err != nil { diff --git a/internal/component/otelcol/processor/transform/transform_test.go b/internal/component/otelcol/processor/transform/transform_test.go index 79bd6935e3..3bb234260b 100644 --- a/internal/component/otelcol/processor/transform/transform_test.go +++ b/internal/component/otelcol/processor/transform/transform_test.go @@ -12,7 +12,7 @@ import ( const backtick = "`" -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/receiver/jaeger/jaeger.go b/internal/component/otelcol/receiver/jaeger/jaeger.go index 5a63af4c74..7eb734a16b 100644 --- a/internal/component/otelcol/receiver/jaeger/jaeger.go +++ b/internal/component/otelcol/receiver/jaeger/jaeger.go @@ -42,13 +42,13 @@ type Arguments struct { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{} args.DebugMetrics.SetToDefault() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.Protocols.GRPC == nil && args.Protocols.ThriftHTTP == nil && @@ -101,7 +101,7 @@ type GRPC struct { GRPCServerArguments *otelcol.GRPCServerArguments `alloy:",squash"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *GRPC) SetToDefault() { *args = GRPC{ GRPCServerArguments: &otelcol.GRPCServerArguments{ @@ -124,7 +124,7 @@ type ThriftHTTP struct { HTTPServerArguments *otelcol.HTTPServerArguments `alloy:",squash"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ThriftHTTP) SetToDefault() { *args = ThriftHTTP{ HTTPServerArguments: &otelcol.HTTPServerArguments{ @@ -173,7 +173,7 @@ type ThriftCompact struct { ProtocolUDP *ProtocolUDP `alloy:",squash"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ThriftCompact) SetToDefault() { *args = ThriftCompact{ ProtocolUDP: &ProtocolUDP{ @@ -199,7 +199,7 @@ type ThriftBinary struct { ProtocolUDP *ProtocolUDP `alloy:",squash"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *ThriftBinary) SetToDefault() { *args = ThriftBinary{ ProtocolUDP: &ProtocolUDP{ diff --git a/internal/component/otelcol/receiver/jaeger/jaeger_test.go b/internal/component/otelcol/receiver/jaeger/jaeger_test.go index 92ab549783..dba0e77d27 100644 --- a/internal/component/otelcol/receiver/jaeger/jaeger_test.go +++ b/internal/component/otelcol/receiver/jaeger/jaeger_test.go @@ -49,7 +49,7 @@ func Test(t *testing.T) { time.Sleep(100 * time.Millisecond) } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { t.Run("grpc", func(t *testing.T) { in := ` protocols { grpc {} } diff --git a/internal/component/otelcol/receiver/kafka/kafka.go b/internal/component/otelcol/receiver/kafka/kafka.go index 5ba5ad61af..6db69a7490 100644 --- a/internal/component/otelcol/receiver/kafka/kafka.go +++ b/internal/component/otelcol/receiver/kafka/kafka.go @@ -54,7 +54,7 @@ type Arguments struct { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ // We use the defaults from the upstream OpenTelemetry Collector component diff --git a/internal/component/otelcol/receiver/kafka/kafka_test.go b/internal/component/otelcol/receiver/kafka/kafka_test.go index 02b8792437..6433bdf677 100644 --- a/internal/component/otelcol/receiver/kafka/kafka_test.go +++ b/internal/component/otelcol/receiver/kafka/kafka_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/otelcol/receiver/opencensus/opencensus.go b/internal/component/otelcol/receiver/opencensus/opencensus.go index 1500a560fb..eab68e57eb 100644 --- a/internal/component/otelcol/receiver/opencensus/opencensus.go +++ b/internal/component/otelcol/receiver/opencensus/opencensus.go @@ -40,7 +40,7 @@ type Arguments struct { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ GRPC: otelcol.GRPCServerArguments{ diff --git a/internal/component/otelcol/receiver/opencensus/opencensus_test.go b/internal/component/otelcol/receiver/opencensus/opencensus_test.go index 3ce0412229..a497fd2375 100644 --- a/internal/component/otelcol/receiver/opencensus/opencensus_test.go +++ b/internal/component/otelcol/receiver/opencensus/opencensus_test.go @@ -43,7 +43,7 @@ func Test(t *testing.T) { require.NoError(t, ctrl.WaitRunning(time.Second)) } -func TestDefaultArguments_UnmarshalRiver(t *testing.T) { +func TestDefaultArguments_UnmarshalAlloy(t *testing.T) { in := `output { /* no-op */ }` var args opencensus.Arguments @@ -62,7 +62,7 @@ func TestDefaultArguments_UnmarshalRiver(t *testing.T) { require.Equal(t, int(defaultArgs.GRPC.ReadBufferSize), otelArgs.ReadBufferSize) } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { httpAddr := getFreeAddr(t) in := fmt.Sprintf(` cors_allowed_origins = ["https://*.test.com", "https://test.com"] diff --git a/internal/component/otelcol/receiver/otlp/otlp.go b/internal/component/otelcol/receiver/otlp/otlp.go index 36c0638d6f..e5fdd671b5 100644 --- a/internal/component/otelcol/receiver/otlp/otlp.go +++ b/internal/component/otelcol/receiver/otlp/otlp.go @@ -69,7 +69,7 @@ func (args *HTTPConfigArguments) Convert() *otlpreceiver.HTTPConfig { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{} args.DebugMetrics.SetToDefault() @@ -106,7 +106,7 @@ type ( GRPCServerArguments otelcol.GRPCServerArguments ) -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.HTTP != nil { if err := validateURL(args.HTTP.TracesURLPath, "traces_url_path"); err != nil { @@ -132,7 +132,7 @@ func validateURL(url string, urlName string) error { return nil } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *GRPCServerArguments) SetToDefault() { *args = GRPCServerArguments{ Endpoint: "0.0.0.0:4317", @@ -143,7 +143,7 @@ func (args *GRPCServerArguments) SetToDefault() { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *HTTPConfigArguments) SetToDefault() { *args = HTTPConfigArguments{ HTTPServerArguments: &otelcol.HTTPServerArguments{ diff --git a/internal/component/otelcol/receiver/otlp/otlp_test.go b/internal/component/otelcol/receiver/otlp/otlp_test.go index d51c90ae0d..72d65785c8 100644 --- a/internal/component/otelcol/receiver/otlp/otlp_test.go +++ b/internal/component/otelcol/receiver/otlp/otlp_test.go @@ -124,7 +124,7 @@ func getFreeAddr(t *testing.T) string { } func TestUnmarshalGrpc(t *testing.T) { - riverCfg := ` + alloyCfg := ` grpc { endpoint = "/v1/traces" } @@ -133,12 +133,12 @@ func TestUnmarshalGrpc(t *testing.T) { } ` var args otlp.Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) } func TestUnmarshalHttp(t *testing.T) { - riverCfg := ` + alloyCfg := ` http { endpoint = "/v1/traces" } @@ -147,7 +147,7 @@ func TestUnmarshalHttp(t *testing.T) { } ` var args otlp.Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, "/v1/logs", args.HTTP.LogsURLPath) assert.Equal(t, "/v1/metrics", args.HTTP.MetricsURLPath) @@ -155,7 +155,7 @@ func TestUnmarshalHttp(t *testing.T) { } func TestUnmarshalHttpUrls(t *testing.T) { - riverCfg := ` + alloyCfg := ` http { endpoint = "/v1/traces" traces_url_path = "custom/traces" @@ -167,7 +167,7 @@ func TestUnmarshalHttpUrls(t *testing.T) { } ` var args otlp.Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, "custom/logs", args.HTTP.LogsURLPath) assert.Equal(t, "custom/metrics", args.HTTP.MetricsURLPath) diff --git a/internal/component/otelcol/receiver/vcenter/vcenter.go b/internal/component/otelcol/receiver/vcenter/vcenter.go index 2004e9fdd5..e151497ef9 100644 --- a/internal/component/otelcol/receiver/vcenter/vcenter.go +++ b/internal/component/otelcol/receiver/vcenter/vcenter.go @@ -275,7 +275,7 @@ type Arguments struct { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ ScraperControllerArguments: otelcol.DefaultScraperControllerArguments, diff --git a/internal/component/otelcol/receiver/vcenter/vcenter_test.go b/internal/component/otelcol/receiver/vcenter/vcenter_test.go index e6a097d281..b2d727c67c 100644 --- a/internal/component/otelcol/receiver/vcenter/vcenter_test.go +++ b/internal/component/otelcol/receiver/vcenter/vcenter_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { in := ` endpoint = "http://localhost:1234" username = "user" diff --git a/internal/component/otelcol/receiver/zipkin/zipkin.go b/internal/component/otelcol/receiver/zipkin/zipkin.go index ac6a85dd85..880f23f73d 100644 --- a/internal/component/otelcol/receiver/zipkin/zipkin.go +++ b/internal/component/otelcol/receiver/zipkin/zipkin.go @@ -39,7 +39,7 @@ type Arguments struct { var _ receiver.Arguments = Arguments{} -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ HTTPServer: otelcol.HTTPServerArguments{ diff --git a/internal/component/otelcol/receiver/zipkin/zipkin_test.go b/internal/component/otelcol/receiver/zipkin/zipkin_test.go index 3c7c963748..ad1854e5ee 100644 --- a/internal/component/otelcol/receiver/zipkin/zipkin_test.go +++ b/internal/component/otelcol/receiver/zipkin/zipkin_test.go @@ -41,7 +41,7 @@ func TestRun(t *testing.T) { require.NoError(t, ctrl.WaitRunning(time.Second)) } -func TestArguments_UnmarshalRiver(t *testing.T) { +func TestArguments_UnmarshalAlloy(t *testing.T) { t.Run("grpc", func(t *testing.T) { httpAddr := getFreeAddr(t) in := fmt.Sprintf(` diff --git a/internal/component/prometheus/exporter/apache/apache.go b/internal/component/prometheus/exporter/apache/apache.go index 0d2b95c5fd..11ba72a21f 100644 --- a/internal/component/prometheus/exporter/apache/apache.go +++ b/internal/component/prometheus/exporter/apache/apache.go @@ -38,7 +38,7 @@ type Arguments struct { ApacheInsecure bool `alloy:"insecure,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/azure/azure.go b/internal/component/prometheus/exporter/azure/azure.go index e51fd7f744..50c4bb5f1e 100644 --- a/internal/component/prometheus/exporter/azure/azure.go +++ b/internal/component/prometheus/exporter/azure/azure.go @@ -41,7 +41,7 @@ type Arguments struct { Regions []string `alloy:"regions,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ Timespan: "PT1M", @@ -56,7 +56,7 @@ func (a *Arguments) SetToDefault() { } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if err := a.Convert().Validate(); err != nil { return err diff --git a/internal/component/prometheus/exporter/blackbox/blackbox.go b/internal/component/prometheus/exporter/blackbox/blackbox.go index def1b0560e..f51430a429 100644 --- a/internal/component/prometheus/exporter/blackbox/blackbox.go +++ b/internal/component/prometheus/exporter/blackbox/blackbox.go @@ -62,7 +62,7 @@ func buildBlackboxTargets(baseTarget discovery.Target, args component.Arguments) } // DefaultArguments holds non-zero default options for Arguments when it is -// unmarshaled from river. +// unmarshaled from Alloy. var DefaultArguments = Arguments{ ProbeTimeoutOffset: 500 * time.Millisecond, } @@ -97,12 +97,12 @@ type Arguments struct { ProbeTimeoutOffset time.Duration `alloy:"probe_timeout_offset,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.ConfigFile != "" && a.Config.Value != "" { return errors.New("config and config_file are mutually exclusive") diff --git a/internal/component/prometheus/exporter/blackbox/blackbox_test.go b/internal/component/prometheus/exporter/blackbox/blackbox_test.go index ba0f63e123..8677befa08 100644 --- a/internal/component/prometheus/exporter/blackbox/blackbox_test.go +++ b/internal/component/prometheus/exporter/blackbox/blackbox_test.go @@ -13,8 +13,8 @@ import ( "gopkg.in/yaml.v2" ) -func TestUnmarshalRiver(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloy(t *testing.T) { + alloyCfg := ` config_file = "modules.yml" target { name = "target_a" @@ -29,7 +29,7 @@ func TestUnmarshalRiver(t *testing.T) { probe_timeout_offset = "0.5s" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "modules.yml", args.ConfigFile) require.Equal(t, 2, len(args.Targets)) @@ -42,8 +42,8 @@ func TestUnmarshalRiver(t *testing.T) { require.Contains(t, "http_2xx", args.Targets[1].Module) } -func TestUnmarshalRiverWithInlineConfig(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloyWithInlineConfig(t *testing.T) { + alloyCfg := ` config = "{ modules: { http_2xx: { prober: http, timeout: 5s } } }" target { @@ -59,7 +59,7 @@ func TestUnmarshalRiverWithInlineConfig(t *testing.T) { probe_timeout_offset = "0.5s" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "", args.ConfigFile) var blackboxConfig blackbox_config.Config @@ -77,8 +77,8 @@ func TestUnmarshalRiverWithInlineConfig(t *testing.T) { require.Contains(t, "http_2xx", args.Targets[1].Module) } -func TestUnmarshalRiverWithInlineConfigYaml(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloyWithInlineConfigYaml(t *testing.T) { + alloyCfg := ` config = "modules:\n http_2xx:\n prober: http\n timeout: 5s\n" target { @@ -94,7 +94,7 @@ func TestUnmarshalRiverWithInlineConfigYaml(t *testing.T) { probe_timeout_offset = "0.5s" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "", args.ConfigFile) var blackboxConfig blackbox_config.Config @@ -112,7 +112,7 @@ func TestUnmarshalRiverWithInlineConfigYaml(t *testing.T) { require.Contains(t, "http_2xx", args.Targets[1].Module) } -func TestUnmarshalRiverWithInvalidConfig(t *testing.T) { +func TestUnmarshalAlloyWithInvalidConfig(t *testing.T) { var tests = []struct { testname string cfg string diff --git a/internal/component/prometheus/exporter/cadvisor/cadvisor.go b/internal/component/prometheus/exporter/cadvisor/cadvisor.go index 0e3584a7d6..895158cfd7 100644 --- a/internal/component/prometheus/exporter/cadvisor/cadvisor.go +++ b/internal/component/prometheus/exporter/cadvisor/cadvisor.go @@ -48,7 +48,7 @@ type Arguments struct { DisableRootCgroupStats bool `alloy:"disable_root_cgroup_stats,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ StoreContainerLabels: true, diff --git a/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go b/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go index 2e9b44d39a..c0ee7a4b25 100644 --- a/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go +++ b/internal/component/prometheus/exporter/cadvisor/cadvisor_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestUnmarshalRiver(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloy(t *testing.T) { + alloyCfg := ` store_container_labels = true allowlisted_container_labels = ["label1", "label2"] env_metadata_allowlist = ["env1", "env2"] @@ -29,7 +29,7 @@ docker_tls_key = "docker_tls_key" docker_tls_ca = "docker_tls_ca" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) expected := Arguments{ StoreContainerLabels: true, diff --git a/internal/component/prometheus/exporter/cloudwatch/config.go b/internal/component/prometheus/exporter/cloudwatch/config.go index 02c73b33d4..f11de6f0bc 100644 --- a/internal/component/prometheus/exporter/cloudwatch/config.go +++ b/internal/component/prometheus/exporter/cloudwatch/config.go @@ -28,7 +28,7 @@ var defaults = Arguments{ }, } -// Arguments are the river based options to configure the embedded CloudWatch exporter. +// Arguments are the Alloy based options to configure the embedded CloudWatch exporter. type Arguments struct { STSRegion string `alloy:"sts_region,attr"` FIPSDisabled bool `alloy:"fips_disabled,attr,optional"` @@ -103,7 +103,7 @@ func (a *Arguments) SetToDefault() { *a = defaults } -// ConvertToYACE converts the river config into YACE config model. Note that +// ConvertToYACE converts the Alloy config into YACE config model. Note that // the conversion is not direct, some values have been opinionated to simplify // the config model Alloy exposes for this integration. func ConvertToYACE(a Arguments) (yaceConf.ScrapeConf, error) { @@ -244,7 +244,7 @@ func toYACEDiscoveryJob(rj DiscoveryJob) *yaceConf.Job { return job } -// getHash calculates the MD5 hash of the river representation of the config. +// getHash calculates the MD5 hash of the Alloy representation of the config. func getHash(a Arguments) string { bytes, err := syntax.Marshal(a) if err != nil { diff --git a/internal/component/prometheus/exporter/consul/consul.go b/internal/component/prometheus/exporter/consul/consul.go index 4cc528ff8f..8bcb9ea4dc 100644 --- a/internal/component/prometheus/exporter/consul/consul.go +++ b/internal/component/prometheus/exporter/consul/consul.go @@ -53,7 +53,7 @@ type Arguments struct { HealthSummary bool `alloy:"generate_health_summary,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go b/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go index adacaf997b..28ec634b36 100644 --- a/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go +++ b/internal/component/prometheus/exporter/dnsmasq/dnsmasq.go @@ -43,7 +43,7 @@ type Arguments struct { ExposeLeases bool `alloy:"expose_leases,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go b/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go index 21b54aa817..b4f25223a6 100644 --- a/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go +++ b/internal/component/prometheus/exporter/dnsmasq/dnsmasq_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestUnmarshalRiver(t *testing.T) { +func TestUnmarshalAlloy(t *testing.T) { rawCfg := ` address = "localhost:9999" leases_file = "/etc/dnsmasq.leases" @@ -26,7 +26,7 @@ func TestUnmarshalRiver(t *testing.T) { assert.Equal(t, expected, args) } -func TestUnmarshalRiverDefaults(t *testing.T) { +func TestUnmarshalAlloyDefaults(t *testing.T) { rawCfg := `` var args Arguments err := syntax.Unmarshal([]byte(rawCfg), &args) @@ -37,7 +37,7 @@ func TestUnmarshalRiverDefaults(t *testing.T) { } func TestConvert(t *testing.T) { - riverArguments := Arguments{ + alloyArguments := Arguments{ Address: "localhost:9999", LeasesFile: "/etc/dnsmasq.leases", ExposeLeases: true, @@ -49,5 +49,5 @@ func TestConvert(t *testing.T) { ExposeLeases: true, } - assert.Equal(t, expected, riverArguments.Convert()) + assert.Equal(t, expected, alloyArguments.Convert()) } diff --git a/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go b/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go index 84996d7db1..12a632cd7f 100644 --- a/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go +++ b/internal/component/prometheus/exporter/elasticsearch/elasticsearch.go @@ -28,7 +28,7 @@ func createExporter(opts component.Options, args component.Arguments, defaultIns } // DefaultArguments holds non-zero default options for Arguments when it is -// unmarshaled from river. +// unmarshaled from Alloy. var DefaultArguments = Arguments{ Address: "http://localhost:9200", Timeout: 5 * time.Second, @@ -58,7 +58,7 @@ type Arguments struct { BasicAuth *commonCfg.BasicAuth `alloy:"basic_auth,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go b/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go index 9f4deedfb9..6d6d0bc453 100644 --- a/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go +++ b/internal/component/prometheus/exporter/elasticsearch/elasticsearch_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` address = "http://localhost:9300" timeout = "10s" all = true @@ -37,7 +37,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -67,7 +67,7 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverConfig := ` + alloyConfig := ` address = "http://localhost:9300" timeout = "10s" all = true @@ -90,7 +90,7 @@ func TestConvert(t *testing.T) { } ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) res := args.Convert() diff --git a/internal/component/prometheus/exporter/gcp/gcp.go b/internal/component/prometheus/exporter/gcp/gcp.go index cceed35743..24188d60ce 100644 --- a/internal/component/prometheus/exporter/gcp/gcp.go +++ b/internal/component/prometheus/exporter/gcp/gcp.go @@ -45,12 +45,12 @@ var DefaultArguments = Arguments{ DropDelegatedProjects: false, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if err := a.Convert().Validate(); err != nil { return err diff --git a/internal/component/prometheus/exporter/gcp/gcp_test.go b/internal/component/prometheus/exporter/gcp/gcp_test.go index aad6a55c7d..4fc860608a 100644 --- a/internal/component/prometheus/exporter/gcp/gcp_test.go +++ b/internal/component/prometheus/exporter/gcp/gcp_test.go @@ -10,18 +10,18 @@ import ( func TestConvertConfig(t *testing.T) { type testcase struct { - riverCfg string + alloyCfg string expectedArgs Arguments expectedUnmarshalError string } for name, tc := range map[string]testcase{ "err no project ids": { - riverCfg: ``, + alloyCfg: ``, expectedArgs: DefaultArguments, expectedUnmarshalError: "missing required attribute \"project_ids\"", }, "err no metrics prefixes": { - riverCfg: ` + alloyCfg: ` project_ids = [ "foo", "bar", @@ -38,7 +38,7 @@ func TestConvertConfig(t *testing.T) { expectedUnmarshalError: "missing required attribute \"metrics_prefixes\"", }, "healthy all defaults": { - riverCfg: ` + alloyCfg: ` project_ids = [ "foo", "bar", @@ -65,7 +65,7 @@ func TestConvertConfig(t *testing.T) { expectedUnmarshalError: "", }, "healthy default override": { - riverCfg: ` + alloyCfg: ` project_ids = [ "foo", "bar", @@ -110,7 +110,7 @@ func TestConvertConfig(t *testing.T) { } { t.Run(name, func(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(tc.riverCfg), &args) + err := syntax.Unmarshal([]byte(tc.alloyCfg), &args) if tc.expectedUnmarshalError != "" { require.EqualError(t, err, tc.expectedUnmarshalError) } else { diff --git a/internal/component/prometheus/exporter/github/github.go b/internal/component/prometheus/exporter/github/github.go index 25d442d4e3..0adf99f079 100644 --- a/internal/component/prometheus/exporter/github/github.go +++ b/internal/component/prometheus/exporter/github/github.go @@ -27,7 +27,7 @@ func createExporter(opts component.Options, args component.Arguments, defaultIns } // DefaultArguments holds non-zero default options for Arguments when it is -// unmarshaled from river. +// unmarshaled from Alloy. var DefaultArguments = Arguments{ APIURL: github_exporter.DefaultConfig.APIURL, } @@ -41,7 +41,7 @@ type Arguments struct { APITokenFile string `alloy:"api_token_file,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/github/github_test.go b/internal/component/prometheus/exporter/github/github_test.go index 2a729298a8..9740a21ece 100644 --- a/internal/component/prometheus/exporter/github/github_test.go +++ b/internal/component/prometheus/exporter/github/github_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestUnmarshalRiver(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloy(t *testing.T) { + alloyCfg := ` api_token_file = "/etc/github-api-token" repositories = ["grafana/alloy"] organizations = ["grafana", "prometheus"] @@ -16,7 +16,7 @@ func TestUnmarshalRiver(t *testing.T) { api_url = "https://some-other-api.github.com" ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "/etc/github-api-token", args.APITokenFile) require.Equal(t, []string{"grafana/alloy"}, args.Repositories) diff --git a/internal/component/prometheus/exporter/kafka/kafka.go b/internal/component/prometheus/exporter/kafka/kafka.go index e4f32aea2e..d6b8071ee1 100644 --- a/internal/component/prometheus/exporter/kafka/kafka.go +++ b/internal/component/prometheus/exporter/kafka/kafka.go @@ -61,12 +61,12 @@ func init() { }) } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.Instance == "" && len(a.KafkaURIs) > 1 { return fmt.Errorf("an automatic value for `instance` cannot be determined from %d kafka servers, manually provide one for this component", len(a.KafkaURIs)) diff --git a/internal/component/prometheus/exporter/kafka/kafka_test.go b/internal/component/prometheus/exporter/kafka/kafka_test.go index a3d34fc311..f5a29e72e8 100644 --- a/internal/component/prometheus/exporter/kafka/kafka_test.go +++ b/internal/component/prometheus/exporter/kafka/kafka_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` instance = "example" kafka_uris = ["localhost:9092","localhost:19092"] use_sasl_handshake = false @@ -23,7 +23,7 @@ func TestRiverUnmarshal(t *testing.T) { groups_filter_regex = ".*" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -42,7 +42,7 @@ func TestRiverUnmarshal(t *testing.T) { } func TestUnmarshalInvalid(t *testing.T) { - validRiverConfig := ` + validAlloyConfig := ` instance = "example" kafka_uris = ["localhost:9092","localhost:19092"] use_sasl_handshake = false @@ -56,19 +56,19 @@ func TestUnmarshalInvalid(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(validRiverConfig), &args) + err := syntax.Unmarshal([]byte(validAlloyConfig), &args) require.NoError(t, err) - invalidRiverConfig := ` + invalidAlloyConfig := ` instance = "example" kafka_uris = "localhost:9092" ` var invalidArgs Arguments - err = syntax.Unmarshal([]byte(invalidRiverConfig), &invalidArgs) + err = syntax.Unmarshal([]byte(invalidAlloyConfig), &invalidArgs) require.Error(t, err) } -func TestRiverConvert(t *testing.T) { +func TestAlloyConvert(t *testing.T) { orig := Arguments{ Instance: "example", KafkaURIs: []string{"localhost:9092", "localhost:19092"}, @@ -110,13 +110,13 @@ func TestCustomizeTarget(t *testing.T) { } func TestSASLPassword(t *testing.T) { // #6044 - var exampleRiverConfig = ` + var exampleAlloyConfig = ` kafka_uris = ["broker1"] use_sasl = true sasl_password = "foobar" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } diff --git a/internal/component/prometheus/exporter/memcached/memcached.go b/internal/component/prometheus/exporter/memcached/memcached.go index fcecc69b77..ab67acdfcb 100644 --- a/internal/component/prometheus/exporter/memcached/memcached.go +++ b/internal/component/prometheus/exporter/memcached/memcached.go @@ -46,12 +46,12 @@ type Arguments struct { TLSConfig *config.TLSConfig `alloy:"tls_config,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a Arguments) Validate() error { if a.TLSConfig == nil { return nil diff --git a/internal/component/prometheus/exporter/memcached/memcached_test.go b/internal/component/prometheus/exporter/memcached/memcached_test.go index 75659b6675..50f21301af 100644 --- a/internal/component/prometheus/exporter/memcached/memcached_test.go +++ b/internal/component/prometheus/exporter/memcached/memcached_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" ) -func TestRiverUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` address = "localhost:99" timeout = "5s"` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) assert.NoError(t, err) expected := Arguments{ @@ -27,8 +27,8 @@ timeout = "5s"` assert.Equal(t, expected, args) } -func TestRiverUnmarshalTLS(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyUnmarshalTLS(t *testing.T) { + var exampleAlloyConfig = ` address = "localhost:99" timeout = "5s" tls_config { @@ -37,7 +37,7 @@ tls_config { key_file = "/path/to/key_file" }` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) assert.NoError(t, err) expected := Arguments{ @@ -51,14 +51,14 @@ tls_config { } assert.Equal(t, expected, args) - var invalidRiverConfig = ` + var invalidAlloyConfig = ` address = "localhost:99" timeout = "5s" tls_config { ca_pem = "ca" ca_file = "/path/to/ca_file" }` - err = syntax.Unmarshal([]byte(invalidRiverConfig), &args) + err = syntax.Unmarshal([]byte(invalidAlloyConfig), &args) assert.Error(t, err) assert.ErrorContains(t, err, "at most one of") } @@ -69,11 +69,11 @@ func TestValidateNilTLSConfig(t *testing.T) { assert.NoError(t, err) } -func TestRiverUnmarshalDefaults(t *testing.T) { - var exampleRiverConfig = `` +func TestAlloyUnmarshalDefaults(t *testing.T) { + var exampleAlloyConfig = `` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) assert.NoError(t, err) expected := DefaultArguments @@ -81,8 +81,8 @@ func TestRiverUnmarshalDefaults(t *testing.T) { assert.Equal(t, expected, args) } -func TestRiverConvert(t *testing.T) { - riverArguments := Arguments{ +func TestAlloyConvert(t *testing.T) { + alloyArguments := Arguments{ Address: "localhost:99", Timeout: 5 * time.Second, } @@ -92,5 +92,5 @@ func TestRiverConvert(t *testing.T) { Timeout: 5 * time.Second, } - assert.Equal(t, expected, riverArguments.Convert()) + assert.Equal(t, expected, alloyArguments.Convert()) } diff --git a/internal/component/prometheus/exporter/mongodb/mongodb_test.go b/internal/component/prometheus/exporter/mongodb/mongodb_test.go index 4b1937567b..c930e7d1c3 100644 --- a/internal/component/prometheus/exporter/mongodb/mongodb_test.go +++ b/internal/component/prometheus/exporter/mongodb/mongodb_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` mongodb_uri = "mongodb://127.0.0.1:27017" direct_connect = true discovering_mode = true @@ -17,7 +17,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -31,14 +31,14 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverConfig := ` + alloyConfig := ` mongodb_uri = "mongodb://127.0.0.1:27017" direct_connect = true discovering_mode = true tls_basic_auth_config_path = "/etc/path-to-file" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) res := args.Convert() diff --git a/internal/component/prometheus/exporter/mssql/mssql.go b/internal/component/prometheus/exporter/mssql/mssql.go index dd0efb3bd9..5981326c8b 100644 --- a/internal/component/prometheus/exporter/mssql/mssql.go +++ b/internal/component/prometheus/exporter/mssql/mssql.go @@ -49,12 +49,12 @@ type Arguments struct { QueryConfig alloytypes.OptionalSecret `alloy:"query_config,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.MaxOpenConnections < 1 { return errors.New("max_open_connections must be at least 1") diff --git a/internal/component/prometheus/exporter/mssql/mssql_test.go b/internal/component/prometheus/exporter/mssql/mssql_test.go index 9b7762f8a7..f9ef263405 100644 --- a/internal/component/prometheus/exporter/mssql/mssql_test.go +++ b/internal/component/prometheus/exporter/mssql/mssql_test.go @@ -13,15 +13,15 @@ import ( "gopkg.in/yaml.v2" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 3 max_open_connections = 3 timeout = "10s"` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -34,8 +34,8 @@ func TestRiverUnmarshal(t *testing.T) { require.Equal(t, expected, args) } -func TestRiverUnmarshalWithInlineQueryConfig(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshalWithInlineQueryConfig(t *testing.T) { + alloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 3 max_open_connections = 3 @@ -43,7 +43,7 @@ func TestRiverUnmarshalWithInlineQueryConfig(t *testing.T) { query_config = "{ collector_name: mssql_standard, metrics: [ { metric_name: mssql_local_time_seconds, type: gauge, help: 'Local time in seconds since epoch (Unix time).', values: [ unix_time ], query: \"SELECT DATEDIFF(second, '19700101', GETUTCDATE()) AS unix_time\" } ] }"` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) var collectorConfig config.CollectorConfig err = yaml.UnmarshalStrict([]byte(args.QueryConfig.Value), &collectorConfig) @@ -63,8 +63,8 @@ func TestRiverUnmarshalWithInlineQueryConfig(t *testing.T) { require.Equal(t, "SELECT DATEDIFF(second, '19700101', GETUTCDATE()) AS unix_time", collectorConfig.Metrics[0].QueryLiteral) } -func TestRiverUnmarshalWithInlineQueryConfigYaml(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshalWithInlineQueryConfigYaml(t *testing.T) { + alloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 3 max_open_connections = 3 @@ -72,7 +72,7 @@ func TestRiverUnmarshalWithInlineQueryConfigYaml(t *testing.T) { query_config = "collector_name: mssql_standard\nmetrics:\n- metric_name: mssql_local_time_seconds\n type: gauge\n help: 'Local time in seconds since epoch (Unix time).'\n values: [unix_time]\n query: \"SELECT DATEDIFF(second, '19700101', GETUTCDATE()) AS unix_time\""` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) var collectorConfig config.CollectorConfig err = yaml.UnmarshalStrict([]byte(args.QueryConfig.Value), &collectorConfig) @@ -93,7 +93,7 @@ func TestRiverUnmarshalWithInlineQueryConfigYaml(t *testing.T) { } func TestUnmarshalInvalid(t *testing.T) { - invalidRiverConfig := ` + invalidAlloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 1 max_open_connections = 1 @@ -101,13 +101,13 @@ func TestUnmarshalInvalid(t *testing.T) { ` var invalidArgs Arguments - err := syntax.Unmarshal([]byte(invalidRiverConfig), &invalidArgs) + err := syntax.Unmarshal([]byte(invalidAlloyConfig), &invalidArgs) require.Error(t, err) require.EqualError(t, err, "timeout must be positive") } func TestUnmarshalInvalidQueryConfigYaml(t *testing.T) { - invalidRiverConfig := ` + invalidAlloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 1 max_open_connections = 1 @@ -116,13 +116,13 @@ func TestUnmarshalInvalidQueryConfigYaml(t *testing.T) { ` var invalidArgs Arguments - err := syntax.Unmarshal([]byte(invalidRiverConfig), &invalidArgs) + err := syntax.Unmarshal([]byte(invalidAlloyConfig), &invalidArgs) require.Error(t, err) require.EqualError(t, err, "invalid query_config: yaml: line 1: did not find expected ',' or ']'") } func TestUnmarshalInvalidProperty(t *testing.T) { - invalidRiverConfig := ` + invalidAlloyConfig := ` connection_string = "sqlserver://user:pass@localhost:1433" max_idle_connections = 1 max_open_connections = 1 @@ -131,7 +131,7 @@ func TestUnmarshalInvalidProperty(t *testing.T) { ` var invalidArgs Arguments - err := syntax.Unmarshal([]byte(invalidRiverConfig), &invalidArgs) + err := syntax.Unmarshal([]byte(invalidAlloyConfig), &invalidArgs) require.Error(t, err) require.EqualError(t, err, "invalid query_config: unknown fields in collector: bad_param") } diff --git a/internal/component/prometheus/exporter/mysql/mysql.go b/internal/component/prometheus/exporter/mysql/mysql.go index 38887556b4..69ab29d394 100644 --- a/internal/component/prometheus/exporter/mysql/mysql.go +++ b/internal/component/prometheus/exporter/mysql/mysql.go @@ -125,12 +125,12 @@ type MySQLUser struct { Privileges bool `alloy:"privileges,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { _, err := mysql.ParseDSN(string(a.DataSourceName)) if err != nil { diff --git a/internal/component/prometheus/exporter/mysql/mysql_test.go b/internal/component/prometheus/exporter/mysql/mysql_test.go index 3e61ccbd99..d3704bae0a 100644 --- a/internal/component/prometheus/exporter/mysql/mysql_test.go +++ b/internal/component/prometheus/exporter/mysql/mysql_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfigUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` data_source_name = "root:secret_password@tcp(localhost:3306)/mydb" enable_collectors = ["collector1"] disable_collectors = ["collector2"] @@ -55,7 +55,7 @@ func TestRiverConfigUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) require.Equal(t, "root:secret_password@tcp(localhost:3306)/mydb", string(args.DataSourceName)) @@ -80,8 +80,8 @@ func TestRiverConfigUnmarshal(t *testing.T) { require.False(t, args.MySQLUser.Privileges) } -func TestRiverConfigConvert(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigConvert(t *testing.T) { + var exampleAlloyConfig = ` data_source_name = "root:secret_password@tcp(localhost:3306)/mydb" enable_collectors = ["collector1"] disable_collectors = ["collector2"] @@ -126,7 +126,7 @@ func TestRiverConfigConvert(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) c := args.Convert() diff --git a/internal/component/prometheus/exporter/oracledb/oracledb.go b/internal/component/prometheus/exporter/oracledb/oracledb.go index b5425ca83a..e6f529cbb6 100644 --- a/internal/component/prometheus/exporter/oracledb/oracledb.go +++ b/internal/component/prometheus/exporter/oracledb/oracledb.go @@ -50,12 +50,12 @@ type Arguments struct { QueryTimeout int `alloy:"query_timeout,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.ConnectionString == "" { return errNoConnectionString diff --git a/internal/component/prometheus/exporter/oracledb/oracledb_test.go b/internal/component/prometheus/exporter/oracledb/oracledb_test.go index 56794e46f8..fb378c099e 100644 --- a/internal/component/prometheus/exporter/oracledb/oracledb_test.go +++ b/internal/component/prometheus/exporter/oracledb/oracledb_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` connection_string = "oracle://user:password@localhost:1521/orcl.localnet" max_idle_conns = 0 max_open_conns = 10 @@ -20,7 +20,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -95,11 +95,11 @@ func TestArgumentsValidate(t *testing.T) { } func TestConvert(t *testing.T) { - riverConfig := ` + alloyConfig := ` connection_string = "oracle://user:password@localhost:1521/orcl.localnet" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) res := args.Convert() diff --git a/internal/component/prometheus/exporter/postgres/postgres.go b/internal/component/prometheus/exporter/postgres/postgres.go index 79ee26406e..505bfc582e 100644 --- a/internal/component/prometheus/exporter/postgres/postgres.go +++ b/internal/component/prometheus/exporter/postgres/postgres.go @@ -95,7 +95,7 @@ type AutoDiscovery struct { DatabaseDenylist []string `alloy:"database_denylist,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/postgres/postgres_test.go b/internal/component/prometheus/exporter/postgres/postgres_test.go index c88f31c4da..b71e1ee257 100644 --- a/internal/component/prometheus/exporter/postgres/postgres_test.go +++ b/internal/component/prometheus/exporter/postgres/postgres_test.go @@ -6,13 +6,12 @@ import ( "github.com/grafana/alloy/internal/static/integrations/postgres_exporter" "github.com/grafana/alloy/syntax" "github.com/grafana/alloy/syntax/alloytypes" - rivertypes "github.com/grafana/alloy/syntax/alloytypes" config_util "github.com/prometheus/common/config" "github.com/stretchr/testify/require" ) -func TestRiverConfigUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` data_source_names = ["postgresql://username:password@localhost:5432/database?sslmode=disable"] disable_settings_metrics = true disable_default_metrics = true @@ -25,11 +24,11 @@ func TestRiverConfigUnmarshal(t *testing.T) { }` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) expected := Arguments{ - DataSourceNames: []alloytypes.Secret{rivertypes.Secret("postgresql://username:password@localhost:5432/database?sslmode=disable")}, + DataSourceNames: []alloytypes.Secret{alloytypes.Secret("postgresql://username:password@localhost:5432/database?sslmode=disable")}, DisableSettingsMetrics: true, AutoDiscovery: AutoDiscovery{ Enabled: false, @@ -43,8 +42,8 @@ func TestRiverConfigUnmarshal(t *testing.T) { require.Equal(t, expected, args) } -func TestRiverConfigConvert(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigConvert(t *testing.T) { + var exampleAlloyConfig = ` data_source_names = ["postgresql://username:password@localhost:5432/database?sslmode=disable"] disable_settings_metrics = true disable_default_metrics = true @@ -57,7 +56,7 @@ func TestRiverConfigConvert(t *testing.T) { }` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) c := args.Convert() diff --git a/internal/component/prometheus/exporter/process/process.go b/internal/component/prometheus/exporter/process/process.go index ffdfb90a14..efddd07b44 100644 --- a/internal/component/prometheus/exporter/process/process.go +++ b/internal/component/prometheus/exporter/process/process.go @@ -46,7 +46,7 @@ type Arguments struct { Recheck bool `alloy:"recheck_on_scrape,attr,optional"` } -// MatcherGroup taken and converted to River from github.com/ncabatoff/process-exporter/config +// MatcherGroup taken and converted to Alloy from github.com/ncabatoff/process-exporter/config type MatcherGroup struct { Name string `alloy:"name,attr,optional"` CommRules []string `alloy:"comm,attr,optional"` @@ -54,7 +54,7 @@ type MatcherGroup struct { CmdlineRules []string `alloy:"cmdline,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/process/process_test.go b/internal/component/prometheus/exporter/process/process_test.go index 03f8bca71e..300ab35e87 100644 --- a/internal/component/prometheus/exporter/process/process_test.go +++ b/internal/component/prometheus/exporter/process/process_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfigUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` matcher { name = "alloy" comm = ["alloy"] @@ -22,7 +22,7 @@ func TestRiverConfigUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) require.False(t, args.Children) @@ -40,8 +40,8 @@ func TestRiverConfigUnmarshal(t *testing.T) { require.Equal(t, expected, args.ProcessExporter) } -func TestRiverConfigConvert(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfigConvert(t *testing.T) { + var exampleAlloyConfig = ` matcher { name = "static" comm = ["grafana-agent"] @@ -54,7 +54,7 @@ func TestRiverConfigConvert(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) require.True(t, args.Children) diff --git a/internal/component/prometheus/exporter/redis/redis.go b/internal/component/prometheus/exporter/redis/redis.go index 93d5b5326b..b9afa624d8 100644 --- a/internal/component/prometheus/exporter/redis/redis.go +++ b/internal/component/prometheus/exporter/redis/redis.go @@ -31,7 +31,7 @@ func createExporter(opts component.Options, args component.Arguments, defaultIns } // DefaultArguments holds non-zero default options for Arguments when it is -// unmarshaled from river. +// unmarshaled from Alloy. var DefaultArguments = Arguments{ IncludeExporterMetrics: false, Namespace: "redis", @@ -83,12 +83,12 @@ type Arguments struct { SkipTLSVerification bool `alloy:"skip_tls_verification,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.ScriptPath != "" && len(a.ScriptPaths) > 0 { return fmt.Errorf("only one of script_path and script_paths should be specified") diff --git a/internal/component/prometheus/exporter/redis/redis_test.go b/internal/component/prometheus/exporter/redis/redis_test.go index 777daecf3b..5fa09297e3 100644 --- a/internal/component/prometheus/exporter/redis/redis_test.go +++ b/internal/component/prometheus/exporter/redis/redis_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` redis_addr = "localhost:6379" redis_user = "redis_user" redis_password_file = "/tmp/pass" @@ -41,7 +41,7 @@ func TestRiverUnmarshal(t *testing.T) { is_cluster = true ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -83,25 +83,25 @@ func TestRiverUnmarshal(t *testing.T) { } func TestUnmarshalInvalid(t *testing.T) { - validRiverConfig := ` + validAlloyConfig := ` redis_addr = "localhost:1234" script_path = "/tmp/metrics.lua"` var args Arguments - err := syntax.Unmarshal([]byte(validRiverConfig), &args) + err := syntax.Unmarshal([]byte(validAlloyConfig), &args) require.NoError(t, err) - invalidRiverConfig := ` + invalidAlloyConfig := ` redis_addr = "localhost:1234 script_path = "/tmp/metrics.lua" script_paths = ["/tmp/more-metrics.lua", "/tmp/even-more-metrics.lua"]` var invalidArgs Arguments - err = syntax.Unmarshal([]byte(invalidRiverConfig), &invalidArgs) + err = syntax.Unmarshal([]byte(invalidAlloyConfig), &invalidArgs) require.Error(t, err) } -func TestRiverConvert(t *testing.T) { +func TestAlloyConvert(t *testing.T) { orig := Arguments{ RedisAddr: "localhost:6379", RedisUser: "redis_user", diff --git a/internal/component/prometheus/exporter/self/self.go b/internal/component/prometheus/exporter/self/self.go index cc0d036a9c..fb0dbccf89 100644 --- a/internal/component/prometheus/exporter/self/self.go +++ b/internal/component/prometheus/exporter/self/self.go @@ -30,7 +30,7 @@ type Arguments struct{} // Exports holds the values exported by the prometheus.exporter.self component. type Exports struct{} -// SetToDefault implements river.Defaulter +// SetToDefault implements syntax.Defaulter func (args *Arguments) SetToDefault() { *args = Arguments{} } diff --git a/internal/component/prometheus/exporter/snmp/snmp.go b/internal/component/prometheus/exporter/snmp/snmp.go index 2d2994f7b6..01d878d00f 100644 --- a/internal/component/prometheus/exporter/snmp/snmp.go +++ b/internal/component/prometheus/exporter/snmp/snmp.go @@ -119,8 +119,8 @@ type Arguments struct { ConfigStruct snmp_config.Config } -// UnmarshalRiver implements River unmarshalling for Arguments. -func (a *Arguments) UnmarshalRiver(f func(interface{}) error) error { +// UnmarshalAlloy implements Alloy unmarshalling for Arguments. +func (a *Arguments) UnmarshalAlloy(f func(interface{}) error) error { type args Arguments if err := f((*args)(a)); err != nil { return err diff --git a/internal/component/prometheus/exporter/snmp/snmp_test.go b/internal/component/prometheus/exporter/snmp/snmp_test.go index 26a5df6370..efae26ecfb 100644 --- a/internal/component/prometheus/exporter/snmp/snmp_test.go +++ b/internal/component/prometheus/exporter/snmp/snmp_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestUnmarshalRiver(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloy(t *testing.T) { + alloyCfg := ` config_file = "modules.yml" target "network_switch_1" { address = "192.168.1.2" @@ -35,7 +35,7 @@ func TestUnmarshalRiver(t *testing.T) { } ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "modules.yml", args.ConfigFile) require.Equal(t, 2, len(args.Targets)) @@ -145,8 +145,8 @@ func TestBuildSNMPTargets(t *testing.T) { require.Equal(t, "public_v2", targets[0]["__param_auth"]) } -func TestUnmarshalRiverWithInlineConfig(t *testing.T) { - riverCfg := ` +func TestUnmarshalAlloyWithInlineConfig(t *testing.T) { + alloyCfg := ` config = "{ modules: {if_mib: {walk: [1.3.6.1.2.1.2], get: [1.3.6.1.2.1.1.3.0], metrics: [{name: sysUpTime, oid: 1.3.6.1.2.1.1.3, type: gauge}]}}, auths: { public_v1: { community: public, security_level: noAuthNoPriv, auth_protocol: MD5, priv_protocol: DES, version: 1 } } }" target "network_switch_1" { @@ -162,7 +162,7 @@ func TestUnmarshalRiverWithInlineConfig(t *testing.T) { } ` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) require.Equal(t, "", args.ConfigFile) require.Equal(t, args.ConfigStruct.Modules["if_mib"].Walk, []string{"1.3.6.1.2.1.2"}) @@ -190,7 +190,7 @@ func TestUnmarshalRiverWithInlineConfig(t *testing.T) { require.Contains(t, "private", args.Targets[1].WalkParams) require.Contains(t, "public_v2", args.Targets[1].Auth) } -func TestUnmarshalRiverWithInvalidInlineConfig(t *testing.T) { +func TestUnmarshalAlloyWithInvalidInlineConfig(t *testing.T) { var tests = []struct { testname string cfg string diff --git a/internal/component/prometheus/exporter/snowflake/snowflake.go b/internal/component/prometheus/exporter/snowflake/snowflake.go index b4d7e63732..9f3e934d76 100644 --- a/internal/component/prometheus/exporter/snowflake/snowflake.go +++ b/internal/component/prometheus/exporter/snowflake/snowflake.go @@ -40,7 +40,7 @@ type Arguments struct { Warehouse string `alloy:"warehouse,attr"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/snowflake/snowflake_test.go b/internal/component/prometheus/exporter/snowflake/snowflake_test.go index 47f8a2ae43..5d658892f3 100644 --- a/internal/component/prometheus/exporter/snowflake/snowflake_test.go +++ b/internal/component/prometheus/exporter/snowflake/snowflake_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` account_name = "some_account" username = "some_user" password = "some_password" @@ -20,7 +20,7 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -35,14 +35,14 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverConfig := ` + alloyConfig := ` account_name = "some_account" username = "some_user" password = "some_password" warehouse = "some_warehouse" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) res := args.Convert() diff --git a/internal/component/prometheus/exporter/squid/squid.go b/internal/component/prometheus/exporter/squid/squid.go index 1beb43ec26..50d4f6500d 100644 --- a/internal/component/prometheus/exporter/squid/squid.go +++ b/internal/component/prometheus/exporter/squid/squid.go @@ -35,12 +35,12 @@ type Arguments struct { SquidPassword alloytypes.Secret `alloy:"password,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{} } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.SquidAddr == "" { return squid_exporter.ErrNoAddress diff --git a/internal/component/prometheus/exporter/squid/squid_test.go b/internal/component/prometheus/exporter/squid/squid_test.go index ff5bb03850..84262365d1 100644 --- a/internal/component/prometheus/exporter/squid/squid_test.go +++ b/internal/component/prometheus/exporter/squid/squid_test.go @@ -11,15 +11,15 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - riverConfig := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyConfig := ` address = "some_address:port" username = "some_user" password = "some_password" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) expected := Arguments{ @@ -32,13 +32,13 @@ func TestRiverUnmarshal(t *testing.T) { } func TestConvert(t *testing.T) { - riverConfig := ` + alloyConfig := ` address = "some_address:port" username = "some_user" password = "some_password" ` var args Arguments - err := syntax.Unmarshal([]byte(riverConfig), &args) + err := syntax.Unmarshal([]byte(alloyConfig), &args) require.NoError(t, err) res := args.Convert() diff --git a/internal/component/prometheus/exporter/statsd/config.go b/internal/component/prometheus/exporter/statsd/config.go index 0bda74fbd6..aacfe15277 100644 --- a/internal/component/prometheus/exporter/statsd/config.go +++ b/internal/component/prometheus/exporter/statsd/config.go @@ -92,7 +92,7 @@ func (c *Arguments) Convert() (*statsd_exporter.Config, error) { }, nil } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultConfig } diff --git a/internal/component/prometheus/exporter/statsd/statsd_test.go b/internal/component/prometheus/exporter/statsd/statsd_test.go index 9592c105b3..01d45fb14a 100644 --- a/internal/component/prometheus/exporter/statsd/statsd_test.go +++ b/internal/component/prometheus/exporter/statsd/statsd_test.go @@ -9,7 +9,7 @@ import ( ) var ( - exampleRiverConfig = ` + exampleAlloyConfig = ` listen_udp = ":1010" listen_tcp = ":1011" listen_unixgram = "unix" @@ -30,9 +30,9 @@ var ( duration1m, _ = time.ParseDuration("1m") ) -func TestRiverUnmarshal(t *testing.T) { +func TestAlloyUnmarshal(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) require.Equal(t, ":1010", args.ListenUDP) @@ -56,7 +56,7 @@ func TestRiverUnmarshal(t *testing.T) { func TestConvert(t *testing.T) { t.Run("with valid config", func(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) configStatsd, err := args.Convert() diff --git a/internal/component/prometheus/exporter/unix/config.go b/internal/component/prometheus/exporter/unix/config.go index 04ce1a90cf..373db2dc5e 100644 --- a/internal/component/prometheus/exporter/unix/config.go +++ b/internal/component/prometheus/exporter/unix/config.go @@ -162,7 +162,7 @@ func (a *Arguments) Convert() *node_integration.Config { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } diff --git a/internal/component/prometheus/exporter/windows/config_default_windows_test.go b/internal/component/prometheus/exporter/windows/config_default_windows_test.go index f6d2ea6021..1587d13736 100644 --- a/internal/component/prometheus/exporter/windows/config_default_windows_test.go +++ b/internal/component/prometheus/exporter/windows/config_default_windows_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshalWithDefaultConfig(t *testing.T) { +func TestAlloyUnmarshalWithDefaultConfig(t *testing.T) { var args Arguments err := syntax.Unmarshal([]byte(""), &args) require.NoError(t, err) diff --git a/internal/component/prometheus/exporter/windows/config_windows.go b/internal/component/prometheus/exporter/windows/config_windows.go index de4d29eff1..010e0e3fb1 100644 --- a/internal/component/prometheus/exporter/windows/config_windows.go +++ b/internal/component/prometheus/exporter/windows/config_windows.go @@ -7,7 +7,7 @@ import ( col "github.com/prometheus-community/windows_exporter/pkg/collector" ) -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = Arguments{ EnabledCollectors: strings.Split(windows_integration.DefaultConfig.EnabledCollectors, ","), diff --git a/internal/component/prometheus/exporter/windows/windows_test.go b/internal/component/prometheus/exporter/windows/windows_test.go index 813a3db51b..d899ea0b50 100644 --- a/internal/component/prometheus/exporter/windows/windows_test.go +++ b/internal/component/prometheus/exporter/windows/windows_test.go @@ -8,7 +8,7 @@ import ( ) var ( - exampleRiverConfig = ` + exampleAlloyConfig = ` enabled_collectors = ["textfile","cpu"] exchange { @@ -65,9 +65,9 @@ var ( ` ) -func TestRiverUnmarshal(t *testing.T) { +func TestAlloyUnmarshal(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) require.Equal(t, []string{"textfile", "cpu"}, args.EnabledCollectors) @@ -94,7 +94,7 @@ func TestRiverUnmarshal(t *testing.T) { func TestConvert(t *testing.T) { var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) conf := args.Convert() diff --git a/internal/component/prometheus/operator/types.go b/internal/component/prometheus/operator/types.go index 512a5ec72d..8ed8cc4149 100644 --- a/internal/component/prometheus/operator/types.go +++ b/internal/component/prometheus/operator/types.go @@ -56,12 +56,12 @@ var DefaultArguments = Arguments{ }, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if len(args.Namespaces) == 0 { args.Namespaces = []string{apiv1.NamespaceAll} diff --git a/internal/component/prometheus/operator/types_test.go b/internal/component/prometheus/operator/types_test.go index a4d5d527a7..2b8afe53c6 100644 --- a/internal/component/prometheus/operator/types_test.go +++ b/internal/component/prometheus/operator/types_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverUnmarshal(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyUnmarshal(t *testing.T) { + var exampleAlloyConfig = ` forward_to = [] namespaces = ["my-app"] selector { @@ -24,6 +24,6 @@ func TestRiverUnmarshal(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } diff --git a/internal/component/prometheus/receive_http/receive_http.go b/internal/component/prometheus/receive_http/receive_http.go index 807fb08f68..ebd3305940 100644 --- a/internal/component/prometheus/receive_http/receive_http.go +++ b/internal/component/prometheus/receive_http/receive_http.go @@ -37,7 +37,7 @@ type Arguments struct { ForwardTo []storage.Appendable `alloy:"forward_to,attr"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = Arguments{ Server: fnet.DefaultServerConfig(), diff --git a/internal/component/prometheus/relabel/relabel.go b/internal/component/prometheus/relabel/relabel.go index 653df6a977..5f641c8117 100644 --- a/internal/component/prometheus/relabel/relabel.go +++ b/internal/component/prometheus/relabel/relabel.go @@ -48,14 +48,14 @@ type Arguments struct { CacheSize int `alloy:"max_cache_size,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (arg *Arguments) SetToDefault() { *arg = Arguments{ CacheSize: 100_000, } } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (arg *Arguments) Validate() error { if arg.CacheSize <= 0 { return fmt.Errorf("max_cache_size must be greater than 0 and is %d", arg.CacheSize) diff --git a/internal/component/prometheus/remotewrite/types.go b/internal/component/prometheus/remotewrite/types.go index 8ad675fc1f..74dcf835d0 100644 --- a/internal/component/prometheus/remotewrite/types.go +++ b/internal/component/prometheus/remotewrite/types.go @@ -59,7 +59,7 @@ type Arguments struct { WALOptions WALOptions `alloy:"wal,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (rc *Arguments) SetToDefault() { *rc = DefaultArguments } @@ -81,7 +81,7 @@ type EndpointOptions struct { AzureAD *AzureADConfig `alloy:"azuread,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *EndpointOptions) SetToDefault() { *r = EndpointOptions{ RemoteTimeout: 30 * time.Second, @@ -98,7 +98,7 @@ func isAuthSetInHttpClientConfig(cfg *types.HTTPClientConfig) bool { len(cfg.BearerTokenFile) > 0 } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (r *EndpointOptions) Validate() error { // We must explicitly Validate because HTTPClientConfig is squashed and it won't run otherwise if r.HTTPClientConfig != nil { @@ -145,7 +145,7 @@ type QueueOptions struct { SampleAgeLimit time.Duration `alloy:"sample_age_limit,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *QueueOptions) SetToDefault() { *r = DefaultQueueOptions } @@ -178,7 +178,7 @@ type MetadataOptions struct { MaxSamplesPerSend int `alloy:"max_samples_per_send,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (o *MetadataOptions) SetToDefault() { *o = DefaultMetadataOptions } @@ -204,12 +204,12 @@ type WALOptions struct { MaxKeepaliveTime time.Duration `alloy:"max_keepalive_time,attr,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (o *WALOptions) SetToDefault() { *o = DefaultWALOptions } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (o *WALOptions) Validate() error { switch { case o.TruncateFrequency == 0: @@ -301,7 +301,7 @@ func (a *AzureADConfig) Validate() error { return nil } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AzureADConfig) SetToDefault() { *a = AzureADConfig{ Cloud: azuread.AzurePublic, diff --git a/internal/component/prometheus/remotewrite/types_test.go b/internal/component/prometheus/remotewrite/types_test.go index cca99d8d26..839141c38f 100644 --- a/internal/component/prometheus/remotewrite/types_test.go +++ b/internal/component/prometheus/remotewrite/types_test.go @@ -63,7 +63,7 @@ func expectedCfg(transform func(c *config.Config)) *config.Config { return res } -func TestRiverConfig(t *testing.T) { +func TestAlloyConfig(t *testing.T) { tests := []struct { testName string cfg string diff --git a/internal/component/prometheus/scrape/scrape.go b/internal/component/prometheus/scrape/scrape.go index 9bc4586575..876c19d112 100644 --- a/internal/component/prometheus/scrape/scrape.go +++ b/internal/component/prometheus/scrape/scrape.go @@ -95,7 +95,7 @@ type Arguments struct { Clustering cluster.ComponentBlock `alloy:"clustering,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (arg *Arguments) SetToDefault() { *arg = Arguments{ MetricsPath: "/metrics", @@ -109,7 +109,7 @@ func (arg *Arguments) SetToDefault() { } } -// Validate implements river.Validator. +// Validate implements syntax.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) diff --git a/internal/component/prometheus/scrape/scrape_test.go b/internal/component/prometheus/scrape/scrape_test.go index 8849331580..fc7ceea04c 100644 --- a/internal/component/prometheus/scrape/scrape_test.go +++ b/internal/component/prometheus/scrape/scrape_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" ) -func TestRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` targets = [{ "target1" = "target1" }] forward_to = [] scrape_interval = "10s" @@ -47,12 +47,12 @@ func TestRiverConfig(t *testing.T) { ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.NoError(t, err) } -func TestBadRiverConfig(t *testing.T) { - var exampleRiverConfig = ` +func TestBadAlloyConfig(t *testing.T) { + var exampleAlloyConfig = ` targets = [{ "target1" = "target1" }] forward_to = [] scrape_interval = "10s" @@ -67,7 +67,7 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } @@ -212,7 +212,7 @@ func TestCustomDialer(t *testing.T) { } func TestValidateScrapeConfig(t *testing.T) { - var exampleRiverConfig = ` + var exampleAlloyConfig = ` targets = [{ "target1" = "target1" }] forward_to = [] scrape_interval = "10s" @@ -220,6 +220,6 @@ func TestValidateScrapeConfig(t *testing.T) { job_name = "local" ` var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "scrape_timeout (20s) greater than scrape_interval (10s) for scrape config with job name \"local\"") } diff --git a/internal/component/pyroscope/ebpf/ebpf_linux.go b/internal/component/pyroscope/ebpf/ebpf_linux.go index 3cc4b75b9c..f1057dac3d 100644 --- a/internal/component/pyroscope/ebpf/ebpf_linux.go +++ b/internal/component/pyroscope/ebpf/ebpf_linux.go @@ -66,7 +66,7 @@ func New(opts component.Options, args Arguments) (component.Component, error) { return res, nil } -func (rc *Arguments) UnmarshalRiver(f func(interface{}) error) error { +func (rc *Arguments) UnmarshalAlloy(f func(interface{}) error) error { *rc = defaultArguments() type config Arguments return f((*config)(rc)) diff --git a/internal/component/pyroscope/java/args.go b/internal/component/pyroscope/java/args.go index 85ba52b77a..3877e854df 100644 --- a/internal/component/pyroscope/java/args.go +++ b/internal/component/pyroscope/java/args.go @@ -23,7 +23,7 @@ type ProfilingConfig struct { CPU bool `alloy:"cpu,attr,optional"` } -func (rc *Arguments) UnmarshalRiver(f func(interface{}) error) error { +func (rc *Arguments) UnmarshalAlloy(f func(interface{}) error) error { *rc = defaultArguments() type config Arguments return f((*config)(rc)) diff --git a/internal/component/pyroscope/scrape/scrape.go b/internal/component/pyroscope/scrape/scrape.go index 8a45948f3a..e579418fc2 100644 --- a/internal/component/pyroscope/scrape/scrape.go +++ b/internal/component/pyroscope/scrape/scrape.go @@ -169,7 +169,7 @@ var DefaultProfilingConfig = ProfilingConfig{ }, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (cfg *ProfilingConfig) SetToDefault() { *cfg = DefaultProfilingConfig } @@ -200,12 +200,12 @@ func NewDefaultArguments() Arguments { } } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (arg *Arguments) SetToDefault() { *arg = NewDefaultArguments() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (arg *Arguments) Validate() error { if arg.ScrapeTimeout.Seconds() <= 0 { return fmt.Errorf("scrape_timeout must be greater than 0") diff --git a/internal/component/pyroscope/write/write.go b/internal/component/pyroscope/write/write.go index 544fa6b1e4..8b89853139 100644 --- a/internal/component/pyroscope/write/write.go +++ b/internal/component/pyroscope/write/write.go @@ -53,7 +53,7 @@ type Arguments struct { Endpoints []*EndpointOptions `alloy:"endpoint,block,optional"` } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (rc *Arguments) SetToDefault() { *rc = DefaultArguments() } @@ -83,12 +83,12 @@ func GetDefaultEndpointOptions() EndpointOptions { return defaultEndpointOptions } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (r *EndpointOptions) SetToDefault() { *r = GetDefaultEndpointOptions() } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (r *EndpointOptions) Validate() error { // We must explicitly Validate because HTTPClientConfig is squashed and it won't run otherwise if r.HTTPClientConfig != nil { diff --git a/internal/component/pyroscope/write/write_test.go b/internal/component/pyroscope/write/write_test.go index c59d49565a..3439435e04 100644 --- a/internal/component/pyroscope/write/write_test.go +++ b/internal/component/pyroscope/write/write_test.go @@ -235,8 +235,8 @@ func Test_Unmarshal_Config(t *testing.T) { require.Equal(t, 10, arg.Endpoints[1].MaxBackoffRetries) } -func TestBadRiverConfig(t *testing.T) { - exampleRiverConfig := ` +func TestBadAlloyConfig(t *testing.T) { + exampleAlloyConfig := ` endpoint { url = "http://localhost:4100" remote_timeout = "10s" @@ -250,6 +250,6 @@ func TestBadRiverConfig(t *testing.T) { // Make sure the squashed HTTPClientConfig Validate function is being utilized correctly var args Arguments - err := syntax.Unmarshal([]byte(exampleRiverConfig), &args) + err := syntax.Unmarshal([]byte(exampleAlloyConfig), &args) require.ErrorContains(t, err, "at most one of basic_auth, authorization, oauth2, bearer_token & bearer_token_file must be configured") } diff --git a/internal/component/registry.go b/internal/component/registry.go index 1c3c3b0a32..190913f5a2 100644 --- a/internal/component/registry.go +++ b/internal/component/registry.go @@ -35,14 +35,14 @@ type ModuleController interface { // NewModule must provide unique values for id. The empty string is a valid unique // value for id. // - // If id is non-empty, it must be a valid River identifier, matching the + // If id is non-empty, it must be a valid Alloy identifier, matching the // regex /[A-Za-z_][A-Za-z0-9_]/. NewModule(id string, export ExportFunc) (Module, error) } // Module is a controller for running components within a Module. type Module interface { - // LoadConfig parses River config and loads it into the Module. + // LoadConfig parses Alloy config and loads it into the Module. // LoadConfig can be called multiple times, and called prior to // [Module.Run]. LoadConfig(config []byte, args map[string]any) error diff --git a/internal/component/remote/http/http.go b/internal/component/remote/http/http.go index d611f8e494..380a9612e1 100644 --- a/internal/component/remote/http/http.go +++ b/internal/component/remote/http/http.go @@ -56,12 +56,12 @@ var DefaultArguments = Arguments{ Method: http.MethodGet, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.PollFrequency <= 0 { return fmt.Errorf("poll_frequency must be greater than 0") diff --git a/internal/component/remote/kubernetes/kubernetes.go b/internal/component/remote/kubernetes/kubernetes.go index d0bb046b73..819216e1b3 100644 --- a/internal/component/remote/kubernetes/kubernetes.go +++ b/internal/component/remote/kubernetes/kubernetes.go @@ -42,12 +42,12 @@ var DefaultArguments = Arguments{ PollTimeout: 15 * time.Second, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (args *Arguments) SetToDefault() { *args = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (args *Arguments) Validate() error { if args.PollFrequency <= 0 { return fmt.Errorf("poll_frequency must be greater than 0") diff --git a/internal/component/remote/kubernetes/kubernetes_test.go b/internal/component/remote/kubernetes/kubernetes_test.go index aef8410612..6a2b4883c0 100644 --- a/internal/component/remote/kubernetes/kubernetes_test.go +++ b/internal/component/remote/kubernetes/kubernetes_test.go @@ -9,15 +9,15 @@ import ( "gotest.tools/assert" ) -func TestRiverUnmarshal(t *testing.T) { - riverCfg := ` +func TestAlloyUnmarshal(t *testing.T) { + alloyCfg := ` name = "foo" namespace = "bar" poll_frequency = "10m" poll_timeout = "1s"` var args Arguments - err := syntax.Unmarshal([]byte(riverCfg), &args) + err := syntax.Unmarshal([]byte(alloyCfg), &args) require.NoError(t, err) assert.Equal(t, 10*time.Minute, args.PollFrequency) diff --git a/internal/component/remote/s3/types.go b/internal/component/remote/s3/types.go index 5e64ee55fd..a3f3a21639 100644 --- a/internal/component/remote/s3/types.go +++ b/internal/component/remote/s3/types.go @@ -37,12 +37,12 @@ var DefaultArguments = Arguments{ PollFrequency: 10 * time.Minute, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if a.PollFrequency <= minimumPollFrequency { return fmt.Errorf("poll_frequency must be greater than 30s") diff --git a/internal/component/remote/vault/auth.go b/internal/component/remote/vault/auth.go index e494ff9aef..1119178bee 100644 --- a/internal/component/remote/vault/auth.go +++ b/internal/component/remote/vault/auth.go @@ -91,7 +91,7 @@ var DefaultAuthAppRole = AuthAppRole{ MountPath: "approle", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthAppRole) SetToDefault() { *a = DefaultAuthAppRole } @@ -145,12 +145,12 @@ var DefaultAuthAWS = AuthAWS{ EC2SignatureType: "pkcs7", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthAWS) SetToDefault() { *a = DefaultAuthAWS } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *AuthAWS) Validate() error { switch a.Type { case "": @@ -230,7 +230,7 @@ var DefaultAuthAzure = AuthAzure{ ResourceURL: "https://management.azure.com/", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthAzure) SetToDefault() { *a = DefaultAuthAzure } @@ -277,12 +277,12 @@ var DefaultAuthGCP = AuthGCP{ Type: authGCPTypeGCE, } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthGCP) SetToDefault() { *a = DefaultAuthGCP } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *AuthGCP) Validate() error { switch a.Type { case authGCPTypeGCE: @@ -341,7 +341,7 @@ var DefaultAuthKubernetes = AuthKubernetes{ ServiceAccountTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthKubernetes) SetToDefault() { *a = DefaultAuthKubernetes } @@ -379,7 +379,7 @@ var DefaultAuthLDAP = AuthLDAP{ MountPath: "ldap", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthLDAP) SetToDefault() { *a = DefaultAuthLDAP } @@ -416,7 +416,7 @@ var DefaultAuthUserPass = AuthUserPass{ MountPath: "userpass", } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *AuthUserPass) SetToDefault() { *a = DefaultAuthUserPass } diff --git a/internal/component/remote/vault/vault.go b/internal/component/remote/vault/vault.go index 166335c7d0..8309232b2e 100644 --- a/internal/component/remote/vault/vault.go +++ b/internal/component/remote/vault/vault.go @@ -78,12 +78,12 @@ func (a *Arguments) client() (*vault.Client, error) { return cli, nil } -// SetToDefault implements river.Defaulter. +// SetToDefault implements syntax.Defaulter. func (a *Arguments) SetToDefault() { *a = DefaultArguments } -// Validate implements river.Validator. +// Validate implements syntax.Validator. func (a *Arguments) Validate() error { if len(a.Auth) == 0 { return fmt.Errorf("exactly one auth.* block must be specified; found none") diff --git a/internal/converter/internal/common/river_utils.go b/internal/converter/internal/common/alloy_utils.go similarity index 98% rename from internal/converter/internal/common/river_utils.go rename to internal/converter/internal/common/alloy_utils.go index eb3734ecc1..56d2b9b7ba 100644 --- a/internal/converter/internal/common/river_utils.go +++ b/internal/converter/internal/common/alloy_utils.go @@ -91,7 +91,7 @@ func LabelWithIndex(index int, parts ...interface{}) string { return LabelForParts(append(parts, appendedIndex)...) } -// PrettyPrint parses river config and returns it in a standardize format. +// PrettyPrint parses Alloy config and returns it in a standardize format. // If PrettyPrint fails, the input is returned unmodified. func PrettyPrint(in []byte) ([]byte, diag.Diagnostics) { var diags diag.Diagnostics diff --git a/internal/converter/internal/common/river_utils_test.go b/internal/converter/internal/common/alloy_utils_test.go similarity index 100% rename from internal/converter/internal/common/river_utils_test.go rename to internal/converter/internal/common/alloy_utils_test.go diff --git a/internal/converter/internal/common/convert_appendable.go b/internal/converter/internal/common/convert_appendable.go index 67b5ab81a4..c2343a4080 100644 --- a/internal/converter/internal/common/convert_appendable.go +++ b/internal/converter/internal/common/convert_appendable.go @@ -21,8 +21,8 @@ var _ storage.Appendable = (*ConvertAppendable)(nil) var _ builder.Tokenizer = ConvertAppendable{} var _ syntax.Capsule = ConvertAppendable{} -func (f ConvertAppendable) RiverCapsule() {} -func (f ConvertAppendable) RiverTokenize() []builder.Token { +func (f ConvertAppendable) AlloyCapsule() {} +func (f ConvertAppendable) AlloyTokenize() []builder.Token { return []builder.Token{{ Tok: token.STRING, Lit: f.Expr, diff --git a/internal/converter/internal/common/convert_logs_receiver.go b/internal/converter/internal/common/convert_logs_receiver.go index ed0aacb8a2..ae018e2d81 100644 --- a/internal/converter/internal/common/convert_logs_receiver.go +++ b/internal/converter/internal/common/convert_logs_receiver.go @@ -19,8 +19,8 @@ var _ loki.LogsReceiver = (*ConvertLogsReceiver)(nil) var _ builder.Tokenizer = ConvertLogsReceiver{} var _ syntax.Capsule = ConvertLogsReceiver{} -func (f ConvertLogsReceiver) RiverCapsule() {} -func (f ConvertLogsReceiver) RiverTokenize() []builder.Token { +func (f ConvertLogsReceiver) AlloyCapsule() {} +func (f ConvertLogsReceiver) AlloyTokenize() []builder.Token { return []builder.Token{{ Tok: token.STRING, Lit: f.Expr, diff --git a/internal/converter/internal/common/convert_targets.go b/internal/converter/internal/common/convert_targets.go index a10d3bfb48..af10571629 100644 --- a/internal/converter/internal/common/convert_targets.go +++ b/internal/converter/internal/common/convert_targets.go @@ -10,7 +10,7 @@ import ( // NewDiscoveryExports will return a new [discovery.Exports] with a specific // key for converter component exports. The argument will be tokenized // as a component export string rather than the standard [discovery.Target] -// RiverTokenize. +// AlloyTokenize. func NewDiscoveryExports(expr string) discovery.Exports { return discovery.Exports{ Targets: NewDiscoveryTargets(expr), @@ -20,7 +20,7 @@ func NewDiscoveryExports(expr string) discovery.Exports { // NewDiscoveryTargets will return a new [[]discovery.Target] with a specific // key for converter component exports. The argument will be tokenized // as a component export string rather than the standard [discovery.Target] -// RiverTokenize. +// AlloyTokenize. func NewDiscoveryTargets(expr string) []discovery.Target { return []discovery.Target{map[string]string{"__expr__": expr}} } @@ -35,8 +35,8 @@ type ConvertTargets struct { var _ builder.Tokenizer = ConvertTargets{} var _ syntax.Capsule = ConvertTargets{} -func (f ConvertTargets) RiverCapsule() {} -func (f ConvertTargets) RiverTokenize() []builder.Token { +func (f ConvertTargets) AlloyCapsule() {} +func (f ConvertTargets) AlloyTokenize() []builder.Token { expr := builder.NewExpr() var toks []builder.Token diff --git a/internal/converter/internal/common/custom_tokenizer.go b/internal/converter/internal/common/custom_tokenizer.go index f2da2e6d25..15314e0332 100644 --- a/internal/converter/internal/common/custom_tokenizer.go +++ b/internal/converter/internal/common/custom_tokenizer.go @@ -11,7 +11,7 @@ type CustomTokenizer struct { var _ builder.Tokenizer = CustomTokenizer{} -func (f CustomTokenizer) RiverTokenize() []builder.Token { +func (f CustomTokenizer) AlloyTokenize() []builder.Token { return []builder.Token{{ Tok: token.STRING, Lit: f.Expr, diff --git a/internal/converter/internal/otelcolconvert/converter_helpers.go b/internal/converter/internal/otelcolconvert/converter_helpers.go index 2a33faf56c..f4fa356473 100644 --- a/internal/converter/internal/otelcolconvert/converter_helpers.go +++ b/internal/converter/internal/otelcolconvert/converter_helpers.go @@ -21,9 +21,9 @@ type tokenizedConsumer struct { Expr string // Expr is the string to return during tokenization. } -func (tc tokenizedConsumer) RiverCapsule() {} +func (tc tokenizedConsumer) AlloyCapsule() {} -func (tc tokenizedConsumer) RiverTokenize() []builder.Token { +func (tc tokenizedConsumer) AlloyTokenize() []builder.Token { return []builder.Token{{ Tok: token.STRING, Lit: tc.Expr, diff --git a/internal/converter/internal/otelcolconvert/testdata/attributes.river b/internal/converter/internal/otelcolconvert/testdata/attributes.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/attributes.river rename to internal/converter/internal/otelcolconvert/testdata/attributes.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/basicauth.river b/internal/converter/internal/otelcolconvert/testdata/basicauth.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/basicauth.river rename to internal/converter/internal/otelcolconvert/testdata/basicauth.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/batch.river b/internal/converter/internal/otelcolconvert/testdata/batch.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/batch.river rename to internal/converter/internal/otelcolconvert/testdata/batch.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/bearertoken.river b/internal/converter/internal/otelcolconvert/testdata/bearertoken.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/bearertoken.river rename to internal/converter/internal/otelcolconvert/testdata/bearertoken.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/filter.river b/internal/converter/internal/otelcolconvert/testdata/filter.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/filter.river rename to internal/converter/internal/otelcolconvert/testdata/filter.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/headerssetter.river b/internal/converter/internal/otelcolconvert/testdata/headerssetter.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/headerssetter.river rename to internal/converter/internal/otelcolconvert/testdata/headerssetter.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river b/internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.river rename to internal/converter/internal/otelcolconvert/testdata/inconsistent_processor.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/jaeger.river b/internal/converter/internal/otelcolconvert/testdata/jaeger.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/jaeger.river rename to internal/converter/internal/otelcolconvert/testdata/jaeger.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/jaegerremotesampling.river b/internal/converter/internal/otelcolconvert/testdata/jaegerremotesampling.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/jaegerremotesampling.river rename to internal/converter/internal/otelcolconvert/testdata/jaegerremotesampling.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/k8sattributes.river b/internal/converter/internal/otelcolconvert/testdata/k8sattributes.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/k8sattributes.river rename to internal/converter/internal/otelcolconvert/testdata/k8sattributes.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/kafka.river b/internal/converter/internal/otelcolconvert/testdata/kafka.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/kafka.river rename to internal/converter/internal/otelcolconvert/testdata/kafka.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/loadbalancing.river b/internal/converter/internal/otelcolconvert/testdata/loadbalancing.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/loadbalancing.river rename to internal/converter/internal/otelcolconvert/testdata/loadbalancing.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/logging.river b/internal/converter/internal/otelcolconvert/testdata/logging.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/logging.river rename to internal/converter/internal/otelcolconvert/testdata/logging.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/memorylimiter.river b/internal/converter/internal/otelcolconvert/testdata/memorylimiter.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/memorylimiter.river rename to internal/converter/internal/otelcolconvert/testdata/memorylimiter.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/oauth2.river b/internal/converter/internal/otelcolconvert/testdata/oauth2.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/oauth2.river rename to internal/converter/internal/otelcolconvert/testdata/oauth2.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/opencensus.river b/internal/converter/internal/otelcolconvert/testdata/opencensus.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/opencensus.river rename to internal/converter/internal/otelcolconvert/testdata/opencensus.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/otlp.river b/internal/converter/internal/otelcolconvert/testdata/otlp.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/otlp.river rename to internal/converter/internal/otelcolconvert/testdata/otlp.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/otlphttp.river b/internal/converter/internal/otelcolconvert/testdata/otlphttp.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/otlphttp.river rename to internal/converter/internal/otelcolconvert/testdata/otlphttp.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/probabilistic_sampler.river b/internal/converter/internal/otelcolconvert/testdata/probabilistic_sampler.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/probabilistic_sampler.river rename to internal/converter/internal/otelcolconvert/testdata/probabilistic_sampler.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/span.river b/internal/converter/internal/otelcolconvert/testdata/span.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/span.river rename to internal/converter/internal/otelcolconvert/testdata/span.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/span_full.river b/internal/converter/internal/otelcolconvert/testdata/span_full.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/span_full.river rename to internal/converter/internal/otelcolconvert/testdata/span_full.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/spanmetrics.river b/internal/converter/internal/otelcolconvert/testdata/spanmetrics.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/spanmetrics.river rename to internal/converter/internal/otelcolconvert/testdata/spanmetrics.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river b/internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.river rename to internal/converter/internal/otelcolconvert/testdata/spanmetrics_full.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/tail_sampling.river b/internal/converter/internal/otelcolconvert/testdata/tail_sampling.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/tail_sampling.river rename to internal/converter/internal/otelcolconvert/testdata/tail_sampling.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/transform.river b/internal/converter/internal/otelcolconvert/testdata/transform.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/transform.river rename to internal/converter/internal/otelcolconvert/testdata/transform.alloy diff --git a/internal/converter/internal/otelcolconvert/testdata/zipkin.river b/internal/converter/internal/otelcolconvert/testdata/zipkin.alloy similarity index 100% rename from internal/converter/internal/otelcolconvert/testdata/zipkin.river rename to internal/converter/internal/otelcolconvert/testdata/zipkin.alloy diff --git a/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go b/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go index 176ac89ef7..7b18fccdcf 100644 --- a/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go +++ b/internal/converter/internal/prometheusconvert/build/prometheus_blocks.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/alloy/syntax/token/builder" ) -// PrometheusBlocks is a type for categorizing River Blocks before appending -// them to a River File. This gives control over the order they are written +// PrometheusBlocks is a type for categorizing Alloy blocks before appending +// them to an Alloy file. This gives control over the order they are written // versus appending them in the order the Blocks are created. type PrometheusBlocks struct { DiscoveryBlocks []prometheusBlock diff --git a/internal/converter/internal/prometheusconvert/component/dockerswarm.go b/internal/converter/internal/prometheusconvert/component/dockerswarm.go index 852f720af1..48a2d36e3d 100644 --- a/internal/converter/internal/prometheusconvert/component/dockerswarm.go +++ b/internal/converter/internal/prometheusconvert/component/dockerswarm.go @@ -39,11 +39,11 @@ func toDiscoveryDockerswarm(sdConfig *prom_moby.DockerSwarmSDConfig) *dockerswar } func convertFilters(mobyFilters []prom_moby.Filter) []dockerswarm.Filter { - riverFilters := make([]dockerswarm.Filter, len(mobyFilters)) + alloyFilters := make([]dockerswarm.Filter, len(mobyFilters)) for i, mobyFilter := range mobyFilters { - riverFilters[i] = convertFilter(&mobyFilter) + alloyFilters[i] = convertFilter(&mobyFilter) } - return riverFilters + return alloyFilters } func convertFilter(mobyFilter *prom_moby.Filter) dockerswarm.Filter { diff --git a/internal/converter/internal/prometheusconvert/component/remote_write.go b/internal/converter/internal/prometheusconvert/component/remote_write.go index 384cec27fd..ca634423cd 100644 --- a/internal/converter/internal/prometheusconvert/component/remote_write.go +++ b/internal/converter/internal/prometheusconvert/component/remote_write.go @@ -108,7 +108,7 @@ func toMetadataOptions(metadataConfig *prom_config.MetadataConfig) *remotewrite. } } -// toSigV4 converts a Prometheus SigV4 config to a River SigV4 config. +// toSigV4 converts a Prometheus SigV4 config to an Alloy SigV4 config. func toSigV4(sigv4Config *sigv4.SigV4Config) *remotewrite.SigV4Config { if sigv4Config == nil { return nil @@ -123,7 +123,7 @@ func toSigV4(sigv4Config *sigv4.SigV4Config) *remotewrite.SigV4Config { } } -// toAzureAD converts a Prometheus AzureAD config to a River AzureAD config. +// toAzureAD converts a Prometheus AzureAD config to an Alloy AzureAD config. func toAzureAD(azureADConfig *azuread.AzureADConfig) *remotewrite.AzureADConfig { if azureADConfig == nil { return nil diff --git a/internal/converter/internal/prometheusconvert/testdata/azure.river b/internal/converter/internal/prometheusconvert/testdata/azure.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/azure.river rename to internal/converter/internal/prometheusconvert/testdata/azure.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/consul.river b/internal/converter/internal/prometheusconvert/testdata/consul.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/consul.river rename to internal/converter/internal/prometheusconvert/testdata/consul.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/digitalocean.river b/internal/converter/internal/prometheusconvert/testdata/digitalocean.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/digitalocean.river rename to internal/converter/internal/prometheusconvert/testdata/digitalocean.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/discovery.river b/internal/converter/internal/prometheusconvert/testdata/discovery.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/discovery.river rename to internal/converter/internal/prometheusconvert/testdata/discovery.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/discovery_relabel.river b/internal/converter/internal/prometheusconvert/testdata/discovery_relabel.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/discovery_relabel.river rename to internal/converter/internal/prometheusconvert/testdata/discovery_relabel.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/dns.river b/internal/converter/internal/prometheusconvert/testdata/dns.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/dns.river rename to internal/converter/internal/prometheusconvert/testdata/dns.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/docker.river b/internal/converter/internal/prometheusconvert/testdata/docker.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/docker.river rename to internal/converter/internal/prometheusconvert/testdata/docker.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/dockerswarm.river b/internal/converter/internal/prometheusconvert/testdata/dockerswarm.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/dockerswarm.river rename to internal/converter/internal/prometheusconvert/testdata/dockerswarm.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/ec2.river b/internal/converter/internal/prometheusconvert/testdata/ec2.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/ec2.river rename to internal/converter/internal/prometheusconvert/testdata/ec2.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/empty.river b/internal/converter/internal/prometheusconvert/testdata/empty.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/empty.river rename to internal/converter/internal/prometheusconvert/testdata/empty.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/file.river b/internal/converter/internal/prometheusconvert/testdata/file.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/file.river rename to internal/converter/internal/prometheusconvert/testdata/file.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/gce.river b/internal/converter/internal/prometheusconvert/testdata/gce.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/gce.river rename to internal/converter/internal/prometheusconvert/testdata/gce.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/http.river b/internal/converter/internal/prometheusconvert/testdata/http.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/http.river rename to internal/converter/internal/prometheusconvert/testdata/http.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/ionos.river b/internal/converter/internal/prometheusconvert/testdata/ionos.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/ionos.river rename to internal/converter/internal/prometheusconvert/testdata/ionos.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/kubernetes.river b/internal/converter/internal/prometheusconvert/testdata/kubernetes.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/kubernetes.river rename to internal/converter/internal/prometheusconvert/testdata/kubernetes.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/kuma.river b/internal/converter/internal/prometheusconvert/testdata/kuma.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/kuma.river rename to internal/converter/internal/prometheusconvert/testdata/kuma.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/lightsail.river b/internal/converter/internal/prometheusconvert/testdata/lightsail.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/lightsail.river rename to internal/converter/internal/prometheusconvert/testdata/lightsail.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/linode.river b/internal/converter/internal/prometheusconvert/testdata/linode.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/linode.river rename to internal/converter/internal/prometheusconvert/testdata/linode.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/marathon.river b/internal/converter/internal/prometheusconvert/testdata/marathon.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/marathon.river rename to internal/converter/internal/prometheusconvert/testdata/marathon.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/metric_relabel.river b/internal/converter/internal/prometheusconvert/testdata/metric_relabel.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/metric_relabel.river rename to internal/converter/internal/prometheusconvert/testdata/metric_relabel.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/nerve.river b/internal/converter/internal/prometheusconvert/testdata/nerve.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/nerve.river rename to internal/converter/internal/prometheusconvert/testdata/nerve.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/openstack.river b/internal/converter/internal/prometheusconvert/testdata/openstack.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/openstack.river rename to internal/converter/internal/prometheusconvert/testdata/openstack.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/ovhcloud.river b/internal/converter/internal/prometheusconvert/testdata/ovhcloud.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/ovhcloud.river rename to internal/converter/internal/prometheusconvert/testdata/ovhcloud.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/scaleway.river b/internal/converter/internal/prometheusconvert/testdata/scaleway.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/scaleway.river rename to internal/converter/internal/prometheusconvert/testdata/scaleway.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/scrape.river b/internal/converter/internal/prometheusconvert/testdata/scrape.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/scrape.river rename to internal/converter/internal/prometheusconvert/testdata/scrape.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/serverset.river b/internal/converter/internal/prometheusconvert/testdata/serverset.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/serverset.river rename to internal/converter/internal/prometheusconvert/testdata/serverset.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/triton.river b/internal/converter/internal/prometheusconvert/testdata/triton.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/triton.river rename to internal/converter/internal/prometheusconvert/testdata/triton.alloy diff --git a/internal/converter/internal/prometheusconvert/testdata/unsupported.river b/internal/converter/internal/prometheusconvert/testdata/unsupported.alloy similarity index 100% rename from internal/converter/internal/prometheusconvert/testdata/unsupported.river rename to internal/converter/internal/prometheusconvert/testdata/unsupported.alloy diff --git a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go index 54409246db..dfc4fab96c 100644 --- a/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go +++ b/internal/converter/internal/promtailconvert/internal/build/scrape_builder.go @@ -263,7 +263,7 @@ func logsReceiversToExpr(r []loki.LogsReceiver) string { return "[" + strings.Join(exprs, ", ") + "]" } -func toRiverExpression(goValue interface{}) (string, error) { +func toAlloyExpression(goValue interface{}) (string, error) { e := builder.NewExpr() e.SetValue(goValue) var buff bytes.Buffer diff --git a/internal/converter/internal/promtailconvert/internal/build/service_discovery.go b/internal/converter/internal/promtailconvert/internal/build/service_discovery.go index 717cfda439..0583d047f6 100644 --- a/internal/converter/internal/promtailconvert/internal/build/service_discovery.go +++ b/internal/converter/internal/promtailconvert/internal/build/service_discovery.go @@ -37,11 +37,11 @@ func (s *ScrapeConfigBuilder) AppendSDs() { // write the target literals as a string if there are any if len(targetLiterals) != 0 { - literalsStr, err := toRiverExpression(targetLiterals) + literalsStr, err := toAlloyExpression(targetLiterals) if err != nil { // should not happen, unless we have a bug s.diags.Add( diag.SeverityLevelCritical, - "failed to write static SD targets as valid River expression: "+err.Error(), + "failed to write static SD targets as valid Alloy expression: "+err.Error(), ) } s.allTargetsExps = append(s.allTargetsExps, literalsStr) diff --git a/internal/converter/internal/promtailconvert/internal/build/stages.go b/internal/converter/internal/promtailconvert/internal/build/stages.go index 7afd405f0b..6b615c5769 100644 --- a/internal/converter/internal/promtailconvert/internal/build/stages.go +++ b/internal/converter/internal/promtailconvert/internal/build/stages.go @@ -303,7 +303,7 @@ func convertDrop(cfg interface{}, diags *diag.Diagnostics) (stages.StageConfig, } longerThan, err = units.ParseBase2Bytes(fmt.Sprintf("%dB", pLongerThan.Val())) if err != nil { - diags.Add(diag.SeverityLevelError, fmt.Sprintf("invalid pipeline_stages.drop.longer_than field: failed river type conversion: %v", err)) + diags.Add(diag.SeverityLevelError, fmt.Sprintf("invalid pipeline_stages.drop.longer_than field: failed Alloy type conversion: %v", err)) return stages.StageConfig{}, false } } diff --git a/internal/converter/internal/promtailconvert/testdata/azure.river b/internal/converter/internal/promtailconvert/testdata/azure.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/azure.river rename to internal/converter/internal/promtailconvert/testdata/azure.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/azure_event_hubs.river b/internal/converter/internal/promtailconvert/testdata/azure_event_hubs.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/azure_event_hubs.river rename to internal/converter/internal/promtailconvert/testdata/azure_event_hubs.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/cloudflare_relabel.river b/internal/converter/internal/promtailconvert/testdata/cloudflare_relabel.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/cloudflare_relabel.river rename to internal/converter/internal/promtailconvert/testdata/cloudflare_relabel.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/consul.river b/internal/converter/internal/promtailconvert/testdata/consul.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/consul.river rename to internal/converter/internal/promtailconvert/testdata/consul.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/consulagent.river b/internal/converter/internal/promtailconvert/testdata/consulagent.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/consulagent.river rename to internal/converter/internal/promtailconvert/testdata/consulagent.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/digitalocean.river b/internal/converter/internal/promtailconvert/testdata/digitalocean.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/digitalocean.river rename to internal/converter/internal/promtailconvert/testdata/digitalocean.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/docker.river b/internal/converter/internal/promtailconvert/testdata/docker.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/docker.river rename to internal/converter/internal/promtailconvert/testdata/docker.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/docker_relabel.river b/internal/converter/internal/promtailconvert/testdata/docker_relabel.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/docker_relabel.river rename to internal/converter/internal/promtailconvert/testdata/docker_relabel.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/dockerswarm.river b/internal/converter/internal/promtailconvert/testdata/dockerswarm.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/dockerswarm.river rename to internal/converter/internal/promtailconvert/testdata/dockerswarm.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/ec2.river b/internal/converter/internal/promtailconvert/testdata/ec2.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/ec2.river rename to internal/converter/internal/promtailconvert/testdata/ec2.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/file.river b/internal/converter/internal/promtailconvert/testdata/file.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/file.river rename to internal/converter/internal/promtailconvert/testdata/file.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/gce.river b/internal/converter/internal/promtailconvert/testdata/gce.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/gce.river rename to internal/converter/internal/promtailconvert/testdata/gce.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/gcplog.river b/internal/converter/internal/promtailconvert/testdata/gcplog.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/gcplog.river rename to internal/converter/internal/promtailconvert/testdata/gcplog.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/gelf.river b/internal/converter/internal/promtailconvert/testdata/gelf.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/gelf.river rename to internal/converter/internal/promtailconvert/testdata/gelf.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/heroku.river b/internal/converter/internal/promtailconvert/testdata/heroku.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/heroku.river rename to internal/converter/internal/promtailconvert/testdata/heroku.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/journal.river b/internal/converter/internal/promtailconvert/testdata/journal.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/journal.river rename to internal/converter/internal/promtailconvert/testdata/journal.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/journal_relabel.river b/internal/converter/internal/promtailconvert/testdata/journal_relabel.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/journal_relabel.river rename to internal/converter/internal/promtailconvert/testdata/journal_relabel.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/kafka.river b/internal/converter/internal/promtailconvert/testdata/kafka.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/kafka.river rename to internal/converter/internal/promtailconvert/testdata/kafka.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/kubernetes.river b/internal/converter/internal/promtailconvert/testdata/kubernetes.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/kubernetes.river rename to internal/converter/internal/promtailconvert/testdata/kubernetes.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/loki_write.river b/internal/converter/internal/promtailconvert/testdata/loki_write.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/loki_write.river rename to internal/converter/internal/promtailconvert/testdata/loki_write.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/marathon.river b/internal/converter/internal/promtailconvert/testdata/marathon.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/marathon.river rename to internal/converter/internal/promtailconvert/testdata/marathon.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river b/internal/converter/internal/promtailconvert/testdata/mixed_pipeline.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/mixed_pipeline.river rename to internal/converter/internal/promtailconvert/testdata/mixed_pipeline.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/nerve.river b/internal/converter/internal/promtailconvert/testdata/nerve.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/nerve.river rename to internal/converter/internal/promtailconvert/testdata/nerve.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/openstack.river b/internal/converter/internal/promtailconvert/testdata/openstack.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/openstack.river rename to internal/converter/internal/promtailconvert/testdata/openstack.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_cri_empty.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_drop.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_match_nested.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_part1.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_part2.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river b/internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.river rename to internal/converter/internal/promtailconvert/testdata/pipeline_stages_structured_metadata.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/push_api.river b/internal/converter/internal/promtailconvert/testdata/push_api.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/push_api.river rename to internal/converter/internal/promtailconvert/testdata/push_api.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth.river b/internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth2.river b/internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth2.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth2.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_basic_auth2.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_bearer_file.river b/internal/converter/internal/promtailconvert/testdata/remote_write_bearer_file.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_bearer_file.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_bearer_file.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_bearer_token.river b/internal/converter/internal/promtailconvert/testdata/remote_write_bearer_token.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_bearer_token.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_bearer_token.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_oauth.river b/internal/converter/internal/promtailconvert/testdata/remote_write_oauth.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_oauth.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_oauth.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/remote_write_oauth2.river b/internal/converter/internal/promtailconvert/testdata/remote_write_oauth2.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/remote_write_oauth2.river rename to internal/converter/internal/promtailconvert/testdata/remote_write_oauth2.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river b/internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.river rename to internal/converter/internal/promtailconvert/testdata/sd_pipeline_example.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/serverset.river b/internal/converter/internal/promtailconvert/testdata/serverset.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/serverset.river rename to internal/converter/internal/promtailconvert/testdata/serverset.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/source_pipeline_example.river b/internal/converter/internal/promtailconvert/testdata/source_pipeline_example.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/source_pipeline_example.river rename to internal/converter/internal/promtailconvert/testdata/source_pipeline_example.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river b/internal/converter/internal/promtailconvert/testdata/static_pipeline_example.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/static_pipeline_example.river rename to internal/converter/internal/promtailconvert/testdata/static_pipeline_example.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/syslog.river b/internal/converter/internal/promtailconvert/testdata/syslog.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/syslog.river rename to internal/converter/internal/promtailconvert/testdata/syslog.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/triton.river b/internal/converter/internal/promtailconvert/testdata/triton.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/triton.river rename to internal/converter/internal/promtailconvert/testdata/triton.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents.river b/internal/converter/internal/promtailconvert/testdata/windowsevents.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents.river rename to internal/converter/internal/promtailconvert/testdata/windowsevents.alloy diff --git a/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river b/internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.alloy similarity index 100% rename from internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.river rename to internal/converter/internal/promtailconvert/testdata/windowsevents_relabel.alloy diff --git a/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.river b/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata-v2/integrations_v2.river rename to internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy diff --git a/internal/converter/internal/staticconvert/testdata-v2/unsupported.river b/internal/converter/internal/staticconvert/testdata-v2/unsupported.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata-v2/unsupported.river rename to internal/converter/internal/staticconvert/testdata-v2/unsupported.alloy diff --git a/internal/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river b/internal/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.river rename to internal/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.alloy diff --git a/internal/converter/internal/staticconvert/testdata/integrations.river b/internal/converter/internal/staticconvert/testdata/integrations.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/integrations.river rename to internal/converter/internal/staticconvert/testdata/integrations.alloy diff --git a/internal/converter/internal/staticconvert/testdata/prom_remote_write.river b/internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/prom_remote_write.river rename to internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy diff --git a/internal/converter/internal/staticconvert/testdata/prom_scrape.river b/internal/converter/internal/staticconvert/testdata/prom_scrape.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/prom_scrape.river rename to internal/converter/internal/staticconvert/testdata/prom_scrape.alloy diff --git a/internal/converter/internal/staticconvert/testdata/promtail_prom.river b/internal/converter/internal/staticconvert/testdata/promtail_prom.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/promtail_prom.river rename to internal/converter/internal/staticconvert/testdata/promtail_prom.alloy diff --git a/internal/converter/internal/staticconvert/testdata/promtail_scrape.river b/internal/converter/internal/staticconvert/testdata/promtail_scrape.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/promtail_scrape.river rename to internal/converter/internal/staticconvert/testdata/promtail_scrape.alloy diff --git a/internal/converter/internal/staticconvert/testdata/sanitize.river b/internal/converter/internal/staticconvert/testdata/sanitize.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/sanitize.river rename to internal/converter/internal/staticconvert/testdata/sanitize.alloy diff --git a/internal/converter/internal/staticconvert/testdata/traces.river b/internal/converter/internal/staticconvert/testdata/traces.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/traces.river rename to internal/converter/internal/staticconvert/testdata/traces.alloy diff --git a/internal/converter/internal/staticconvert/testdata/traces_multi.river b/internal/converter/internal/staticconvert/testdata/traces_multi.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/traces_multi.river rename to internal/converter/internal/staticconvert/testdata/traces_multi.alloy diff --git a/internal/converter/internal/staticconvert/testdata/unsupported.river b/internal/converter/internal/staticconvert/testdata/unsupported.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata/unsupported.river rename to internal/converter/internal/staticconvert/testdata/unsupported.alloy diff --git a/internal/converter/internal/staticconvert/testdata_windows/integrations.river b/internal/converter/internal/staticconvert/testdata_windows/integrations.alloy similarity index 100% rename from internal/converter/internal/staticconvert/testdata_windows/integrations.river rename to internal/converter/internal/staticconvert/testdata_windows/integrations.alloy diff --git a/internal/converter/internal/test_common/testing.go b/internal/converter/internal/test_common/testing.go index 794b0dc9b3..0787bb1fce 100644 --- a/internal/converter/internal/test_common/testing.go +++ b/internal/converter/internal/test_common/testing.go @@ -25,7 +25,7 @@ import ( ) const ( - alloySuffix = ".river" + alloySuffix = ".alloy" diagsSuffix = ".diags" ) @@ -39,8 +39,8 @@ const ( // 3. If the current filename.sourceSuffix has a matching filename.diags, read // the contents of filename.diags and validate that they match in order // with the diags from step 2. -// 4. If the current filename.sourceSuffix has a matching filename.river, read -// the contents of filename.river and validate that they match the river +// 4. If the current filename.sourceSuffix has a matching filename.alloy, read +// the contents of filename.alloy and validate that they match the Alloy // configuration generated by calling convert in step 1. func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, loadAlloyConfig bool, extraArgs []string, convert func(in []byte, extraArgs []string) ([]byte, diag.Diagnostics)) { require.NoError(t, filepath.WalkDir(folderPath, func(path string, d fs.DirEntry, _ error) error { @@ -51,13 +51,13 @@ func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, loadAll if strings.HasSuffix(path, sourceSuffix) { tc := filepath.Base(path) t.Run(tc, func(t *testing.T) { - riverFile := strings.TrimSuffix(path, sourceSuffix) + alloySuffix + alloyFile := strings.TrimSuffix(path, sourceSuffix) + alloySuffix diagsFile := strings.TrimSuffix(path, sourceSuffix) + diagsSuffix - if !fileExists(riverFile) && !fileExists(diagsFile) { - t.Fatalf("no expected diags or river for %s - missing test expectations?", path) + if !fileExists(alloyFile) && !fileExists(diagsFile) { + t.Fatalf("no expected diags or Alloy for %s - missing test expectations?", path) } - actualRiver, actualDiags := convert(getSourceContents(t, path), extraArgs) + actualAlloy, actualDiags := convert(getSourceContents(t, path), extraArgs) // Skip Info level diags for this testing. These would create // a lot of unnecessary noise. @@ -66,8 +66,8 @@ func TestDirectory(t *testing.T, folderPath string, sourceSuffix string, loadAll expectedDiags := getExpectedDiags(t, diagsFile) validateDiags(t, expectedDiags, actualDiags) - expectedRiver := getExpectedRiver(t, riverFile) - validateRiver(t, expectedRiver, actualRiver, loadAlloyConfig) + expectedAlloy := getExpectedAlloy(t, alloyFile) + validateAlloy(t, expectedAlloy, actualAlloy, loadAlloyConfig) }) } @@ -138,8 +138,8 @@ func normalizeLineEndings(data []byte) []byte { return normalized } -// getExpectedRiver reads the expected river output file and retrieve its contents. -func getExpectedRiver(t *testing.T, filePath string) []byte { +// getExpectedAlloy reads the expected Alloy output file and retrieve its contents. +func getExpectedAlloy(t *testing.T, filePath string) []byte { if _, err := os.Stat(filePath); err == nil { outputBytes, err := os.ReadFile(filePath) require.NoError(t, err) @@ -154,27 +154,27 @@ func fileExists(path string) bool { return err == nil } -// validateRiver makes sure the expected river and actual river are a match -func validateRiver(t *testing.T, expectedRiver []byte, actualRiver []byte, loadAlloyConfig bool) { - if len(expectedRiver) > 0 { - if !reflect.DeepEqual(expectedRiver, actualRiver) { +// validateAlloy makes sure the expected Alloy and actual Alloy are a match +func validateAlloy(t *testing.T, expectedAlloy []byte, actualAlloy []byte, loadAlloyConfig bool) { + if len(expectedAlloy) > 0 { + if !reflect.DeepEqual(expectedAlloy, actualAlloy) { fmt.Println("============== ACTUAL =============") - fmt.Println(string(normalizeLineEndings(actualRiver))) + fmt.Println(string(normalizeLineEndings(actualAlloy))) fmt.Println("===================================") } - require.Equal(t, string(expectedRiver), string(normalizeLineEndings(actualRiver))) + require.Equal(t, string(expectedAlloy), string(normalizeLineEndings(actualAlloy))) if loadAlloyConfig { - attemptLoadingAlloyConfig(t, actualRiver) + attemptLoadingAlloyConfig(t, actualAlloy) } } } // attemptLoadingAlloyConfig will attempt to load the Alloy config and report any errors. -func attemptLoadingAlloyConfig(t *testing.T, river []byte) { - cfg, err := alloy.ParseSource(t.Name(), river) - require.NoError(t, err, "the output River config failed to parse: %s", string(normalizeLineEndings(river))) +func attemptLoadingAlloyConfig(t *testing.T, bb []byte) { + cfg, err := alloy.ParseSource(t.Name(), bb) + require.NoError(t, err, "the output Alloy config failed to parse: %s", string(normalizeLineEndings(bb))) // The below check suffers from test race conditions on Windows. Our goal here is to verify config conversions, // which is platform independent, so we can skip this check on Windows as a workaround. @@ -214,5 +214,5 @@ func attemptLoadingAlloyConfig(t *testing.T, river []byte) { t.Log("ignoring error: " + err.Error()) return } - require.NoError(t, err, "failed to load the River config: %s", string(normalizeLineEndings(river))) + require.NoError(t, err, "failed to load the Alloy config: %s", string(normalizeLineEndings(bb))) } diff --git a/internal/service/service.go b/internal/service/service.go index 4d2fcdafd9..f947557e38 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -23,10 +23,10 @@ type Definition struct { // ConfigType is an optional config type to configure a // service at runtime. The Name of the service is used - // as the River block name to configure the service. + // as the Alloy block name to configure the service. // If nil, the service has no runtime configuration. // - // When non-nil, ConfigType must be a struct type with River + // When non-nil, ConfigType must be a struct type with alloy // tags for decoding as a config block. ConfigType any diff --git a/internal/tools/packaging_test/alloy_linux_packages_test.go b/internal/tools/packaging_test/alloy_linux_packages_test.go index ecd2ba282b..824a68ea46 100644 --- a/internal/tools/packaging_test/alloy_linux_packages_test.go +++ b/internal/tools/packaging_test/alloy_linux_packages_test.go @@ -81,7 +81,7 @@ func (env *AlloyEnvironment) TestInstall(t *testing.T) { res = env.ExecScript(`[ -f /usr/bin/alloy ]`) require.Equal(t, 0, res.ExitCode, "expected Alloy to be installed") - res = env.ExecScript(`[ -f /etc/alloy.river ]`) + res = env.ExecScript(`[ -f /etc/alloy.alloy ]`) require.Equal(t, 0, res.ExitCode, "expected Alloy configuration file to exist") res = env.Uninstall() @@ -94,13 +94,13 @@ func (env *AlloyEnvironment) TestInstall(t *testing.T) { } func (env *AlloyEnvironment) TestConfigPersistence(t *testing.T) { - res := env.ExecScript(`echo -n "keepalive" > /etc/alloy.river`) + res := env.ExecScript(`echo -n "keepalive" > /etc/alloy.alloy`) require.Equal(t, 0, res.ExitCode, "failed to write config file") res = env.Install() require.Equal(t, 0, res.ExitCode, "installation failed") - res = env.ExecScript(`cat /etc/alloy.river`) + res = env.ExecScript(`cat /etc/alloy.alloy`) require.Equal(t, "keepalive", res.Stdout, "Expected existing file to not be overridden") } diff --git a/internal/util/untar.go b/internal/util/untar.go new file mode 100644 index 0000000000..588a18f6f0 --- /dev/null +++ b/internal/util/untar.go @@ -0,0 +1,57 @@ +package util + +import ( + "archive/tar" + "errors" + "fmt" + "io" + "os" + "path/filepath" +) + +// Untar untars a tarball to the provided destination path. +func Untar(tarPath string, destPath string) error { + f, err := os.Open(tarPath) + if err != nil { + return err + } + defer f.Close() + + // Create destination path. + if err := os.MkdirAll(destPath, 0755); err != nil { + return err + } + + tr := tar.NewReader(f) + for { + header, err := tr.Next() + if errors.Is(err, io.EOF) { + break + } else if err != nil { + return err + } + + fullPath := filepath.Join(destPath, header.Name) + switch header.Typeflag { + case tar.TypeDir: + if err := os.MkdirAll(fullPath, 0755); err != nil { + return err + } + + case tar.TypeReg: + f, err := os.OpenFile(fullPath, os.O_CREATE|os.O_WRONLY, os.FileMode(header.Mode)) + if err != nil { + return err + } + if _, err := io.Copy(f, tr); err != nil { + return err + } + _ = f.Close() + + default: + return fmt.Errorf("unsupported type: %v", header.Typeflag) + } + } + + return nil +} diff --git a/internal/web/ui/src/features/river-js/RiverValue.module.css b/internal/web/ui/src/features/alloy-syntax-js/RiverValue.module.css similarity index 100% rename from internal/web/ui/src/features/river-js/RiverValue.module.css rename to internal/web/ui/src/features/alloy-syntax-js/RiverValue.module.css diff --git a/internal/web/ui/src/features/river-js/RiverValue.tsx b/internal/web/ui/src/features/alloy-syntax-js/RiverValue.tsx similarity index 92% rename from internal/web/ui/src/features/river-js/RiverValue.tsx rename to internal/web/ui/src/features/alloy-syntax-js/RiverValue.tsx index 0859de584b..5fc6d9336c 100644 --- a/internal/web/ui/src/features/river-js/RiverValue.tsx +++ b/internal/web/ui/src/features/alloy-syntax-js/RiverValue.tsx @@ -2,16 +2,16 @@ import { FC, Fragment, ReactElement } from 'react'; import { ObjectField, Value, ValueType } from './types'; -import styles from './RiverValue.module.css'; +import styles from './AlloyValue.module.css'; -export interface RiverValueProps { +export interface AlloyValueProps { value: Value; } /** - * RiverValue emits a paragraph which represents a River value. + * AlloyValue emits a paragraph which represents an Alloy value. */ -export const RiverValue: FC = (props) => { +export const AlloyValue: FC = (props) => { return (

@@ -19,7 +19,7 @@ export const RiverValue: FC = (props) => { ); }; -type valueRendererProps = RiverValueProps & { +type valueRendererProps = AlloyValueProps & { indentLevel: number; }; @@ -138,12 +138,12 @@ function partitionFields(fields: ObjectField[]): ObjectField[][] { function multilinedValue(value: Value): boolean { switch (value.type) { case ValueType.OBJECT: - // River objects cross more than one line whenever there is at least one + // Alloy objects cross more than one line whenever there is at least one // element. return value.value.length > 0; case ValueType.ARRAY: - // River arrays cross more than one line if any of their elements cross + // Alloy arrays cross more than one line if any of their elements cross // more than one line. return value.value.some((v) => multilinedValue(v)); } @@ -194,7 +194,7 @@ function getLinePrefix(indentLevel: number): ReactElement | null { } /** - * validIdentifier reports whether the input is a valid River identifier. + * validIdentifier reports whether the input is a valid Alloy identifier. */ function validIdentifier(input: string): boolean { return /^[_a-z][_a-z0-9]*$/i.test(input); @@ -202,7 +202,7 @@ function validIdentifier(input: string): boolean { /** * escapeString escapes special characters in a string so they can be printed - * inside a River string literal. + * inside an Alloy string literal. */ function escapeString(input: string): string { // TODO(rfratto): this should also escape Unicode characters into \u and \U diff --git a/internal/web/ui/src/features/river-js/stringify.ts b/internal/web/ui/src/features/alloy-syntax-js/stringify.ts similarity index 87% rename from internal/web/ui/src/features/river-js/stringify.ts rename to internal/web/ui/src/features/alloy-syntax-js/stringify.ts index 9381a544a0..f35f142433 100644 --- a/internal/web/ui/src/features/river-js/stringify.ts +++ b/internal/web/ui/src/features/alloy-syntax-js/stringify.ts @@ -1,13 +1,13 @@ import { ObjectField, Value, ValueType } from './types'; /** - * Returns a native River config representation of the given Value. + * Returns a native Alloy config representation of the given Value. */ -export function riverStringify(v: Value): string { - return riverStringifyImpl(v, 0); +export function alloyStringify(v: Value): string { + return alloyStringifyImpl(v, 0); } -function riverStringifyImpl(v: Value, indent: number): string { +function alloyStringifyImpl(v: Value, indent: number): string { switch (v.type) { case ValueType.NULL: { return 'null'; @@ -32,7 +32,7 @@ function riverStringifyImpl(v: Value, indent: number): string { case ValueType.ARRAY: { let result = '['; v.value.forEach((element, idx) => { - result += riverStringifyImpl(element, indent); + result += alloyStringifyImpl(element, indent); if (idx + 1 < v.value.length) { result += ', '; } @@ -56,7 +56,7 @@ function riverStringifyImpl(v: Value, indent: number): string { return partition.forEach((element) => { result += indentLine(indent + 1); - result += `${partitionKey(element, keyLength)} = ${riverStringifyImpl(element.value, indent + 1)}`; + result += `${partitionKey(element, keyLength)} = ${alloyStringifyImpl(element.value, indent + 1)}`; result += ',\n'; }); }); @@ -81,7 +81,7 @@ function riverStringifyImpl(v: Value, indent: number): string { /** * escapeString escapes special characters in a string so they can be printed - * inside a River string literal. + * inside an Alloy string literal. */ function escapeString(input: string): string { // TODO(rfratto): this should also escape Unicode characters into \u and \U @@ -151,12 +151,12 @@ function partitionFields(fields: ObjectField[]): ObjectField[][] { function multilinedValue(value: Value): boolean { switch (value.type) { case ValueType.OBJECT: - // River objects cross more than one line whenever there is at least one + // Alloy objects cross more than one line whenever there is at least one // element. return value.value.length > 0; case ValueType.ARRAY: - // River arrays cross more than one line if any of their elements cross + // Alloy arrays cross more than one line if any of their elements cross // more than one line. return value.value.some((v) => multilinedValue(v)); } @@ -200,7 +200,7 @@ function partitionKey(field: ObjectField, keyLength: number): string { } /** - * validIdentifier reports whether the input is a valid River identifier. + * validIdentifier reports whether the input is a valid Alloy identifier. */ function validIdentifier(input: string): boolean { return /^[_a-z][_a-z0-9]*$/i.test(input); diff --git a/internal/web/ui/src/features/river-js/types.ts b/internal/web/ui/src/features/alloy-syntax-js/types.ts similarity index 77% rename from internal/web/ui/src/features/river-js/types.ts rename to internal/web/ui/src/features/alloy-syntax-js/types.ts index 6765b74fa9..27a5f0a04e 100644 --- a/internal/web/ui/src/features/river-js/types.ts +++ b/internal/web/ui/src/features/alloy-syntax-js/types.ts @@ -38,7 +38,7 @@ export interface AttrStmt { } /** - * Value represents a River value. + * Value represents an Alloy value. */ export type Value = | NullValue @@ -66,14 +66,14 @@ export enum ValueType { } /** - * NullValue represents a River null. + * NullValue represents an Alloy null. */ export interface NullValue { type: ValueType.NULL; } /** - * NumberValue represents a River number. + * NumberValue represents an Alloy number. */ export interface NumberValue { type: ValueType.NUMBER; @@ -81,7 +81,7 @@ export interface NumberValue { } /** - * StringValue represents a River string. + * StringValue represents an Alloy string. */ export interface StringValue { type: ValueType.STRING; @@ -89,7 +89,7 @@ export interface StringValue { } /** - * BoolValue represents a River bool. + * BoolValue represents an Alloy bool. */ export interface BoolValue { type: ValueType.BOOL; @@ -97,7 +97,7 @@ export interface BoolValue { } /** - * ArrayValue represents a River array. Elements are River Values of any type. + * ArrayValue represents an Alloy array. Elements are Alloy Values of any type. */ export interface ArrayValue { type: ValueType.ARRAY; @@ -105,7 +105,7 @@ export interface ArrayValue { } /** - * ObjectValue represents a River object. Each field has a name and a value, + * ObjectValue represents an Alloy object. Each field has a name and a value, * similar to an attribute. It is invalid for an ObjectValue to define the same * field twice. */ @@ -115,7 +115,7 @@ export interface ObjectValue { } /** - * ObjectField represents a field within a River object value. It is similar to + * ObjectField represents a field within an Alloy object value. It is similar to * an attribute, having a key and a value. */ export interface ObjectField { @@ -124,7 +124,7 @@ export interface ObjectField { } /** - * FunctionValue represents a River function. The value field is literal text + * FunctionValue represents an Alloy function. The value field is literal text * to display which represents the function. */ export interface FunctionValue { @@ -133,7 +133,7 @@ export interface FunctionValue { } /** - * CapsuleValue represents a River capsule. The value field is literal text to + * CapsuleValue represents an Alloy capsule. The value field is literal text to * display which represents the capsule. */ export interface CapsuleValue { diff --git a/internal/web/ui/src/features/component/ComponentBody.tsx b/internal/web/ui/src/features/component/ComponentBody.tsx index 3b4e40696b..795e341835 100644 --- a/internal/web/ui/src/features/component/ComponentBody.tsx +++ b/internal/web/ui/src/features/component/ComponentBody.tsx @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { riverStringify } from '../river-js/stringify'; +import { alloyStringify } from '../alloy-syntax-js/stringify'; import { style } from './style'; import Table from './Table'; @@ -26,7 +26,7 @@ const ComponentBody = ({ partition }: ComponentBodyProps) => { 

               
-                {riverStringify(value)}
+                {alloyStringify(value)}
diff --git a/internal/web/ui/src/features/component/types.ts b/internal/web/ui/src/features/component/types.ts index fc7ae413e9..4678b4ca17 100644 --- a/internal/web/ui/src/features/component/types.ts +++ b/internal/web/ui/src/features/component/types.ts @@ -1,4 +1,4 @@ -import { AttrStmt, Body as RiverBody } from '../river-js/types'; +import { AttrStmt, Body as AlloyBody } from '../alloy-syntax-js/types'; /** * ComponentInfo is high-level information for a component. @@ -87,19 +87,19 @@ export interface ComponentDetail extends ComponentInfo { * This is expected to be the *evaluated* arguments, not the raw expressions * a user may have used. */ - arguments: RiverBody; + arguments: AlloyBody; /** * Exports is the list of component-generated values which other components * can reference. */ - exports?: RiverBody; + exports?: AlloyBody; /** * Components may emit generic debug information, which would be contained * here. */ - debugInfo?: RiverBody; + debugInfo?: AlloyBody; /** * If a component is a module loader, the IDs of modules it created are included here. diff --git a/internal/web/ui/src/utils/partition.ts b/internal/web/ui/src/utils/partition.ts index 29d65b1a9e..ece1a583b1 100644 --- a/internal/web/ui/src/utils/partition.ts +++ b/internal/web/ui/src/utils/partition.ts @@ -1,5 +1,5 @@ +import { AttrStmt, Body, StmtType } from '../features/alloy-syntax-js/types'; import { PartitionedBody } from '../features/component/types'; -import { AttrStmt, Body, StmtType } from '../features/river-js/types'; /** * partitionBody groups a body by attributes and inner blocks, assigning unique diff --git a/operations/alloy-syntax-jsonnet/internal/utils.jsonnet b/operations/alloy-syntax-jsonnet/internal/utils.jsonnet index 8ea1f7b255..ed34ae3e21 100644 --- a/operations/alloy-syntax-jsonnet/internal/utils.jsonnet +++ b/operations/alloy-syntax-jsonnet/internal/utils.jsonnet @@ -1,6 +1,6 @@ { // exprMarker is a field name which can be used to mark a Jsonnet object as a - // River expression literal. + // Alloy expression literal. // // The field name *must* be public, otherwise std.prune will remove it and // cause the expression literals to be treated as object literals. @@ -9,5 +9,5 @@ // it to collide with an object literal key that a user would want to use. We // pick a marker name here which is fairly unlikely to appear in a config // file to reduce the chance of something being treated as an expr literal. - exprMarker: '$$__river_jsonnet__expr_literal', + exprMarker: '$$__alloy_jsonnet__expr_literal', } diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md index 640219358d..b5f184292e 100644 --- a/operations/helm/charts/alloy/README.md +++ b/operations/helm/charts/alloy/README.md @@ -168,9 +168,9 @@ Alloy instances in the cluster. `alloy.configMap.content` holds the Grafana Alloy configuration to use. If `alloy.configMap.content` is not provided, a [default configuration file][default-config] is -used. When provided, `alloy.configMap.content` must hold a valid River configuration file. +used. When provided, `alloy.configMap.content` must hold a valid Alloy configuration file. -[default-config]: ./config/example.river +[default-config]: ./config/example.alloy ### alloy.securityContext diff --git a/operations/helm/charts/alloy/README.md.gotmpl b/operations/helm/charts/alloy/README.md.gotmpl index 981dd11296..a0ab2ddc36 100644 --- a/operations/helm/charts/alloy/README.md.gotmpl +++ b/operations/helm/charts/alloy/README.md.gotmpl @@ -68,9 +68,9 @@ Alloy instances in the cluster. `alloy.configMap.content` holds the Grafana Alloy configuration to use. If `alloy.configMap.content` is not provided, a [default configuration file][default-config] is -used. When provided, `alloy.configMap.content` must hold a valid River configuration file. +used. When provided, `alloy.configMap.content` must hold a valid Alloy configuration file. -[default-config]: ./config/example.river +[default-config]: ./config/example.alloy ### alloy.securityContext diff --git a/operations/helm/charts/alloy/ci/existing-config-values.yaml b/operations/helm/charts/alloy/ci/existing-config-values.yaml index 8a726b5e0f..2490dd15f1 100644 --- a/operations/helm/charts/alloy/ci/existing-config-values.yaml +++ b/operations/helm/charts/alloy/ci/existing-config-values.yaml @@ -2,4 +2,4 @@ agent: configMap: create: false name: existing-config - key: my-config.river + key: my-config.alloy diff --git a/operations/helm/charts/alloy/config/example.river b/operations/helm/charts/alloy/config/example.alloy similarity index 100% rename from operations/helm/charts/alloy/config/example.river rename to operations/helm/charts/alloy/config/example.alloy diff --git a/operations/helm/charts/alloy/templates/_config.tpl b/operations/helm/charts/alloy/templates/_config.tpl index 722b955caa..54b8225db4 100644 --- a/operations/helm/charts/alloy/templates/_config.tpl +++ b/operations/helm/charts/alloy/templates/_config.tpl @@ -20,6 +20,6 @@ ConfigMap. {{- if $values.configMap.key -}} {{- $values.configMap.key }} {{- else -}} -config.river +config.alloy {{- end }} {{- end }} diff --git a/operations/helm/charts/alloy/templates/configmap.yaml b/operations/helm/charts/alloy/templates/configmap.yaml index 26f798d49d..789520f1fb 100644 --- a/operations/helm/charts/alloy/templates/configmap.yaml +++ b/operations/helm/charts/alloy/templates/configmap.yaml @@ -8,8 +8,8 @@ metadata: {{- include "alloy.labels" . | nindent 4 }} data: {{- if $values.configMap.content }} - config.river: |- {{- (tpl $values.configMap.content .) | nindent 4 }} + config.alloy: |- {{- (tpl $values.configMap.content .) | nindent 4 }} {{- else }} - config.river: |- {{- .Files.Get "config/example.river" | trim | nindent 4 }} + config.alloy: |- {{- .Files.Get "config/example.alloy" | trim | nindent 4 }} {{- end }} {{- end }} diff --git a/operations/helm/lintconf.yaml b/operations/helm/lintconf.yaml index 80a9a89ac1..06dda7e2a3 100644 --- a/operations/helm/lintconf.yaml +++ b/operations/helm/lintconf.yaml @@ -38,7 +38,7 @@ rules: new-lines: type: unix trailing-spaces: - # because river file has new lines and those are indented too. See https://github.com/helm/helm/issues/11955 + # because Alloy file has new lines and those are indented too. See https://github.com/helm/helm/issues/11955 ignore: | configmap.yaml truthy: diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml index f8e29f2fa1..d51e15b59d 100644 --- a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/clustering/alloy/templates/configmap.yaml b/operations/helm/tests/clustering/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/clustering/alloy/templates/configmap.yaml +++ b/operations/helm/tests/clustering/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml index 490b6c4bf5..209ea18180 100644 --- a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml @@ -34,7 +34,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml index f350672349..680906690c 100644 --- a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml index e5d86cdcb3..636c0e9597 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml b/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml index f8e29f2fa1..d51e15b59d 100644 --- a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml index 91f7b8b8bb..fe63ed1ab9 100644 --- a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml b/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml index a79782476e..8781b7dc51 100644 --- a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml @@ -32,7 +32,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml index 79d4926665..d32be237f2 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml @@ -33,7 +33,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml b/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml index 0042785594..e0d5af1402 100644 --- a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml @@ -34,7 +34,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/custom-config/alloy/templates/configmap.yaml b/operations/helm/tests/custom-config/alloy/templates/configmap.yaml index 17d19ad116..c6f25b8a10 100644 --- a/operations/helm/tests/custom-config/alloy/templates/configmap.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "warn" format = "logfmt" diff --git a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml index f8e29f2fa1..d51e15b59d 100644 --- a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/default-values/alloy/templates/configmap.yaml b/operations/helm/tests/default-values/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/default-values/alloy/templates/configmap.yaml +++ b/operations/helm/tests/default-values/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml index f8e29f2fa1..d51e15b59d 100644 --- a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml index eb136d445a..354b65f689 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml index f8e29f2fa1..d51e15b59d 100644 --- a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/envFrom/alloy/templates/configmap.yaml b/operations/helm/tests/envFrom/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/envFrom/alloy/templates/configmap.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml index 3cc9a1898b..02412907fd 100644 --- a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml index 8c46e62aae..b821223211 100644 --- a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/my-config.river + - /etc/alloy/my-config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/extra-env/alloy/templates/configmap.yaml b/operations/helm/tests/extra-env/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/extra-env/alloy/templates/configmap.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml index 22ae1a88db..be727ffb6d 100644 --- a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml b/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml index 58a11aa88a..ec92911108 100644 --- a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml b/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml index b19b62ea83..473be4f01c 100644 --- a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index 21154f8c2d..27969ff756 100644 --- a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -36,7 +36,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml b/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml index 6bd42bbd2a..804a22a9b8 100644 --- a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml b/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml index 56707bbf93..1222e76b02 100644 --- a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml @@ -49,7 +49,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index b31b89a51a..0572d22f96 100644 --- a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml b/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml index 6bd42bbd2a..804a22a9b8 100644 --- a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml index 083edf01ec..7513e7685f 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml b/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml index 261bbe66a3..fc722deac7 100644 --- a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml @@ -32,7 +32,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/sidecars/alloy/templates/configmap.yaml b/operations/helm/tests/sidecars/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/sidecars/alloy/templates/configmap.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml index 7519b87602..2a2e1bf445 100644 --- a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml index 7aa128e90a..8d489053f7 100644 --- a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml @@ -32,7 +32,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/operations/helm/tests/with-digests/alloy/templates/configmap.yaml b/operations/helm/tests/with-digests/alloy/templates/configmap.yaml index c9ae77aa1e..a707821166 100644 --- a/operations/helm/tests/with-digests/alloy/templates/configmap.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/configmap.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/version: "vX.Y.Z" app.kubernetes.io/managed-by: Helm data: - config.river: |- + config.alloy: |- logging { level = "info" format = "logfmt" diff --git a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml index 22c1e1cd23..573b045ad7 100644 --- a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: IfNotPresent args: - run - - /etc/alloy/config.river + - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ diff --git a/packaging/alloy.river b/packaging/alloy.alloy similarity index 100% rename from packaging/alloy.river rename to packaging/alloy.alloy diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst index 79631bec0c..4042ddf78a 100644 --- a/packaging/deb/control/postinst +++ b/packaging/deb/control/postinst @@ -29,8 +29,8 @@ case "$1" in chown $ALLOY_USER:$ALLOY_GROUP /var/lib/alloy chmod 770 /var/lib/alloy - chmod 640 /etc/alloy.river - chown root:$ALLOY_GROUP /etc/alloy.river + chmod 640 /etc/alloy.alloy + chown root:$ALLOY_GROUP /etc/alloy.alloy if [ -z ${2+x} ] && [ "$RESTART_ON_UPGRADE" = "true" ]; then if command -v systemctl 2>/dev/null; then diff --git a/packaging/environment-file b/packaging/environment-file index 2f2f7826f6..1aa77bd37b 100644 --- a/packaging/environment-file +++ b/packaging/environment-file @@ -7,7 +7,7 @@ # Command line options for Alloy. # # The configuration file holding the Alloy config. -CONFIG_FILE="/etc/alloy.river" +CONFIG_FILE="/etc/alloy.alloy" # User-defined arguments to pass to the run command. CUSTOM_ARGS="" diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst index 963664c935..7a64973254 100644 --- a/packaging/rpm/control/postinst +++ b/packaging/rpm/control/postinst @@ -32,8 +32,8 @@ if [ "$1" -eq 1 ] ; then chown $ALLOY_USER:$ALLOY_GROUP /var/lib/alloy chmod 770 /var/lib/alloy - chmod 640 /etc/alloy.river - chown root:$ALLOY_GROUP /etc/alloy.river + chmod 640 /etc/alloy.alloy + chown root:$ALLOY_GROUP /etc/alloy.alloy elif [ "$1" -ge 2 ] ; then add_to_logging_groups diff --git a/packaging/windows/config.river b/packaging/windows/config.alloy similarity index 100% rename from packaging/windows/config.river rename to packaging/windows/config.alloy diff --git a/packaging/windows/install_script.nsis b/packaging/windows/install_script.nsis index 0aa5b57c49..6c9edde46b 100644 --- a/packaging/windows/install_script.nsis +++ b/packaging/windows/install_script.nsis @@ -110,19 +110,19 @@ Section "install" SectionEnd Function CreateConfig - IfFileExists "$INSTDIR\config.river" Noop CreateNewConfig + IfFileExists "$INSTDIR\config.alloy" Noop CreateNewConfig Noop: Return CreateNewConfig: - File "config.river" + File "config.alloy" # Set permissions on the config file - AccessControl::DisableFileInheritance "$INSTDIR\config.river" - AccessControl::SetFileOwner "$INSTDIR\config.river" "Administrators" - AccessControl::ClearOnFile "$INSTDIR\config.river" "Administrators" "FullAccess" - AccessControl::SetOnFile "$INSTDIR\config.river" "SYSTEM" "FullAccess" - AccessControl::GrantOnFile "$INSTDIR\config.river" "Everyone" "ListDirectory" - AccessControl::GrantOnFile "$INSTDIR\config.river" "Everyone" "ReadAttributes" + AccessControl::DisableFileInheritance "$INSTDIR\config.alloy" + AccessControl::SetFileOwner "$INSTDIR\config.alloy" "Administrators" + AccessControl::ClearOnFile "$INSTDIR\config.alloy" "Administrators" "FullAccess" + AccessControl::SetOnFile "$INSTDIR\config.alloy" "SYSTEM" "FullAccess" + AccessControl::GrantOnFile "$INSTDIR\config.alloy" "Everyone" "ListDirectory" + AccessControl::GrantOnFile "$INSTDIR\config.alloy" "Everyone" "ReadAttributes" Return FunctionEnd @@ -142,7 +142,7 @@ Function InitializeRegistry ${If} $Config != "" StrCpy $ConfigFlag "$Config" ${Else} - StrCpy $ConfigFlag "$INSTDIR\config.river" + StrCpy $ConfigFlag "$INSTDIR\config.alloy" ${EndIf} ${If} $DisableReporting == "yes" diff --git a/tools/make/packaging.mk b/tools/make/packaging.mk index a51ce4a5e0..2fcf2625a4 100644 --- a/tools/make/packaging.mk +++ b/tools/make/packaging.mk @@ -124,12 +124,12 @@ define generate_alloy_fpm = -t $(1) \ --after-install packaging/$(1)/control/postinst \ --before-remove packaging/$(1)/control/prerm \ - --config-files /etc/alloy.river \ + --config-files /etc/alloy.alloy \ --config-files $(ALLOY_ENVIRONMENT_FILE_$(1)) \ --rpm-rpmbuild-define "_build_id_links none" \ --package $(4) \ dist/alloy-linux-$(3)=/usr/bin/alloy \ - packaging/alloy.river=/etc/alloy.river \ + packaging/alloy.alloy=/etc/alloy.alloy \ packaging/environment-file=$(ALLOY_ENVIRONMENT_FILE_$(1)) \ packaging/$(1)/alloy.service=/usr/lib/systemd/system/alloy.service endef