Skip to content

[25.12] prometheus-node-exporter-lua: sync with master#29927

Merged
champtar merged 12 commits into
openwrt:openwrt-25.12from
champtar:prom-25.12
Jul 5, 2026
Merged

[25.12] prometheus-node-exporter-lua: sync with master#29927
champtar merged 12 commits into
openwrt:openwrt-25.12from
champtar:prom-25.12

Conversation

@champtar

@champtar champtar commented Jul 5, 2026

Copy link
Copy Markdown
Member

📦 Package Details

Maintainer: me

Description:
cherry-pick all commits from master

🧪 Run Testing Details

none

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

champtar and others added 11 commits July 5, 2026 09:18
No version to test here.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 964750c)
No version to test here.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 8ebab94)
No version to test here.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit cc886eb)
It looks like I forgot to remove this file while dropping
package prometheus-node-exporter-lua-bmx6.

Fixes: 9c2bf85 ("prometheus-node-exporter-lua: drop bmx6 package")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit cab93eb)
The treewide change done in master doesn't apply cleanly.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Add a Prometheus collector for ModemManager that exports cellular modem
signal metrics via mmcli. Supports multiple modems (labeled by D-Bus
object path), exports overall signal quality and detailed per-technology
signal parameters (LTE, NR5G, UMTS, GSM, CDMA, ...).

Requires signal refresh to be enabled on the modem:
  mmcli -m <id> --signal-setup=<interval_seconds>

Tested on: ath79/generic, GL.inet GL-X300B, OpenWrt 23.05.5

Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Jean-Laurent Girod <jeanlaurent.girod@icloud.com>
(cherry picked from commit 1b18489)
Add a collector for the various fileystem metrics which matches the
node-exporter behaviour. This collector supports the following metrics:

* node_filesystem_size_bytes
* node_filesystem_free_bytes
* node_filesystem_avail_bytes
* node_filesystem_files
* node_filesystem_files_free
* node_filesystem_readonly

Signed-off-by: Will May <will.j.may@gmail.com>
(cherry picked from commit eba5a9c)
Handle cases where 'mac' is missing (nil), a single string,
or an array (table).

Additionally, add support for the 'duid' field.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit c8760b4)
the original node_exporter exposes a node_os_info metric with a set of
data about the system [1] which is then used by several dashboards.

openwrt.lua already exposes OS info, but using the node_openwrt_info
metric requires changes to existing dashboards, and would require more
complex lookups when there are non-OpenWrt hosts in the overview too.

as we've already called ubus and fetched the data, we can expose it in
two formats easily.

[1] https://github.com/prometheus/node_exporter/blob/d6d0e710bb7daf07a2743fde060f0d5f32c565f3/collector/os_release.go#L190-L192

Signed-off-by: Evgeni Golov <evgeni@golov.de>
(cherry picked from commit 7d9cc2e)
…g wifi device metrics interfaces

Signed-off-by: Jun Ouyang <ouyangjun1999@gmail.com>
(cherry picked from commit f39d51b)
- New unbound.lua exporter module for unbound stats
- Updated Makefile

Signed-off-by: Bruno Marinier <bmgm41@gmail.com>
(cherry picked from commit 4238239)
@champtar champtar self-assigned this Jul 5, 2026
@openwrt openwrt Bot added not following guidelines release/25.12 Issues/PR on branch 25.12 labels Jul 5, 2026
@openwrt

openwrt Bot commented Jul 5, 2026

Copy link
Copy Markdown

Formality Check: Failed

We completed the verification flow. Please review the formatting overview logs below.

🛑 CRITICAL ERRORS

Commit 04b45f9 - prometheus-node-exporter-lua: check if status is nil before processing wifi device metrics interfaces:

  • Subject line exceeds hard limit (101/80 chars)

Commit 50ec7e8 - prometheus-node-exporter-lua: add modemmanager exporter:

  • Makefile introduces PKG_VERSION '2026.05.06', but this version string is missing in the commit subject line

Commit f174443 - prometheus-node-exporter-lua: add filesystem metrics:

  • Makefile introduces PKG_VERSION '2026.05.07', but this version string is missing in the commit subject line

Commit 1417f80 - prometheus-node-exporter-lua: fixup uci_dhcp_host:

  • Makefile introduces PKG_VERSION '2026.05.08', but this version string is missing in the commit subject line

Commit d503580 - prometheus-node-exporter-lua: expose node_os_info:

  • Makefile introduces PKG_VERSION '2026.05.09', but this version string is missing in the commit subject line

Commit 04b45f9 - prometheus-node-exporter-lua: check if status is nil before processing wifi device metrics interfaces:

  • Makefile introduces PKG_VERSION '2026.05.10', but this version string is missing in the commit subject line

Commit 2168fe2 - prometheus-node-exporter-lua: add unbound stats collector:

  • Makefile introduces PKG_VERSION '2026.06.05', but this version string is missing in the commit subject line

Something broken? Consider reporting an issue.
Running version ca525cc deployed on 2026-07-04 22:49:00 CEST

@BKPepe

BKPepe commented Jul 5, 2026

Copy link
Copy Markdown
Member

Wow, @champtar, it's been a while since I've seen you active, good job. Yeah, I know... lots of issues, having to add a skip CI version check for packages where the version is missing. These are just teething problems, and I'm glad you're looking into it. :-)

Regarding the bot, yeah, the issue with PKG_VERSION and it not showing up in the subject line is a bit complicated, because prometheus-node-exporter-lua in particular doesn't download an upstream tarball. I'll think about how to solve this better.

@BKPepe

BKPepe commented Jul 5, 2026

Copy link
Copy Markdown
Member

[allow cherry-pick]

@champtar

champtar commented Jul 5, 2026

Copy link
Copy Markdown
Member Author

Yeah, the CI is focused on packages with external sources, so some of the checks are not optimal for packages with in tree sources (yet).
Maybe we could relax the PKG_VERSION check to also look at the commit description, not just the the title. With in tree sources the PKG_VERSION is a necessary evil and I prefer to still have what the commit really does in the title (I'll open an issue)

test.sh is pretty basic and will not fail if one of the plugin fails,
which is fine as most plugins will fail in CI anyway.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 4741715)
@champtar champtar marked this pull request as ready for review July 5, 2026 15:19
@champtar champtar merged commit 2ce5aea into openwrt:openwrt-25.12 Jul 5, 2026
1 of 4 checks passed
@champtar champtar deleted the prom-25.12 branch July 5, 2026 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants