Merge pull request #7347 from nmelehan-akamai/rc-v1.389.0

[Release] v1.389.0

Author: nmelehan-akamai

docs/marketplace-docs/guides/cribl/index.md

@@ -8,7 +8,7 @@ external_resources:
 - '[Cribl](https://cribl.io/)'
 - '[Cribl Stream official documentation](https://docs.cribl.io/stream/)'
 - '[Getting Started with Cribl Stream](https://docs.cribl.io/stream/getting-started/)'
-aliases: ['/products/tools/marketplace/guides/cribl-stream/']
+aliases: ['/products/tools/marketplace/guides/cribl/']
 authors: ["Akamai"]
 contributors: ["Akamai"]
 license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'

docs/marketplace-docs/guides/django/django-test-page.png

@@ -1,8 +1,8 @@
 ---
 title: "Deploy Django through the Linode Marketplace"
-description: "Learn how to deploy Django, a web framework that provides much of the core functionality required in modern web development, through the Linode Marketpplace"
+description: "Learn how to deploy Django, a web framework that provides much of the core functionality required in modern web development, through the Linode Marketplace"
 published: 2020-03-11
-modified: 2024-04-16
+modified: 2025-10-13
 keywords: ['django','marketplace', 'cms']
 tags: ["cloud-manager","linode platform","cms","django","marketplace","digital agencies"]
 image: Django_oneclickapps.png
@@ -31,7 +31,7 @@ marketplace_app_name: "Django"
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 22.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Recommended minimum plan:** All plan types and sizes can be used.
 
 ### Django Options
@@ -50,11 +50,13 @@ marketplace_app_name: "Django"
 ### Access Django
 
 {{< note >}}
-The Django Marketplace App will assign `DjangoApp` as the [Django project name](https://docs.djangoproject.com/en/5.0/intro/tutorial01/#creating-a-project).
+The Django Marketplace App will assign `django_sample` as the [Django project name](https://docs.djangoproject.com/en/5.0/intro/tutorial01/#creating-a-project) at `/var/www/django_app/django_sample/`.
 {{< /note >}}
 
 1. Open your web browser and navigate to `https://[domain]`, where *[domain]* can be replaced with the custom domain you entered during deployment or your Compute Instance's rDNS domain (such as `192-0-2-1.ip.linodeusercontent.com`). You can also use your IPv4 address. See the [Managing IP Addresses](/docs/products/compute/compute-instances/guides/manage-ip-addresses/) guide for information on viewing IP addresses and rDNS.
 
+    ![View your Django site's test page.](django-test-page.png "View your Django site's test page")
+
 1.  Once you have verified that you can access your Django site via the browser, you can log in using the admin credentials generated during the deployment. The credentials can be found in `/home/$USERNAME/.credentials`. Update the address in the browser to: `https://[domain]/admin`.
 
     ![Login to your Django site.](django-admin-login.png "Login to your Django site")

docs/marketplace-docs/guides/django/index.md

@@ -2,7 +2,7 @@
 title: "Deploy Prometheus and Grafana through the Linode Marketplace"
 description: "Deploy Prometheus & Grafana on a Linode Compute Instance. This application provides you with a reliable monitoring solution for all of your infrastructure. "
 published: 2022-03-29
-modified: 2024-10-15
+modified: 2025-09-30
 keywords: ['monitoring','observability']
 tags: ["marketplace", "linode platform", "cloud manager"]
 external_resources:
@@ -16,11 +16,13 @@ marketplace_app_id: 985364
 marketplace_app_name: "Prometheus & Grafana"
 ---
 
-This Marketplace App installs both [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/oss/grafana/), two open source tools that are commonly used together to collect and view data.
+This Marketplace App installs both [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/oss/grafana/), two open source tools that are commonly used together to collect and view data. Optionally, you can also install [Loki](https://grafana.com/oss/loki/), a log aggregation system designed to work seamlessly with Grafana.
 
-Use Prometheus to collect metrics and receive alerts. Prometheus monitors targets that you define at given intervals by scraping their metrics HTTP endpoints. This tool is particularly well-suited for numeric time series data, which makes it ideal for machine-centric monitoring as well as monitoring of highly dynamic service-oriented architectures.
+**Prometheus** is used to collect metrics and receive alerts. Prometheus monitors targets that you define at given intervals by scraping their metrics HTTP endpoints. This tool is particularly well-suited for numeric time series data, which makes it ideal for machine-centric monitoring as well as monitoring of highly dynamic service-oriented architectures.
 
-Grafana is an analytics and monitoring solution with a focus on accessibility for metric visualization. You can use Grafana to create, monitor, store, and share metrics with your team to keep tabs on your infrastructure. Grafana is very lightweight and does not use a lot of memory and CPU resources.
+**Grafana** is an analytics and monitoring solution with a focus on accessibility for metric visualization. You can use Grafana to create, monitor, store, and share metrics with your team to keep tabs on your infrastructure. Grafana is very lightweight and does not use a lot of memory and CPU resources.
+
+**Loki** (optional) is a log aggregation and storage system inspired by Prometheus. It is designed to be cost-effective and easy to operate, as it does not index the contents of the logs, but rather a set of labels for each log stream. When installed, Loki is automatically configured as a data source in Grafana.
 
 ## Deploying a Marketplace App
 
@@ -34,7 +36,7 @@ Grafana is an analytics and monitoring solution with a focus on accessibility fo
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 22.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Suggested plan:** All plan types and sizes can be used.
 
 ### Prometheus and Grafana Options
@@ -47,6 +49,10 @@ Grafana is an analytics and monitoring solution with a focus on accessibility fo
 
 {{% content "marketplace-special-character-limitations-shortguide" %}}
 
+#### Loki Log Aggregation (Optional)
+
+- **Install Loki?**: Select **Yes** to install Loki, a log aggregation system that integrates with Grafana. Select **No** to skip Loki installation.
+
 #### Akamai Insights Datasource Plugin (Optional)
 
 If your Akamai account contract has **Reporting** enabled, you can take advantage of the **[Akamai Reporting API V2](https://techdocs.akamai.com/reporting/v2/reference/api)**. This allows you to expose data to monitor traffic and analyze patterns and long-term trends directly in Grafana.
@@ -72,7 +78,7 @@ Akamai's Grafana Datasource plugin uses [Grafana's Plugin tools](https://github.
 
 ### Access Grafana and Prometheus
 
-To access the front end interfaces for either Grafana or Prometheus, first [obtain the credentials](#obtain-the-credentials). Then, open your web browser and navigate to the *Location* URL of the app you wish to access. In the login prompt that appears, enter the username and password as shown in the *credentials.txt* file.
+To access the front end interfaces for Grafana and Prometheus, first [obtain the credentials](#obtain-the-credentials). Then, open your web browser and navigate to the *Location* URL of the app you wish to access. In the login prompt that appears, enter the username and password as shown in the credentials file.
 
 ### Obtain the Credentials
 
@@ -101,7 +107,7 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
 
     To delete this message of the day, use `rm /etc/motd`.
 
-1.  The `/home/$SUDO_USER/.credentials` file contains the credentials for the created sudo user, Prometheus, and Grafana, as shown in the example output below:
+1.  The `/home/$SUDO_USER/.credentials` file contains the credentials for the created sudo user, Prometheus, Grafana, and Loki (if installed), as shown in the example output below:
 
     ```command
     cat /home/$SUDO_USER/.credentials
@@ -114,8 +120,14 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
     Prometheus Password: XnYGi8CTPNKugQhaC9@2nze6
     Grafana Username: admin
     Grafana Password: *qs6.rbpWyb_rwKm3ciFYW82
+    Loki Username: loki
+    Loki Password: 8Vx!mKp2Yn-HdJ7QzR4s
     ```
 
+    {{< note >}}
+    If you did not install Loki, the Loki username and password will not appear in the credentials file.
+    {{< /note >}}
+
 ### Add Prometheus as a Data Source to Grafana
 
 1.  Log in to the Grafana front end. See [Access Grafana and Prometheus](#access-grafana-and-prometheus).
@@ -136,6 +148,10 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
 
 Now that the Prometheus Data Source is set, you can browse the [available Grafana dashboards](https://grafana.com/grafana/dashboards/) to see which dashboard fits your needs. Review the official [Prometheus](https://prometheus.io/docs/introduction/overview/) and [Grafana](https://grafana.com/docs/grafana/latest/) documentation to learn how to further use your instance.
 
+### Configure Loki for Log Collection (If Installed)
+
+If you installed Loki during deployment, it is automatically configured as a data source in Grafana. To send logs from your applications and systems to Loki, you need to install and configure a log collection agent, such as [Grafana Alloy](https://grafana.com/docs/alloy/latest/), on the client systems.
+
 ### Akamai Insights Datasource
 
 If you added the Akamai Insights Datasource plugin, the data source can be found in the **Data sources** tab.