Merge branch 'prometheus:master' into master

Author: clrkrompets

.dockerignore

@@ -1,9 +1,10 @@
+data/
 .build/
 .tarballs/
 
-!.build/linux-amd64
-!.build/linux-arm64
-!.build/linux-armv7
-!.build/linux-ppc64le
-!.build/linux-riscv64
-!.build/linux-s390x
+!.build/linux-amd64/
+!.build/linux-arm64/
+!.build/linux-armv7/
+!.build/linux-ppc64le/
+!.build/linux-riscv64/
+!.build/linux-s390x/

.github/workflows/bsd.yml

@@ -127,7 +127,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       - name: test-e2e
-        uses: vmactions/netbsd-vm@e04aec09540429f9cebb0e7941f7cd0c0fc3b44f  # v1.3.6
+        uses: vmactions/netbsd-vm@ca7ff0556959998c82761c34ea0c3c99fa084c48  # v1.3.7
         with:
           copyback: false
           envs: 'GO_VERSION GNU_TAR_VERSION'

.github/workflows/ci.yml

@@ -122,7 +122,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: prometheus/promci/publish_main@769ee18070cd21cfc2a24fa912349fd3e48dee58 # v0.6.0
+      - uses: prometheus/promci/publish_main@42c3c84c865e5c1ab78543b929f7341eb2ef6123 # v0.6.1
         with:
           docker_hub_login: ${{ secrets.docker_hub_login }}
           docker_hub_password: ${{ secrets.docker_hub_password }}
@@ -138,7 +138,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: prometheus/promci/publish_release@769ee18070cd21cfc2a24fa912349fd3e48dee58 # v0.6.0
+      - uses: prometheus/promci/publish_release@42c3c84c865e5c1ab78543b929f7341eb2ef6123 # v0.6.1
         with:
           docker_hub_login: ${{ secrets.docker_hub_login }}
           docker_hub_password: ${{ secrets.docker_hub_password }}

CHANGELOG.md

@@ -5,6 +5,10 @@
 * [ENHANCEMENT]
 * [BUGFIX]
 
+## 1.11.1 / 2026-04-07
+
+* [BUGFIX] Fix kernel_hung for no data #3613
+
 ## 1.11.0 / 2026-04-04
 
 * [CHANGE] Adds distroless container image. #3592

Makefile.common

@@ -55,13 +55,13 @@ ifneq ($(shell command -v gotestsum 2> /dev/null),)
 endif
 endif
 
-PROMU_VERSION ?= 0.18.0
+PROMU_VERSION ?= 0.18.1
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.10.1
+GOLANGCI_LINT_VERSION ?= v2.11.4
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
@@ -90,8 +90,10 @@ ifdef DOCKERFILE_PATH
 $(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile)
 endif
 
-DOCKER_ARCHS            ?= amd64
-DOCKERFILE_VARIANTS     ?= Dockerfile $(wildcard Dockerfile.*)
+DOCKER_ARCHS ?= amd64 arm64 armv7 ppc64le riscv64 s390x
+DOCKERFILE_ARCH_EXCLUSIONS ?=
+DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
+DOCKERFILE_VARIANTS     ?= $(wildcard Dockerfile Dockerfile.*)
 
 # Function to extract variant from Dockerfile label.
 # Returns the variant name from io.prometheus.image.variant label, or "default" if not found.

SECURITY.md

@@ -3,4 +3,4 @@
 The Prometheus security policy, including how to report vulnerabilities, can be
 found here:
 
-<https://prometheus.io/docs/operating/security/>
+[https://prometheus.io/docs/operating/security/](https://prometheus.io/docs/operating/security/)

VERSION

@@ -1 +1 @@
-1.11.0
+1.11.1

collector/diskstats_common.go

@@ -100,7 +100,7 @@ func newDiskstatsDeviceFilter(logger *slog.Logger) (deviceFilter, error) {
 		}
 	}
 	if *diskstatsDeviceInclude != "" {
-		if diskstatsDeviceExcludeSet {
+		if diskstatsDeviceExcludeSet && *diskstatsDeviceExclude != "" {
 			return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")
 		}
 		*diskstatsDeviceExclude = ""

collector/kernel_hung_linux.go

@@ -16,8 +16,10 @@
 package collector
 
 import (
+	"errors"
 	"fmt"
 	"log/slog"
+	"os"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs"
@@ -54,6 +56,10 @@ var (
 func (c *kernelHungCollector) Update(ch chan<- prometheus.Metric) error {
 	kernelHung, err := c.fs.KernelHung()
 	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			c.logger.Debug("hung_task_detect_count does not exist")
+			return ErrNoData
+		}
 		return err
 	}