From 8a9a157d44e9cd2b1558fb052d6ee01c4e622032 Mon Sep 17 00:00:00 2001
From: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:13:38 +0300
Subject: [PATCH] Replace some usages of agent with alloy (#126)

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml                 |  8 ++++----
 .github/ISSUE_TEMPLATE/config.yml                      | 10 +++++-----
 .github/ISSUE_TEMPLATE/feature_request.yaml            |  6 +++---
 .github/ISSUE_TEMPLATE/proposal.yaml                   |  4 ++--
 .github/pull_request_template.md                       |  4 ++--
 CHANGELOG.md                                           |  1 -
 docs/developer/release/1-create-release-branch.md      |  2 +-
 .../configuration-syntax/expressions/operators.md      |  2 +-
 .../expressions/referencing_exports.md                 |  2 +-
 docs/sources/reference/components/discovery.gce.md     |  2 +-
 docs/sources/reference/components/loki.write.md        |  2 +-
 .../components/otelcol.processor.discovery.md          |  2 +-
 .../components/prometheus.exporter.postgres.md         |  4 ++--
 .../reference/components/prometheus.receive_http.md    |  4 ++--
 .../reference/components/prometheus.remote_write.md    |  8 +++-----
 docs/sources/reference/components/pyroscope.write.md   |  4 ++--
 .../shared/reference/components/otelcol-retry-block.md |  2 +-
 docs/sources/tasks/configure/configure-kubernetes.md   |  8 ++++----
 18 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 39a6be892..52d2b1a4b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,13 +1,13 @@
 name: Bug report
-description: Create a report to help us improve Grafana Agent.
+description: Create a report to help us improve Grafana Alloy.
 labels: ["bug"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for opening a bug report for Grafana Agent.
+        Thank you for opening a bug report for Grafana Alloy.
 
-        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/agent/discussions) or join the `#agent` channel on the [Grafana Slack](https://slack.grafana.com/).
+        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/alloy/discussions) or join the `#alloy` channel on the [Grafana Slack](https://slack.grafana.com/).
   - type: textarea
     attributes:
       label: What's wrong?
@@ -27,7 +27,7 @@ body:
     attributes:
       label: Software version
       description: Provide the version of the software you are using.
-      placeholder: e.g. Grafana Agent v0.33.0
+      placeholder: e.g. Grafana Alloy v1.0.0
   - type: textarea
     attributes:
       label: Configuration
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index bfe8f2ea0..161ec778e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,12 +2,12 @@
 # recognize it.
 blank_issues_enabled: true
 contact_links:
-  - name: Grafana Agent community support
-    url: https://github.com/grafana/agent/discussions
-    about: If you need help or support, ask questions in Github Discussions.
-  - name: Grafana Agent Slack
+  - name: Grafana Alloy community support
+    url: https://github.com/grafana/alloy/discussions
+    about: If you need help or support, ask questions in GitHub Discussions.
+  - name: Grafana Alloy Slack
     url: https://slack.grafana.com/
-    about: "Join the #agent slack channel to chat about Grafana Agent in real-time."
+    about: "Join the #alloy slack channel to chat about Grafana Alloy in real-time."
   - name: Grafana Cloud or Grafana Enterprise
     url: https://grafana.com/profile/org#support
     about: Open a support ticket for help with Grafana Cloud or Grafana Enterprise.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 8e08b0bd5..61c714505 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,13 +1,13 @@
 name: Feature request
-description: Suggest an idea to be added to Grafana Agent.
+description: Suggest an idea to be added to Grafana Alloy.
 labels: ["enhancement"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for opening a feature request for Grafana Agent.
+        Thank you for opening a feature request for Grafana Alloy.
 
-        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/agent/discussions) or join the `#agent` channel on the [Grafana Slack](https://slack.grafana.com/).
+        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/alloy/discussions) or join the `#alloy` channel on the [Grafana Slack](https://slack.grafana.com/).
   - type: textarea
     attributes:
       label: Request
diff --git a/.github/ISSUE_TEMPLATE/proposal.yaml b/.github/ISSUE_TEMPLATE/proposal.yaml
index 0d0f20288..834df9155 100644
--- a/.github/ISSUE_TEMPLATE/proposal.yaml
+++ b/.github/ISSUE_TEMPLATE/proposal.yaml
@@ -5,9 +5,9 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for opening a proposal for Grafana Agent.
+        Thank you for opening a proposal for Grafana Alloy.
 
-        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/agent/discussions) or join the `#agent` channel on the [Grafana Slack](https://slack.grafana.com/).
+        Please do not use GitHub issues for support questions. If you need help or support, ask a question in [GitHub Discussions](https://github.com/grafana/alloy/discussions) or join the `#alloy` channel on the [Grafana Slack](https://slack.grafana.com/).
   - type: textarea
     attributes:
       label: Background
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 812531ebb..a0349e2e4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 <!--
 
-CONTRIBUTORS GUIDE: https://github.com/grafana/agent/blob/main/docs/developer/contributing.md#updating-the-changelog
+CONTRIBUTORS GUIDE: https://github.com/grafana/alloy/blob/main/docs/developer/contributing.md#updating-the-changelog
 
 If this is your first PR or you have not contributed in a while, we recommend
 taking the time to review the guide. It gives helpful instructions for
@@ -24,4 +24,4 @@ contributors around things like how to update the changelog.
 - [ ] CHANGELOG.md updated
 - [ ] Documentation added
 - [ ] Tests updated
-- [ ] Config converters updated
\ No newline at end of file
+- [ ] Config converters updated
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04b16ea93..b5751aaea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,5 +30,4 @@ v1.0.0 (2024-04-09)
 
 - A built-in UI for visualizing and debugging pipelines.
 
-[upgrade guide]: https://grafana.com/docs/agent/latest/upgrade-guide/
 [contributors guide]: ./docs/developer/contributing.md#updating-the-changelog
diff --git a/docs/developer/release/1-create-release-branch.md b/docs/developer/release/1-create-release-branch.md
index b34e8806e..3e130fd9a 100644
--- a/docs/developer/release/1-create-release-branch.md
+++ b/docs/developer/release/1-create-release-branch.md
@@ -2,7 +2,7 @@
 
 A single release branch is created for every major or minor release. That release
 branch is then used for all Release Candidates, the Stable Release, and all
-Patch Releases for that major pr minor version of the agent.
+Patch Releases for that version of Alloy.
 
 ## Before you begin
 
diff --git a/docs/sources/concepts/configuration-syntax/expressions/operators.md b/docs/sources/concepts/configuration-syntax/expressions/operators.md
index a0938483f..ed6c86aed 100644
--- a/docs/sources/concepts/configuration-syntax/expressions/operators.md
+++ b/docs/sources/concepts/configuration-syntax/expressions/operators.md
@@ -83,7 +83,7 @@ Brackets | Description
 The following example uses curly braces and square brackets to define an object and an array.
 
 ```alloy
-obj = { app = "agent", namespace = "dev" }
+obj = { app = "alloy", namespace = "dev" }
 arr = [1, true, 7 * (1+1), 3]
 ```
 
diff --git a/docs/sources/concepts/configuration-syntax/expressions/referencing_exports.md b/docs/sources/concepts/configuration-syntax/expressions/referencing_exports.md
index d4f41389a..28b9cb4b1 100644
--- a/docs/sources/concepts/configuration-syntax/expressions/referencing_exports.md
+++ b/docs/sources/concepts/configuration-syntax/expressions/referencing_exports.md
@@ -24,7 +24,7 @@ The following example shows some references.
 
 ```alloy
 local.file "target" {
-  filename = "/etc/agent/target"
+  filename = "/etc/alloy/target"
 }
 
 prometheus.scrape "default" {
diff --git a/docs/sources/reference/components/discovery.gce.md b/docs/sources/reference/components/discovery.gce.md
index dc593d75d..5c8af2af5 100644
--- a/docs/sources/reference/components/discovery.gce.md
+++ b/docs/sources/reference/components/discovery.gce.md
@@ -88,7 +88,7 @@ In those cases, exported fields retain their last healthy values.
 
 ```alloy
 discovery.gce "gce" {
-  project = "agent"
+  project = "alloy"
   zone    = "us-east1-a"
 }
 
diff --git a/docs/sources/reference/components/loki.write.md b/docs/sources/reference/components/loki.write.md
index ece82eb65..cb864993e 100644
--- a/docs/sources/reference/components/loki.write.md
+++ b/docs/sources/reference/components/loki.write.md
@@ -154,7 +154,7 @@ following two mechanisms:
 
 The WAL is located inside a component-specific directory relative to the
 storage path {{< param "PRODUCT_NAME" >}} is configured to use. See the
-[`agent run` documentation][run] for how to change the storage path.
+[`alloy run` documentation][run] for how to change the storage path.
 
 The following arguments are supported:
 
diff --git a/docs/sources/reference/components/otelcol.processor.discovery.md b/docs/sources/reference/components/otelcol.processor.discovery.md
index 3e4e1fd59..93d1f58e4 100644
--- a/docs/sources/reference/components/otelcol.processor.discovery.md
+++ b/docs/sources/reference/components/otelcol.processor.discovery.md
@@ -35,7 +35,7 @@ consider using `otelcol.processor.k8sattributes` instead.
 
 ------
 The main use case for `otelcol.processor.discovery` is for users who migrate to {{< param "PRODUCT_NAME" >}}
-from Static mode's `prom_sd_operation_type`/`prom_sd_pod_associations` [configuration options][Traces].
+from Grafana Agent Static mode's `prom_sd_operation_type`/`prom_sd_pod_associations` [configuration options][Traces].
 
 [Prometheus data model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
 [OTEL sem conv]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/README.md
diff --git a/docs/sources/reference/components/prometheus.exporter.postgres.md b/docs/sources/reference/components/prometheus.exporter.postgres.md
index 3d5477422..335fd2bc8 100644
--- a/docs/sources/reference/components/prometheus.exporter.postgres.md
+++ b/docs/sources/reference/components/prometheus.exporter.postgres.md
@@ -141,7 +141,7 @@ Replace the following:
 ### Collect custom metrics from an allowlisted set of databases
 
 This example uses a `prometheus.exporter.postgres` component to collect custom metrics from a set of
-specific databases, replacing default metrics with custom metrics derived from queries in `/etc/agent/custom-postgres-metrics.yaml`:
+specific databases, replacing default metrics with custom metrics derived from queries in `/etc/alloy/custom-postgres-metrics.yaml`:
 
 ```alloy
 prometheus.exporter.postgres "example" {
@@ -156,7 +156,7 @@ prometheus.exporter.postgres "example" {
   }
 
   disable_default_metrics    = true
-  custom_queries_config_path = "/etc/agent/custom-postgres-metrics.yaml"
+  custom_queries_config_path = "/etc/alloy/custom-postgres-metrics.yaml"
 }
 
 prometheus.scrape "default" {
diff --git a/docs/sources/reference/components/prometheus.receive_http.md b/docs/sources/reference/components/prometheus.receive_http.md
index 63ca72cfc..a46c19fb0 100644
--- a/docs/sources/reference/components/prometheus.receive_http.md
+++ b/docs/sources/reference/components/prometheus.receive_http.md
@@ -105,9 +105,9 @@ In order to send metrics to the `prometheus.receive_http` component defined in t
 
 ```alloy
 // Collects metrics of localhost:12345
-prometheus.scrape "agent_self" {
+prometheus.scrape "self" {
   targets = [
-    {"__address__" = "localhost:12345", "job" = "agent"},
+    {"__address__" = "localhost:12345", "job" = "alloy"},
   ]
   forward_to = [prometheus.remote_write.local.receiver]
 }
diff --git a/docs/sources/reference/components/prometheus.remote_write.md b/docs/sources/reference/components/prometheus.remote_write.md
index 95122fd4b..c865d3147 100644
--- a/docs/sources/reference/components/prometheus.remote_write.md
+++ b/docs/sources/reference/components/prometheus.remote_write.md
@@ -239,8 +239,6 @@ of data in the WAL; samples aren't removed until they are at least as old as
 `min_keepalive_time`, and samples are forcibly removed if they are older than
 `max_keepalive_time`.
 
-[run]: {../../cli/run/
-
 ## Exported fields
 
 The following fields are exported and can be referenced by other components:
@@ -496,7 +494,7 @@ To delete the corrupted WAL:
 1. Find and delete the contents of the `wal` directory.
 
    By default the `wal` directory is a subdirectory
-   of the `data-agent` directory located in the {{< param "PRODUCT_NAME" >}} working directory. The WAL data directory
+   of the `data-alloy` directory located in the {{< param "PRODUCT_NAME" >}} working directory. The WAL data directory
    may be different than the default depending on the path specified by the [command line flag][run] `--storage-path`.
 
    {{< admonition type="note" >}}
@@ -522,5 +520,5 @@ Refer to the linked documentation for more details.
 
 [snappy]: https://en.wikipedia.org/wiki/Snappy_(compression)
 [WAL block]: #wal-block
-[Stop]: ../../../get-started/start-agent/
-[run]: ../../../reference/cli/run/
+[Stop]: ../../../get-started
+[run]: ../../cli/run/
diff --git a/docs/sources/reference/components/pyroscope.write.md b/docs/sources/reference/components/pyroscope.write.md
index 137b09580..adaab2d3d 100644
--- a/docs/sources/reference/components/pyroscope.write.md
+++ b/docs/sources/reference/components/pyroscope.write.md
@@ -146,7 +146,7 @@ pyroscope.write "staging" {
 pyroscope.scrape "default" {
   targets = [
     {"__address__" = "pyroscope:4100", "service_name"="pyroscope"},
-    {"__address__" = "agent:12345", "service_name"="agent"},
+    {"__address__" = "alloy:12345", "service_name"="alloy"},
   ]
   forward_to = [pyroscope.write.staging.receiver]
 }
@@ -164,4 +164,4 @@ Connecting some components may not be sensible or components may require further
 Refer to the linked documentation for more details.
 {{< /admonition >}}
 
-<!-- END GENERATED COMPATIBLE COMPONENTS -->
\ No newline at end of file
+<!-- END GENERATED COMPATIBLE COMPONENTS -->
diff --git a/docs/sources/shared/reference/components/otelcol-retry-block.md b/docs/sources/shared/reference/components/otelcol-retry-block.md
index 95900714c..78f12df10 100644
--- a/docs/sources/shared/reference/components/otelcol-retry-block.md
+++ b/docs/sources/shared/reference/components/otelcol-retry-block.md
@@ -20,7 +20,7 @@ The `initial_interval` argument specifies how long to wait before the first retr
 If requests continue to fail, the time to wait before retrying increases by the factor specified by the `multiplier` argument, which must be greater than `1.0`.
 The `max_interval` argument specifies the upper bound of how long to wait between retries.
 
-The `randomization_factor` argument is useful for adding jitter between retrying agents.
+The `randomization_factor` argument is useful for adding jitter between retrying Alloy instances.
 If `randomization_factor` is greater than `0`, the wait time before retries is multiplied by a random factor in the range `[ I - randomization_factor * I, I + randomization_factor * I]`, where `I` is the current interval.
 
 If a batch hasn't been sent successfully, it is discarded after the time specified by `max_elapsed_time` elapses.
diff --git a/docs/sources/tasks/configure/configure-kubernetes.md b/docs/sources/tasks/configure/configure-kubernetes.md
index 36935ef22..32535c0b5 100644
--- a/docs/sources/tasks/configure/configure-kubernetes.md
+++ b/docs/sources/tasks/configure/configure-kubernetes.md
@@ -121,10 +121,10 @@ Use this method if you prefer to write your {{< param "PRODUCT_NAME" >}} configu
    }
    ```
 
-1. Create a ConfigMap called `agent-config` from the above file:
+1. Create a ConfigMap called `alloy-config` from the above file:
 
    ```shell
-   kubectl create configmap --namespace <NAMESPACE> agent-config "--from-file=config.alloy=./config.alloy"
+   kubectl create configmap --namespace <NAMESPACE> alloy-config "--from-file=config.alloy=./config.alloy"
    ```
 
    Replace the following:
@@ -134,10 +134,10 @@ Use this method if you prefer to write your {{< param "PRODUCT_NAME" >}} configu
 1. Modify Helm Chart's configuration in your `values.yaml` to use the existing ConfigMap:
 
    ```yaml
-     agent:
+     alloy:
      configMap:
        create: false
-       name: agent-config
+       name: alloy-config
        key: config.alloy
    ```