Merge pull request #9739 from champtar/master

prometheus-node-exporter-lua: add target & system to OpenWrt collector
This commit is contained in:
Etienne Champetier 2019-08-14 21:16:23 -07:00 committed by GitHub
commit 3a80fa9cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions

View File

@ -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

View File

@ -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)