OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prometheus-node-exporter-lua: handle fancy release 

Some releases may have non letters in it's name currently resulting in
an empty ("") output which is then discarded, resulting in *missing*
labels in the metric.

Now it uses `.-` to catch as little as possible, but anything.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2018-06-17 17:01:57 +09:00
parent 870ebb1b8d
commit fc44f87dc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/prometheus-node-exporter-lua/Makefile
View File

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=prometheus-node-exporter-lua PKG_NAME:=prometheus-node-exporter-lua
PKG_VERSION:=2017.12.08 PKG_VERSION:=2017.12.08
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_MAINTAINER:=Christian Simon <simon@swine.de> PKG_MAINTAINER:=Christian Simon <simon@swine.de>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

2
utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/openwrt.lua
View File

@ -6,7 +6,7 @@ local labels = {
board_name = string.sub(get_contents("/tmp/sysinfo/board_name"), 1, -2) board_name = string.sub(get_contents("/tmp/sysinfo/board_name"), 1, -2)
} }
for k, v in string.gmatch(get_contents("/etc/openwrt_release"), "(DISTRIB_%w+)='(%w+)'\n") do for k, v in string.gmatch(get_contents("/etc/openwrt_release"), "(DISTRIB_%w+)='(.-)'\n") do
if k == "DISTRIB_ID" then if k == "DISTRIB_ID" then
labels["id"] = v labels["id"] = v
elseif k == "DISTRIB_RELEASE" then elseif k == "DISTRIB_RELEASE" then