Skip to content

Commit

Permalink
Move files around, rename, and edit contents (#101)
Browse files Browse the repository at this point in the history
* Move files around, rename, and edit contents

* Regenerate versioned files
  • Loading branch information
clayton-cornell authored Mar 28, 2024
1 parent a107c40 commit 55184f1
Show file tree
Hide file tree
Showing 14 changed files with 129 additions and 184 deletions.
36 changes: 1 addition & 35 deletions docs/sources/_index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
canonical: https://grafana.com/docs/alloy/latest/
title: Grafana Alloy
description: Grafana Alloy is a a vendor-agnostic distribution of the OTel Collector
description: Grafana Alloy is a a vendor-neutral distribution of the OTel Collector
weight: 350
cascade:
ALLOY_RELEASE: v1.0.0
Expand Down Expand Up @@ -36,40 +36,6 @@ Some of these features include:
* **Security:** {{< param "PRODUCT_NAME" >}} helps you manage authentication credentials and connect to HashiCorp Vaults or Kubernetes clusters to retrieve secrets.
* **Debugging utilities:** {{< param "PRODUCT_NAME" >}} provides troubleshooting support and an embedded [user interface][UI] to help you identify and resolve configuration problems.

## Supported platforms

* Linux

* Minimum version: kernel 2.6.32 or later
* Architectures: AMD64, ARM64

* Windows

* Minimum version: Windows Server 2016 or later, or Windows 10 or later.
* Architectures: AMD64

* macOS

* Minimum version: macOS 10.13 or later
* Architectures: AMD64 (Intel), ARM64 (Apple Silicon)

* FreeBSD

* Minimum version: FreeBSD 10 or later
* Architectures: AMD64

## Release cadence

A new minor release is planned every six weeks for {{< param "PRODUCT_NAME" >}}.

The release cadence is best-effort.
If necessary, releases may be performed outside of this cadence, or a scheduled release date can be moved forwards or backwards.

Minor releases published on cadence include updating dependencies for upstream OpenTelemetry Collector code if new versions are available.
Minor releases published outside of the release cadence may not include these dependency updates.

Patch and security releases may be created at any time.

[OpenTelemetry]: https://opentelemetry.io/ecosystem/distributions/
[Prometheus]: https://prometheus.io
[Loki]: https://github.com/grafana/loki
Expand Down
36 changes: 1 addition & 35 deletions docs/sources/_index.md.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
canonical: https://grafana.com/docs/alloy/latest/
title: Grafana Alloy
description: Grafana Alloy is a a vendor-agnostic distribution of the OTel Collector
description: Grafana Alloy is a a vendor-neutral distribution of the OTel Collector
weight: 350
cascade:
ALLOY_RELEASE: $ALLOY_VERSION
Expand Down Expand Up @@ -36,40 +36,6 @@ Some of these features include:
* **Security:** {{< param "PRODUCT_NAME" >}} helps you manage authentication credentials and connect to HashiCorp Vaults or Kubernetes clusters to retrieve secrets.
* **Debugging utilities:** {{< param "PRODUCT_NAME" >}} provides troubleshooting support and an embedded [user interface][UI] to help you identify and resolve configuration problems.

## Supported platforms

* Linux

* Minimum version: kernel 2.6.32 or later
* Architectures: AMD64, ARM64

* Windows

* Minimum version: Windows Server 2016 or later, or Windows 10 or later.
* Architectures: AMD64

* macOS

* Minimum version: macOS 10.13 or later
* Architectures: AMD64 (Intel), ARM64 (Apple Silicon)

* FreeBSD

* Minimum version: FreeBSD 10 or later
* Architectures: AMD64

## Release cadence

A new minor release is planned every six weeks for {{< param "PRODUCT_NAME" >}}.

The release cadence is best-effort.
If necessary, releases may be performed outside of this cadence, or a scheduled release date can be moved forwards or backwards.

Minor releases published on cadence include updating dependencies for upstream OpenTelemetry Collector code if new versions are available.
Minor releases published outside of the release cadence may not include these dependency updates.

Patch and security releases may be created at any time.

[OpenTelemetry]: https://opentelemetry.io/ecosystem/distributions/
[Prometheus]: https://prometheus.io
[Loki]: https://github.com/grafana/loki
Expand Down
21 changes: 11 additions & 10 deletions docs/sources/data-collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@ title: Grafana Alloy data collection
weight: 900
---

# {{% param "FULL_PRODUCT_NAME" %}} Data collection
# {{% param "FULL_PRODUCT_NAME" %}} data collection

By default, {{< param "FULL_PRODUCT_NAME" >}} sends anonymous but uniquely identifiable usage information from your {{< param "PRODUCT_NAME" >}} instance to Grafana Labs.
These statistics are sent to `stats.grafana.org`.

Statistics help us better understand how {{< param "PRODUCT_NAME" >}} is used. This helps us prioritize features and documentation.
Statistics help Grafana better understand how {{< param "PRODUCT_NAME" >}} is used. This helps us prioritize features and documentation.

The usage information includes the following details:

* A randomly generated, anonymous unique ID (UUID).
* A randomly generated, anonymous, unique ID (UUID).
* Timestamp of when the UID was first generated.
* Timestamp of when the report was created (by default, every four hours).
* Version of running {{< param "PRODUCT_NAME" >}}.
* Operating system {{< param "PRODUCT_NAME" >}} is running on.
* System architecture {{< param "PRODUCT_NAME" >}} is running on.
* List of enabled [components][]
* Method used to deploy {{< param "PRODUCT_NAME" >}}, for example Docker, Helm, RPM, or Operator.

This list may change over time. All newly reported data is documented in the CHANGELOG.
* The version of {{< param "PRODUCT_NAME" >}}.
* The operating system {{< param "PRODUCT_NAME" >}} is running on.
* The system architecture {{< param "PRODUCT_NAME" >}} is running on.
* A list of enabled [components][]
* The method used to deploy {{< param "PRODUCT_NAME" >}}, for example Docker, Helm, or a Linux package.

This list may change over time.
All newly reported data is documented in the CHANGELOG.

## Opt-out of data collection

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/get-started/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ weight: 50

# Get started with {{% param "FULL_PRODUCT_NAME" %}}

This section covers topics that help you get started with {{< param "PRODUCT_NAME" >}}, including installation, running {{< param "PRODUCT_NAME" >}}, overview of deployment topologies, and more.
This section helps you install, deploy, and run {{< param "PRODUCT_NAME" >}}.

{{< section >}}
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
---
canonical: https://grafana.com/docs/alloy/latest/get-started/deploy-alloy/
canonical: https://grafana.com/docs/alloy/latest/get-started/deploy/
description: Learn about possible deployment topologies for Grafana Alloy
menuTitle: Deploy
title: Grafana Alloy deployment topologies
title: Deploy Grafana Alloy
weight: 900
---

{{< docs/shared source="alloy" lookup="/deploy-alloy.md" version="<ALLOY_VERSION>" >}}

## Processing different types of telemetry in different {{< param "PRODUCT_NAME" >}} instances

If the load on {{< param "PRODUCT_NAME" >}} is small, it is recommended to process all necessary telemetry signals in the same {{< param "PRODUCT_NAME" >}} process.
For example, a single {{< param "PRODUCT_NAME" >}} can process all of the incoming metrics, logs, traces, and profiles.
If the load on {{< param "PRODUCT_NAME" >}} is small, you can process all necessary telemetry signals in the same {{< param "PRODUCT_NAME" >}} process.
For example, a single {{< param "PRODUCT_NAME" >}} deployment can process all of the incoming metrics, logs, traces, and profiles.

However, if the load on the {{< param "PRODUCT_NAME" >}}s is big, it may be beneficial to process different telemetry signals in different deployments of {{< param "PRODUCT_NAME" >}}s.
However, if the load on {{< param "PRODUCT_NAME" >}} is big, it may be beneficial to process different telemetry signals in different deployments of {{< param "PRODUCT_NAME" >}}.

This provides better stability due to the isolation between processes.
For example, an overloaded {{< param "PRODUCT_NAME" >}} processing traces won't impact an {{< param "PRODUCT_NAME" >}} processing metrics.
For example, an overloaded {{< param "PRODUCT_NAME" >}} instance processing traces won't impact an {{< param "PRODUCT_NAME" >}} instance processing metrics.
Different types of signal collection require different methods for scaling:

* "Pull" components such as `prometheus.scrape` and `pyroscope.scrape` are scaled using hashmod sharing or clustering.
* "Push" components such as `otelcol.receiver.otlp` are scaled by placing a load balancer in front of them.
* "Push" components such as `otelcol.receiver.otlp` are scaled by placing a load balancer in front of the components.

### Traces

Expand All @@ -39,9 +39,9 @@ To decide whether scaling is necessary, check metrics such as:
#### Stateful and stateless components

In the context of tracing, a "stateful component" is a component that needs to aggregate certain spans to work correctly.
A "stateless {{< param "PRODUCT_NAME" >}}" is an {{< param "PRODUCT_NAME" >}} which does not contain stateful components.
A "stateless {{< param "PRODUCT_NAME" >}}" is an {{< param "PRODUCT_NAME" >}} which doesn't contain stateful components.

Scaling stateful {{< param "PRODUCT_NAME" >}}s is more difficult, because spans must be forwarded to a specific {{< param "PRODUCT_NAME" >}} according to a span property such as trace ID or a `service.name` attribute.
Scaling stateful {{< param "PRODUCT_NAME" >}} instances is more difficult, because spans must be forwarded to a specific {{< param "PRODUCT_NAME" >}} instance according to a span property such as trace ID or a `service.name` attribute.
You can forward spans with `otelcol.exporter.loadbalancing`.

Examples of stateful components:
Expand All @@ -55,7 +55,7 @@ Examples of stateful components:
A "stateless component" doesn't need to aggregate specific spans to work correctly.
It can work correctly even if it only has some of the spans of a trace.

A stateless {{< param "PRODUCT_NAME" >}} can be scaled without using `otelcol.exporter.loadbalancing`.
A stateless {{< param "PRODUCT_NAME" >}} instance can be scaled without using `otelcol.exporter.loadbalancing`.
For example, you could use an off-the-shelf load balancer to do a round-robin load balancing.

Examples of stateless components:
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/get-started/install/binary.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
canonical: https://grafana.com/docs/alloy/latest/get-started/install/binary/
description: Learn how to install Alloy as a standalone binary
description: Learn how to install Grafana Alloy as a standalone binary
menuTitle: Standalone
title: Install Alloy as a standalone binary
title: Install Grafana Alloy as a standalone binary
weight: 600
---

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/get-started/install/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ You can modify the last line to change the arguments passed to the {{< param "PR
Refer to the documentation for [run][] for more information about the options available to the `run` command.

{{< admonition type="note" >}}
Make sure you pass `--server.http.listen-addr=0.0.0.0:12345` as an argument as shown in the example above.
Make sure you pass `--server.http.listen-addr=0.0.0.0:12345` as an argument as shown in the example.
If you don't pass this argument, the [debugging UI][UI] won't be available outside of the Docker container.
{{< /admonition >}}

Expand Down
1 change: 0 additions & 1 deletion docs/sources/get-started/install/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ To deploy {{< param "PRODUCT_NAME" >}} on Kubernetes using Helm, run the followi
- _`<NAMESPACE>`_: The namespace used in the previous step.

You have successfully deployed {{< param "PRODUCT_NAME" >}} on Kubernetes, using default Helm settings.
To configure {{< param "PRODUCT_NAME" >}}, see the [Configure {{< param "PRODUCT_NAME" >}} on Kubernetes][Configure] guide.

## Next steps

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/get-started/install/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: Install Grafana Alloy on Linux
weight: 300
---

# Install or uninstall {{% param "FULL_PRODUCT_NAME" %}} on Linux
# Install {{% param "FULL_PRODUCT_NAME" %}} on Linux

You can install {{< param "PRODUCT_NAME" >}} as a systemd service on Linux.

Expand Down
1 change: 1 addition & 0 deletions docs/sources/get-started/install/macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ You can install {{< param "PRODUCT_NAME" >}} on macOS with Homebrew .
{{< admonition type="note" >}}
The default prefix for Homebrew on Intel is `/usr/local`.
The default prefix for Homebrew on Apple Silicon is `/opt/Homebrew`.

To verify the default prefix for Homebrew on your computer, open a terminal window and type `brew --prefix`.
{{< /admonition >}}

Expand Down
12 changes: 6 additions & 6 deletions docs/sources/get-started/install/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ To do a standard graphical install of {{< param "PRODUCT_NAME" >}} on Windows, p

1. Scroll down to the **Assets** section.

1. Download the file called `alloy-installer.exe.zip`.
1. Download the file called `alloy-installer-windows-amd64.exe.zip`.

1. Unzip the downloaded file.

1. Double-click on `alloy-installer.exe` to install {{< param "PRODUCT_NAME" >}}.
1. Double-click on `alloy-installer-windows-amd64.exe` to install {{< param "PRODUCT_NAME" >}}.

{{< param "PRODUCT_NAME" >}} is installed into the default directory `C:\Program Files\Grafana\Alloy`.
{{< param "PRODUCT_NAME" >}} is installed into the default directory `%PROGRAMFILES64%\GrafanaLabs\Alloy`.

## Silent install

Expand All @@ -34,7 +34,7 @@ To do a silent install of {{< param "PRODUCT_NAME" >}} on Windows, perform the f

1. Scroll down to the **Assets** section.

1. Download the file called `alloy-installer.exe.zip`.
1. Download the file called `alloy-installer-windows-amd64.exe.zip`.

1. Unzip the downloaded file.

Expand All @@ -57,14 +57,14 @@ To do a silent install of {{< param "PRODUCT_NAME" >}} on Windows, perform the f

## Service Configuration

{{< param "PRODUCT_NAME" >}} uses the Windows Registry `HKLM\Software\Grafana\Grafana Alloy` for service configuration.
{{< param "PRODUCT_NAME" >}} uses the Windows Registry `HKLM\Software\GrafanaLabs\Alloy` for service configuration.

* `Arguments` (Type `REG_MULTI_SZ`) Each value represents a binary argument for alloy binary.
* `Environment` (Type `REG_MULTI_SZ`) Each value represents a environment value `KEY=VALUE` for alloy binary.

## Uninstall

You can uninstall {{< param "PRODUCT_NAME" >}} with Windows Remove Programs or `C:\Program Files\Grafana\Alloy\uninstaller.exe`.
You can uninstall {{< param "PRODUCT_NAME" >}} with Windows Remove Programs or `%PROGRAMFILES64%\GrafanaLabs\Alloy\uninstaller.exe`.
Uninstalling {{< param "PRODUCT_NAME" >}} stops the service and removes it from disk.
This includes any configuration files in the installation directory.

Expand Down
Loading

0 comments on commit 55184f1

Please sign in to comment.