Merge branch 'main' into fix/default-data-location-7748

Author: ankitshokeen

.gitignore

@@ -74,3 +74,5 @@ mem.prof
 *.pprof
 
 **/.claude/settings.local.json
+
+host-*.json

cmd/loki/main.go

@@ -8,6 +8,19 @@ import (
 	"runtime"
 	"time"
 
+	// The go.opentelemetry.io/collector/pdata/internal/grpcencoding package
+	// registers its own encoding for proto, falling back to the existing proto
+	// encoding for non-OTLP messages.
+	//
+	// However, if no proto encoding has been registered, the fallback mechanism
+	// will panic. This can happen depending on import order, as encodings are
+	// registered via init functions. To avoid this, we force the correct import
+	// order by keeping this as the very first import.
+	//
+	// This import can be removed once the grpcencoding package includes this
+	// import itself.
+	_ "google.golang.org/grpc/encoding/proto"
+
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/log"
 	"github.com/grafana/dskit/tracing"

cmd/querytee/main.go

@@ -42,6 +42,7 @@ func main() {
 		trace, err := tracing.NewOTelOrJaegerFromEnv("loki-querytee", util_log.Logger)
 		if err != nil {
 			level.Error(util_log.Logger).Log("msg", "error in initializing tracing. tracing will not be enabled", "err", err)
+			os.Exit(1)
 		}
 
 		defer func() {

docs/sources/operations/blocking-queries.md

@@ -34,6 +34,14 @@ overrides:
       # block any query that matches this query hash
       - hash: 2943214005          # hash of {stream="stdout",pod="loki-canary-9w49x"}
         types: filter,limited
+
+      # block queries originating from specific sources via X-Query-Tags
+      # Keys and values are matched case-insensitively.
+      - pattern: '.*'             # optional; if pattern and regex are omittied they will default to '.*' and true
+        regex: true
+        tags:
+          source: grafana
+          feature: beta
 ```
 {{< admonition type="note" >}}
 Changes to these configurations **do not require a restart**; they are defined in the [runtime configuration file](https://grafana.com/docs/loki/<LOKI_VERSION>/configure/#runtime-configuration-file).
@@ -61,6 +69,48 @@ The order of patterns is preserved, so the first matching pattern will be used.
 
 Blocked queries are logged, as well as counted in the `loki_blocked_queries` metric on a per-tenant basis.
 
+When a policy matches by pattern/hash/regex, Loki logs whether the query type and request tags matched that policy:
+
+```logfmt
+level=warn msg="query blocker matched with regex policy" user=29 type=metric pattern=".*rate\\(.*\\).*" query="sum(rate({app=\"foo\"}[5m]))" typesMatched=true tagsMatched=false blocked=false
+```
+
+If tag constraints fail to match, Loki emits a debug log showing the missing key and the raw header value that was received:
+
+```logfmt
+level=debug msg="query blocker tags mismatch: missing or mismatched key" key=feature tagsRaw="Source=grafana,Feature=alpha"
+```
+
 ## Scope
 
 Queries received via the API and executed as [alerting/recording rules](../../alert/) will be blocked.
+
+## Tag-based blocking
+
+You can scope a blocked query rule to requests that include specific key=value pairs in the `X-Query-Tags` header.
+
+- Header format: `key=value` pairs separated by commas, for example: `Source=grafana,Feature=beta`.
+- Allowed characters are alphanumeric plus space, comma, equals, '@', '.', and '-'. Any other characters are replaced with `_`.
+- Parsing keeps only canonical `key=value` tokens; malformed tokens are ignored.
+- Matching rules:
+  - Keys are matched case-insensitively (the server lowercases keys).
+  - Values are matched case-insensitively.
+  - All specified `tags:` pairs in the rule must be present in the request to apply the block.
+
+Examples:
+
+```yaml
+overrides:
+  tenant-a:
+    blocked_queries:
+      # Block only metric queries from a beta feature flag
+      - types: metric
+        tags:
+          feature: beta
+
+      # Combine with regex to narrow scope further
+      - pattern: '.*rate\\(.*\\).*'
+        regex: true
+        tags:
+          source: grafana
+```

docs/sources/setup/install/docker.md

@@ -1,14 +1,14 @@
 ---
 title: Install Loki with Docker or Docker Compose
-menuTitle:  Install using Docker
+menuTitle: Install using Docker
 description: Describes how to install Loki using Docker or Docker Compose
 aliases: 
  - ../../installation/docker/
 weight: 400
 ---
 # Install Loki with Docker or Docker Compose
 
-You can install Loki and Promtail with Docker or Docker Compose if you are evaluating, testing, or developing Loki.
+You can install Loki and Alloy with Docker or Docker Compose if you are evaluating, testing, or developing Loki.
 For production, Grafana recommends installing with Helm or Tanka.
 
 The configuration files associated with these installation instructions run Loki as a single binary.
@@ -27,18 +27,18 @@ The configuration files associated with these installation instructions run Loki
     cd loki
     ```
 
-1. Copy and paste the following commands into your command line to download `loki-local-config.yaml` and `promtail-docker-config.yaml` to your `loki` directory.
+1. Copy and paste the following commands into your command line to download `loki-local-config.yaml` and `promtail-docker-config.yaml` to your `loki` directory. If necessary, update the Loki version numbers in the commands to match your version of Loki.
 
     ```bash
-    wget https://raw.githubusercontent.com/grafana/loki/v3.4.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
-    wget https://raw.githubusercontent.com/grafana/loki/v3.4.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
+    wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/cmd/loki/loki-local-config.yaml -O loki-config.yaml
+    wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
     ```
 
-1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step.
+1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step. If necessary, update the Loki version numbers in the commands to match your version of Loki.
 
     ```bash
-    docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:3.4.1 -config.file=/mnt/config/loki-config.yaml
-    docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.4.1 -config.file=/mnt/config/promtail-config.yaml
+    docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:3.5.7 -config.file=/mnt/config/loki-config.yaml
+    docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.5.7 -config.file=/mnt/config/promtail-config.yaml
     ```
 
     {{< admonition type="note" >}}
@@ -56,8 +56,8 @@ The configuration files associated with these installation instructions run Loki
     ```bash
 
     CONTAINER ID   IMAGE                    COMMAND                  CREATED              STATUS              PORTS                                       NAMES
-    9485de9ad351   grafana/promtail:3.4.1   "/usr/bin/promtail -…"   About a minute ago   Up About a minute                                               promtail
-    cece1df84519   grafana/loki:3.4.1       "/usr/bin/loki -conf…"   About a minute ago   Up About a minute   0.0.0.0:3100->3100/tcp, :::3100->3100/tcp   loki
+    9485de9ad351   grafana/promtail:3.5.7   "/usr/bin/promtail -…"   About a minute ago   Up About a minute                                               promtail
+    cece1df84519   grafana/loki:3.5.7       "/usr/bin/loki -conf…"   About a minute ago   Up About a minute   0.0.0.0:3100->3100/tcp, :::3100->3100/tcp   loki
     ```
 
 1. Verify that Loki is up and running.
@@ -67,19 +67,19 @@ The configuration files associated with these installation instructions run Loki
 
 ## Install with Docker on Windows
 
-1. Copy and paste the following commands into your command line to download `loki-local-config.yaml` and `promtail-docker-config.yaml` to your `loki` directory. Note that you will need to replace the `<local-path>` in the commands with your local path.
+1. Copy and paste the following commands into your command line to download `loki-local-config.yaml` and `promtail-docker-config.yaml` to your `loki` directory. Note that you will need to replace the `<local-path>` in the commands with your local path. If necessary, update the Loki version numbers in the commands to match your version of Loki.
 
 ```bash
 cd "<local-path>"
-wget https://raw.githubusercontent.com/grafana/loki/v3.4.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
-wget https://raw.githubusercontent.com/grafana/loki/v3.4.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
+wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/cmd/loki/loki-local-config.yaml -O loki-config.yaml
+wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
 ```
 
-1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step. Note that you will need to replace the `<local-path>` in the commands with your local path.
+1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step. Note that you will need to replace the `<local-path>` in the commands with your local path. If necessary, update the Loki version numbers in the commands to match your version of Loki.
 
 ```bash
-docker run --name loki -v <local-path>:/mnt/config -p 3100:3100 grafana/loki:3.4.1 --config.file=/mnt/config/loki-config.yaml
-docker run -v <local-path>:/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.4.1 --config.file=/mnt/config/promtail-config.yaml
+docker run --name loki -v <local-path>:/mnt/config -p 3100:3100 grafana/loki:3.5.7 --config.file=/mnt/config/loki-config.yaml
+docker run -v <local-path>:/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.5.7 --config.file=/mnt/config/promtail-config.yaml
 ```
 
 1. Verify that Loki is up and running.
@@ -98,10 +98,12 @@ Run the following commands in your command line. They work for Windows or Linux
     cd loki
     ```
 
-1. Copy and paste the following command into your command line to download the `docker-compose` file.
+1. Copy and paste the following commands into your command line to download the `docker-compose.yaml` and `alloy-local-config.yaml` files. If necessary, update the Loki version numbers in the commands to match your version of Loki.
 
     ```bash
-    wget https://raw.githubusercontent.com/grafana/loki/v3.4.1/production/docker-compose.yaml -O docker-compose.yaml
+    wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/examples/getting-started/docker-compose.yaml -O docker-compose.yaml
+    wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/examples/getting-started/alloy-local-config.yaml -O alloy-local-config.yaml
+    wget https://raw.githubusercontent.com/grafana/loki/v3.5.7/examples/getting-started/loki-config.yaml -O loki-config.yaml
     ```
 
 1. With `loki` as the current working directory, run the following 'docker-compose` command:
@@ -115,7 +117,7 @@ Run the following commands in your command line. They work for Windows or Linux
     ```bash
     ✔ Container loki-loki-1      Started              0.0s
     ✔ Container loki-grafana-1   Started              0.0s
-    ✔ Container loki-promtail-1  Started              0.0s
+    ✔ Container loki-alloy-1     Started              0.0s
     ```
 
 1. Verify that Loki is up and running.

docs/sources/setup/install/helm/reference.md

@@ -3913,7 +3913,7 @@ null
     "pullPolicy": "IfNotPresent",
     "registry": "docker.io",
     "repository": "grafana/enterprise-logs",
-    "tag": "3.5.5"
+    "tag": "3.5.7"
   },
   "license": {
     "contents": "NOTAVALIDLICENSE"
@@ -4060,7 +4060,7 @@ null
 			<td>string</td>
 			<td>Docker image tag</td>
 			<td><pre lang="json">
-"3.5.5"
+"3.5.7"
 </pre>
 </td>
 		</tr>