Merge remote-tracking branch 'origin/feat/usage-tracker' into ingest-…

…limiter-service
grafana · Jan 9, 2025 · 6ca29f9 · 6ca29f9
2 parents 303a01c + 70d8206
commit 6ca29f9
Show file tree

Hide file tree

Showing 18 changed files with 2,123 additions and 26 deletions.
diff --git a/docs/sources/setup/install/helm/_index.md b/docs/sources/setup/install/helm/_index.md
@@ -22,12 +22,22 @@ This guide references the Loki Helm chart version 3.0 or greater and contains th
 
 If you are installing Grafana Enterprise Logs, follow the [GEL Helm installation](https://grafana.com/docs/enterprise-logs/<ENTERPRISE_LOGS_VERSION>/setup/helm/).
 
+## Deployment Recommendations
+
+Loki is designed to be run in two states:
+* [Monolithic](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/deployment-modes/#monolithic-mode): Recommended when you are running Loki as part of a small meta monitoring stack.
+* [Microservices](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/deployment-modes/#microservices-mode): For workloads that require high availability and scalability. Loki is deployed in this mode internally at Grafana Labs.
+
+{{< admonition type="tip" >}}
+Loki can also be deployed in [Simple Scalable mode](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/deployment-modes/#simple-scalable). For the best possible experience in production, we recommend deploying Loki in *microservices* mode.
+{{< /admonition >}}
 
 ## Cloud Deployment Guides
 
 The following guides provide step-by-step instructions for deploying Loki on cloud providers:
 
 - [Amazon EKS](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/deployment-guides/aws/)
+- [Azure AKS](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/deployment-guides/azure/)
 
 ## Reference
 

diff --git a/docs/sources/setup/install/helm/deployment-guides/_index.md b/docs/sources/setup/install/helm/deployment-guides/_index.md
@@ -10,4 +10,5 @@ keywords:
 
 The following guides provide step-by-step instructions for deploying Loki on cloud providers:
 
-- [Deploy Loki on AWS](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/deployment-guides/aws/)
+- [Deploy Loki on AWS](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/deployment-guides/aws/)
+- [Deploy Loki on Azure](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/deployment-guides/azure/)
diff --git a/docs/sources/setup/install/helm/deployment-guides/aws.md b/docs/sources/setup/install/helm/deployment-guides/aws.md
@@ -531,9 +531,6 @@ k6 is one of the fastest ways to test your Loki deployment. This will allow you
       iterations: 10,
     };
 
-    **It is important to create a namespace called `loki` as our trust policy is set to allow the IAM role to be used by the `loki` service account in the `loki` namespace. This is configurable but make sure to update your service account.**
-    * "main" function for each VU iteration
-    */
     export default () => {
       // Push request with 10 streams and uncompressed logs between 800KB and 2MB
       var res = client.pushParameterized(10, 800 * KB, 2 * MB);