Merge branch 'main' into feature/gh10767-chunks-inspect

.github/jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "124c4d996f9625478a79f1884465e29ea082d224"
+      "version": "adca1c07a2199374e1646e62331926509699368b"
     }
   ],
   "legacyImports": true

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "124c4d996f9625478a79f1884465e29ea082d224",
-      "sum": "8wrJURq48ZBAtZcReO1W7AiXmvUyLqb932Q9sXyfFVo="
+      "version": "adca1c07a2199374e1646e62331926509699368b",
+      "sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
     }
   ],
   "legacyImports": false

.github/workflows/release.yml

@@ -138,7 +138,7 @@ jobs:
     - name: "download images"
       run: |
         echo "downloading images to $(pwd)/images"
-        gsutil cp -r gs://loki-build-artifacts/${{ needs.createRelease.outputs.sha }}/images .
+        gsutil cp -r gs://${BUILD_ARTIFACTS_BUCKET}/${{ needs.createRelease.outputs.sha }}/images .
     - name: "publish docker images"
       uses: "./lib/actions/push-images"
       with:

Makefile

@@ -906,6 +906,13 @@ release-workflows:
 
 .PHONY: release-workflows-check
 release-workflows-check:
+ifeq ($(BUILD_IN_CONTAINER),true)
+	$(SUDO) docker run  $(RM) $(TTY) -i \
+		-v $(shell go env GOPATH)/pkg:/go/pkg$(MOUNT_FLAGS) \
+		-v $(shell pwd):/src/loki$(MOUNT_FLAGS) \
+		$(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION) $@;
+else
 	@$(MAKE) release-workflows
 	@echo "Checking diff"
 	@git diff --exit-code -- ".github/workflows/*release*" || (echo "Please build release workflows by running 'make release-workflows'" && false)
+endif

cmd/loki/loki-local-config.yaml

@@ -3,6 +3,7 @@ auth_enabled: false
 server:
   http_listen_port: 3100
   grpc_listen_port: 9096
+  log_level: debug
 
 common:
   instance_addr: 127.0.0.1
@@ -33,6 +34,12 @@ schema_config:
         prefix: index_
         period: 24h
 
+pattern_ingester:
+  enabled: true
+  metric_aggregation:
+    enabled: true
+    log_push_observations: true
+
 ruler:
   alertmanager_url: http://localhost:9093
 

cmd/loki/main.go

@@ -60,6 +60,10 @@ func main() {
 	serverCfg := &config.Server
 	serverCfg.Log = util_log.InitLogger(serverCfg, prometheus.DefaultRegisterer, false)
 
+	if config.InternalServer.Enable {
+		config.InternalServer.Log = serverCfg.Log
+	}
+
 	// Validate the config once both the config file has been loaded
 	// and CLI flags parsed.
 	if err := config.Validate(); err != nil {

docs/sources/_index.md

@@ -1,19 +1,48 @@
 ---
-title: Grafana Loki documentation
-description: "Technical documentation for Grafana Loki"
+title: Grafana Loki
+description: Grafana Loki is a set of open source components that can be composed into a fully featured logging stack.
 aliases:
   - /docs/loki/
 weight: 100
+hero:
+  title: Grafana Loki
+  level: 1
+  image: /media/docs/loki/logo-grafana-loki.png
+  width: 110
+  height: 110
+  description: Grafana Loki is a set of open source components that can be composed into a fully featured logging stack. A small index and highly compressed chunks simplifies the operation and significantly lowers the cost of Loki.
+cards:
+  title_class: pt-0 lh-1
+  items:
+    - title: Learn about Loki
+      href: /docs/loki/latest/get-started/
+      description: Learn about the Loki architecture and components, the various deployment modes, and best practices for labels.
+    - title: Set up Loki
+      href: /docs/loki/latest/setup/
+      description: View instructions for how to configure and install Loki, migrate from previous deployments, and upgrade your Loki environment.
+    - title: Configure Loki
+      href: /docs/loki/latest/configure/
+      description: View the Loki configuration reference and configuration examples.
+    - title: Send logs to Loki
+      href: /docs/loki/latest/send-data/
+      description: Select one or more clients to use to send your logs to Loki.
+    - title: Manage Loki
+      href: /docs/loki/latest/operations/
+      description: Learn how to manage tenants, log ingestion, storage, queries, and more.
+    - title: Query with LogQL
+      href: /docs/loki/latest/query/
+      description: Inspired by PromQL, LogQL is Grafana Loki’s query language. LogQL uses labels and operators for filtering.
 ---
 
-# Grafana Loki documentation
+{{< docs/hero-simple key="hero" >}}
 
-<p align="center"> <img src="logo_and_name.png" alt="Loki Logo"> <br> 
+---
 
-Grafana Loki is a set of components that can be composed into a fully featured logging stack.
+## Overview
 
-Unlike other logging systems, Loki is built around the idea of only indexing metadata about your logs: labels (just like Prometheus labels). 
+Unlike other logging systems, Loki is built around the idea of only indexing metadata about your logs' labels (just like Prometheus labels).
 Log data itself is then compressed and stored in chunks in object stores such as Amazon Simple Storage Service (S3) or Google Cloud Storage (GCS), or even locally on the filesystem.  
-A small index and highly compressed chunks simplifies the operation and significantly lowers the cost of Loki.
 
-For more information, see the [Loki overview]({{< relref "./get-started/overview" >}}).
+## Explore
+
+{{< card-grid key="cards" type="simple" >}}

docs/sources/get-started/labels/_index.md

@@ -37,7 +37,7 @@ Loki places the same restrictions on label naming as [Prometheus](https://promet
 
 This series of examples will illustrate basic use cases and concepts for labeling in Loki.
 
-Let's take an example:
+Let's take an example Promtail/Alloy config file:
 
 ```yaml
 scrape_configs: