Skip to content

Commit 6f6e5f5

Browse files
authored
Merge branch 'master' into add-drm-chip
Signed-off-by: Yurii Kondrakov <yurii.kondrakov@canonical.com>
2 parents bae3229 + 14fddfc commit 6f6e5f5

28 files changed

+597
-610
lines changed

.circleci/config.yml

Lines changed: 0 additions & 139 deletions
This file was deleted.

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.tarballs/
33

44
!.build/linux-amd64
5-
!.build/linux-armv7
65
!.build/linux-arm64
6+
!.build/linux-armv7
77
!.build/linux-ppc64le
8+
!.build/linux-riscv64
89
!.build/linux-s390x

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ updates:
88
directory: "/"
99
schedule:
1010
interval: "monthly"
11+
# Exclude configs synced from upstream prometheus/prometheus.
12+
exclude-paths:
13+
- .github/workflows/container_description.yml
14+
- .github/workflows/golangci-lint.yml

.github/workflows/bsd.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Checkout the repository
2525
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
- name: test-e2e
27-
uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2
27+
uses: vmactions/freebsd-vm@7ca82f79fe3078fecded6d3a2bff094995447bbd # v1.4.4
2828
with:
2929
release: "15.0"
3030
copyback: false
@@ -76,7 +76,7 @@ jobs:
7676
- name: Checkout the repository
7777
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7878
- name: test-e2e
79-
uses: vmactions/openbsd-vm@7fd5a3e251db9d8bdff2f34aae11a43b6be5ad60 # v1.2.4
79+
uses: vmactions/openbsd-vm@9004791062e748d95cc87e499e77485f91888ce1 # v1.3.8
8080
with:
8181
copyback: false
8282
envs: 'GO_VERSION GNU_TAR_VERSION'
@@ -176,7 +176,7 @@ jobs:
176176
- name: Checkout the repository
177177
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
178178
- name: test-e2e
179-
uses: vmactions/dragonflybsd-vm@04601322b25fa8eb14f0394e46e1103084ea0199 # v1.2.6
179+
uses: vmactions/dragonflybsd-vm@323497fa680c1856dd1ba5c4fd89182a9194f649 # v1.2.7
180180
with:
181181
copyback: false
182182
envs: 'GO_VERSION'
@@ -228,7 +228,7 @@ jobs:
228228
- name: Checkout the repository
229229
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
230230
- name: test-e2e
231-
uses: vmactions/solaris-vm@69d382b4a775b25ea5955e6c1730e9d05047ca0d # v1.3.1
231+
uses: vmactions/solaris-vm@0a231b94365d1911cf62097ef342f6b30d95598f # v1.3.2
232232
with:
233233
copyback: false
234234
envs: 'GO_VERSION'
@@ -258,13 +258,13 @@ jobs:
258258
ln -s $(which gsed) $(pwd)/bin/sed
259259
ln -s $(which gtar) $(pwd)/bin/tar
260260
export PATH=$(pwd)/bin:$PATH
261-
261+
262262
echo ">> building promu as it is not shipped for Solaris"
263263
git clone https://github.com/prometheus/promu.git
264264
cd promu
265265
go build .
266266
cd -
267-
267+
268268
mkdir -p $(go env GOPATH)/bin
269269
ln -s $(pwd)/promu/promu $(go env GOPATH)/bin/promu
270270
export PATH=$(go env GOPATH)/bin:$PATH

.github/workflows/ci.yml

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
---
2+
name: CI
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master, 'release-*']
7+
tags: ['v*']
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
test_go:
14+
name: Go tests
15+
runs-on: ubuntu-latest
16+
container:
17+
# Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml
18+
# should also be updated.
19+
image: quay.io/prometheus/golang-builder:1.26-base
20+
steps:
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
with:
23+
persist-credentials: false
24+
- run: go mod download
25+
- run: make
26+
27+
test_go_arm:
28+
name: Go ARM tests
29+
runs-on: ubuntu-24.04-arm
30+
steps:
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
32+
with:
33+
persist-credentials: false
34+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
35+
with:
36+
go-version: 1.26.x
37+
- run: uname -a
38+
- run: make test-e2e
39+
40+
test_mixins:
41+
name: Mixins tests
42+
runs-on: ubuntu-latest
43+
container:
44+
# Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml
45+
# should also be updated.
46+
image: quay.io/prometheus/golang-builder:1.26-base
47+
steps:
48+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
with:
50+
persist-credentials: false
51+
- run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
52+
- run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
53+
- run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
54+
- run: make promtool
55+
- run: make -C docs/node-mixin clean
56+
- run: make -C docs/node-mixin jb_install
57+
- run: make -C docs/node-mixin
58+
- run: git diff --exit-code
59+
60+
build:
61+
name: Build node_exporter for all architectures
62+
runs-on: ubuntu-latest
63+
strategy:
64+
matrix:
65+
thread: [ 0, 1, 2 ]
66+
steps:
67+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
68+
with:
69+
persist-credentials: false
70+
- uses: prometheus/promci-setup@5af30ba8c199a91d6c04ebdc3c48e630e355f62d # v0.1.0
71+
- name: Crossbuild
72+
run: ~/go/bin/promu crossbuild -v --parallelism 3 --parallelism-thread ${{ matrix.thread }}
73+
- name: CGO crossbuild
74+
run: ~/go/bin/promu --config .promu-cgo.yml crossbuild -v --parallelism 3 --parallelism-thread ${{ matrix.thread }}
75+
- name: Codesign darwin binaries
76+
run: |
77+
if [[ -f "$(pwd)/.build/darwin-arm64/node_exporter" ]]; then
78+
~/go/bin/promu codesign "$(pwd)/.build/darwin-arm64/node_exporter"
79+
fi
80+
if [[ -f "$(pwd)/.build/darwin-amd64/node_exporter" ]]; then
81+
~/go/bin/promu codesign "$(pwd)/.build/darwin-amd64/node_exporter"
82+
fi
83+
- uses: prometheus/promci-artifacts/save@f9a587dbc0b2c78a0c54f8ad1cde71ea29a4b76f # v0.1.0
84+
with:
85+
directory: .build
86+
87+
test_docker:
88+
name: Test docker image
89+
runs-on: ubuntu-latest
90+
needs: [test_go, build]
91+
env:
92+
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.26-base
93+
REPO_PATH: github.com/prometheus/node_exporter
94+
steps:
95+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
96+
with:
97+
persist-credentials: false
98+
- uses: prometheus/promci-artifacts/restore@f9a587dbc0b2c78a0c54f8ad1cde71ea29a4b76f # v0.1.0
99+
- name: Build docker image
100+
run: |
101+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
102+
make docker DOCKER_IMAGE_TAG=${{ github.ref_name }}
103+
else
104+
make docker
105+
fi
106+
- run: docker images
107+
- run: docker run --rm -t -v "$(pwd):/app" "${DOCKER_TEST_IMAGE_NAME}" -i "${REPO_PATH}" -T
108+
- name: Test docker image
109+
run: |
110+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
111+
make test-docker DOCKER_IMAGE_TAG=${{ github.ref_name }}
112+
else
113+
make test-docker
114+
fi
115+
116+
publish_main:
117+
name: Publish main branch artifacts
118+
runs-on: ubuntu-latest
119+
needs: [test_go, test_go_arm, build]
120+
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
121+
steps:
122+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
123+
with:
124+
persist-credentials: false
125+
- uses: prometheus/promci/publish_main@769ee18070cd21cfc2a24fa912349fd3e48dee58 # v0.6.0
126+
with:
127+
docker_hub_login: ${{ secrets.docker_hub_login }}
128+
docker_hub_password: ${{ secrets.docker_hub_password }}
129+
quay_io_login: ${{ secrets.quay_io_login }}
130+
quay_io_password: ${{ secrets.quay_io_password }}
131+
132+
publish_release:
133+
name: Publish release artifacts
134+
runs-on: ubuntu-latest
135+
needs: [test_go, test_go_arm, build]
136+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
137+
steps:
138+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
139+
with:
140+
persist-credentials: false
141+
- uses: prometheus/promci/publish_release@769ee18070cd21cfc2a24fa912349fd3e48dee58 # v0.6.0
142+
with:
143+
docker_hub_login: ${{ secrets.docker_hub_login }}
144+
docker_hub_password: ${{ secrets.docker_hub_password }}
145+
quay_io_login: ${{ secrets.quay_io_login }}
146+
quay_io_password: ${{ secrets.quay_io_password }}
147+
github_token: ${{ secrets.PROMBOT_GITHUB_TOKEN }}

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
persist-credentials: false
3232
- name: Install Go
33-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
33+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3434
with:
3535
go-version: 1.26.x
3636
- name: Install snmp_exporter/generator dependencies

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
* [ENHANCEMENT]
66
* [BUGFIX]
77

8+
## 1.11.0 / 2026-04-04
9+
10+
* [CHANGE] Adds distroless container image. #3592
11+
* [FEATURE] infiniband: Add `hw_counters` metrics #2827
12+
* [FEATURE] kernel_hung: Add collector for kernel hung tasks #3470
13+
* [FEATURE] mixin: Add "All" option to cluster variable in dashboards #3509
14+
* [FEATURE] netlink: Add node_network_altnames_info metric #3541
15+
* [FEATURE] thermal: Add support for CPU temperature metrics on Apple Silicon #3547
16+
* [FEATURE] bcachefs: Add new collector for bcachefs #3523
17+
* [ENHANCEMENT] mixin: Make devices in network graphs configurable #3525
18+
* [ENHANCEMENT] nvme: Add namespace parameters #3360
19+
* [BUGFIX] netdev: Respect deviceFilter for `node_network_address_info` metric #3340
20+
* [BUGFIX] mountstats: Fix multiple transports statistics labeling #3358
21+
* [BUGFIX] diskstats: Fix panic when using device-include flag only #3603
22+
823
## 1.10.2 / 2025-10-25
924

1025
* [BUGFIX] meminfo: Fix typo in Zswap metric name #3455

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
all::
1616

1717
# Needs to be defined before including Makefile.common to auto-generate targets
18-
DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
18+
DOCKER_ARCHS ?= amd64 arm64 armv7 ppc64le riscv64 s390x
1919

2020
include Makefile.common
2121

0 commit comments

Comments
 (0)