Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: update link to Grafana Agent Operator CRDs #7084

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ The Grafana Mimir Helm chart can collect metrics, logs, or both, about Grafana M
In the example that follows, metamonitoring scrapes metrics about Grafana Mimir itself, and then writes those metrics to the same Grafana Mimir instance.

1. Download the Grafana Agent Operator Custom Resource Definitions (CRDs) from
https://github.com/grafana/agent/tree/main/production/operator/crds.
https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds.

Helm only installs Custom Resource Definitions on an initial chart installation, and not on a chart upgrade.
For details, see [Some caveats and explanations](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/#some-caveats-and-explanations).
Expand All @@ -152,7 +152,7 @@ In the example that follows, metamonitoring scrapes metrics about Grafana Mimir
2. Install the CRDs on your cluster:

```bash
kubectl create -f production/operator/crds/
kubectl create -f operations/agent-static-operator/crds/
```

3. Create a YAML file called `custom.yaml` for your Helm values overrides.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,11 @@ a Prometheus-compatible server and logs to a Loki or GEL (Grafana Enterprise
Metrics) server.

1. Download the Grafana Agent Operator Custom Resource Definitions (CRDs) from
https://github.com/grafana/agent/tree/main/production/operator/crds
https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds
2. Install the CRDs on your cluster:

```bash
kubectl apply -f production/operator/crds/
kubectl apply -f operations/agent-static-operator/crds/
```

3. Add the following YAML snippet to your
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ by using the [Grafana Agent operator](/docs/agent/latest/operator/).
The Helm chart can install and use the Grafana Agent operator.

> **Note:** Before the Helm chart can use the operator,
> you need to manually install all of the Kubernetes [Custom Resource Definitions (CRDs)](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the [Grafana Agent operator YAML files](https://github.com/grafana/agent/tree/main/production/operator/crds).
> you need to manually install all of the Kubernetes [Custom Resource Definitions (CRDs)](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the [Grafana Agent operator YAML files](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds).

It’s best to use the Grafana Agent operator for metrics and logs collection.
However, if you prefer not to use it or you already have an existing Grafana Agent that you want to use, see _Collect metrics and logs via Grafana Agent_ documentation in Grafana Mimir version 2.5.0.
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2974,7 +2974,7 @@ metaMonitoring:

# -- Controls whether to install the Grafana Agent Operator and its CRDs.
# Note that helm will not install CRDs if this flag is enabled during an upgrade.
# In that case install the CRDs manually from https://github.com/grafana/agent/tree/main/production/operator/crds
# In that case install the CRDs manually from https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds
installOperator: false

logs:
Expand Down
Loading