From 4ef2f17012728fbc168c1b95e2c84f2be6fa76ff Mon Sep 17 00:00:00 2001 From: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:00:04 -0800 Subject: [PATCH] Update CRD link URLs (#6273) * Update CRD link URL * Remove reference to Tanka --- cmd/grafana-agent-operator/DEVELOPERS.md | 2 +- docs/sources/operator/deploy-agent-operator-resources.md | 4 ++-- docs/sources/operator/helm-getting-started.md | 2 +- docs/sources/static/set-up/install/_index.md | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/grafana-agent-operator/DEVELOPERS.md b/cmd/grafana-agent-operator/DEVELOPERS.md index 9c2453e1f9f9..58f7be9ae8d5 100644 --- a/cmd/grafana-agent-operator/DEVELOPERS.md +++ b/cmd/grafana-agent-operator/DEVELOPERS.md @@ -74,7 +74,7 @@ running. ### Apply the CRDs Generated CRDs used by the operator can be found in [the Production -folder](../../production/operator/crds). Deploy them from the root of the +folder](../../operations/agent-static-operator/crds). Deploy them from the root of the repository with: ``` diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index 2823f58cb996..47ea7baac373 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -145,7 +145,7 @@ To deploy the `GrafanaAgent` resource: - Specifies an Agent image version. - Specifies `MetricsInstance` and `LogsInstance` selectors. These search for `MetricsInstances` and `LogsInstances` in the same namespace with labels matching `agent: grafana-agent-metrics` and `agent: grafana-agent-logs`, respectively. - - Sets a `cluster: cloud` label for all metrics shipped to your Prometheus-compatible endpoint. Change this label to your cluster name. To search for `MetricsInstances` or `LogsInstances` in a *different* namespace, use the `instanceNamespaceSelector` field. To learn more about this field, see the `GrafanaAgent` [CRD specification](https://github.com/grafana/agent/blob/main/production/operator/crds/monitoring.grafana.com_grafanaagents.yaml). + - Sets a `cluster: cloud` label for all metrics shipped to your Prometheus-compatible endpoint. Change this label to your cluster name. To search for `MetricsInstances` or `LogsInstances` in a *different* namespace, use the `instanceNamespaceSelector` field. To learn more about this field, see the `GrafanaAgent` [CRD specification](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds/monitoring.grafana.com_grafanaagents.yaml). 1. Customize the manifests as needed and roll them out to your cluster using `kubectl apply -f` followed by the filename. @@ -403,7 +403,7 @@ To deploy the `LogsInstance` resource into your cluster: matchLabels: {} ``` - This example tails container logs for all Pods in the `default` namespace. You can restrict the set of matched Pods by using the `matchLabels` selector. You can also set additional `pipelineStages` and create `relabelings` to add or modify log line labels. To learn more about the `PodLogs` specification and available resource fields, see the [PodLogs CRD](https://github.com/grafana/agent/blob/main/production/operator/crds/monitoring.grafana.com_podlogs.yaml). + This example tails container logs for all Pods in the `default` namespace. You can restrict the set of matched Pods by using the `matchLabels` selector. You can also set additional `pipelineStages` and create `relabelings` to add or modify log line labels. To learn more about the `PodLogs` specification and available resource fields, see the [PodLogs CRD](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds/monitoring.grafana.com_podlogs.yaml). The above `PodLogs` resource adds the following labels to log lines: diff --git a/docs/sources/operator/helm-getting-started.md b/docs/sources/operator/helm-getting-started.md index 78245505d859..bb63f01190ce 100644 --- a/docs/sources/operator/helm-getting-started.md +++ b/docs/sources/operator/helm-getting-started.md @@ -27,7 +27,7 @@ To deploy Agent Operator with Helm, make sure that you have the following: ## Install the Agent Operator Helm Chart -In this section, you'll install the [grafana-agent-operator Helm chart](https://github.com/grafana/helm-charts/tree/main/charts/agent-operator) into your Kubernetes cluster. This will install the latest version of Agent Operator and its [Custom Resource Definitions](https://github.com/grafana/agent/tree/main/production/operator/crds) (CRDs). The chart configures Operator to maintain a Service that lets you scrape kubelets using a `ServiceMonitor`. +In this section, you'll install the [grafana-agent-operator Helm chart](https://github.com/grafana/helm-charts/tree/main/charts/agent-operator) into your Kubernetes cluster. This will install the latest version of Agent Operator and its [Custom Resource Definitions](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds) (CRDs). The chart configures Operator to maintain a Service that lets you scrape kubelets using a `ServiceMonitor`. To install the Agent Operator Helm chart: diff --git a/docs/sources/static/set-up/install/_index.md b/docs/sources/static/set-up/install/_index.md index 24663d2bdade..bafe6e563041 100644 --- a/docs/sources/static/set-up/install/_index.md +++ b/docs/sources/static/set-up/install/_index.md @@ -36,10 +36,6 @@ Installing Grafana Agent on other operating systems is possible, but is not reco Use the Grafana Agent [Kubernetes configuration](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/) or follow instructions for installing the Grafana Agent in the [Walkthrough](/docs/grafana-cloud/monitor-infrastructure/integrations/get-started/). -## Tanka - -For more information, refer to the [Tanka](https://tanka.dev) configurations in the Grafana Agent [production](https://github.com/grafana/agent/tree/main/production/tanka/grafana-agent) directory on GitHub. - ## Data collection By default, Grafana Agent sends anonymous usage information to Grafana Labs. Refer to [data collection][] for more information