prometheus-node-exporter-lua: add target & system to OpenWrt collector
Before:
node_openwrt_info{revision="r10756+1-7546be6007",model="GL.iNet GL-AR150",id="OpenWrt",board_name="glinet,gl-ar150",release="SNAPSHOT"} 1
After:
node_openwrt_info{revision="r10756+1-7546be6007",target="ath79/generic",board_name="glinet,gl-ar150",id="OpenWrt",model="GL.iNet GL-AR150",release="SNAPSHOT",system="Atheros AR9330 rev 1"} 1
Fixes #9730, replace #9735
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit a14bed1bc9
)
This commit is contained in:
parent
06e513ba3e
commit
80742d0da2
|
@ -4,7 +4,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=prometheus-node-exporter-lua
|
PKG_NAME:=prometheus-node-exporter-lua
|
||||||
PKG_VERSION:=2019.04.12
|
PKG_VERSION:=2019.08.14
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
|
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
|
||||||
|
@ -79,7 +79,7 @@ endef
|
||||||
define Package/prometheus-node-exporter-lua-openwrt
|
define Package/prometheus-node-exporter-lua-openwrt
|
||||||
$(call Package/prometheus-node-exporter-lua/Default)
|
$(call Package/prometheus-node-exporter-lua/Default)
|
||||||
TITLE+= (openwrt collector)
|
TITLE+= (openwrt collector)
|
||||||
DEPENDS:=prometheus-node-exporter-lua
|
DEPENDS:=prometheus-node-exporter-lua +libubus-lua
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/prometheus-node-exporter-lua-ltq-dsl
|
define Package/prometheus-node-exporter-lua-ltq-dsl
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
|
local ubus = require "ubus"
|
||||||
|
local u = ubus.connect()
|
||||||
|
local b = u:call("system", "board", {})
|
||||||
|
|
||||||
local labels = {
|
local labels = {
|
||||||
id = "",
|
board_name = b.board_name,
|
||||||
release = "",
|
id = b.release.distribution,
|
||||||
revision = "",
|
model = b.model,
|
||||||
model = string.sub(get_contents("/tmp/sysinfo/model"), 1, -2),
|
release = b.release.version,
|
||||||
board_name = string.sub(get_contents("/tmp/sysinfo/board_name"), 1, -2)
|
revision = b.release.revision,
|
||||||
|
system = b.system,
|
||||||
|
target = b.release.target
|
||||||
}
|
}
|
||||||
|
|
||||||
for k, v in string.gmatch(get_contents("/etc/openwrt_release"), "(DISTRIB_%w+)='(.-)'\n") do
|
b = nil
|
||||||
if k == "DISTRIB_ID" then
|
u = nil
|
||||||
labels["id"] = v
|
ubus = nil
|
||||||
elseif k == "DISTRIB_RELEASE" then
|
|
||||||
labels["release"] = v
|
|
||||||
elseif k == "DISTRIB_REVISION" then
|
|
||||||
labels["revision"] = v
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local function scrape()
|
local function scrape()
|
||||||
metric("node_openwrt_info", "gauge", labels, 1)
|
metric("node_openwrt_info", "gauge", labels, 1)
|
||||||
|
|
Loading…
Reference in New Issue