Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prometheus-node-exporter-lua: close io.popen files to reap zombies

Browse source 
Signed-off-by: Leonid Evdokimov <leon@darkk.net.ru>
This commit is contained in:
Leonid Evdokimov 2018-11-25 16:57:27 +03:00 committed by Etienne Champetier
parent 430f6c0164
commit 8ccfae065f
3 changed files with 9 additions and 3 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:=2018.07.23 PKG_VERSION:=2018.07.23
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com> PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

4
utils/prometheus-node-exporter-lua/files/usr/bin/prometheus-node-exporter-lua
View file

@ -119,11 +119,13 @@ end
col_mods = {} col_mods = {}
col_names = {} col_names = {}
for c in io.popen("ls -1 /usr/lib/lua/prometheus-collectors/*.lua"):lines() do ls_fd = io.popen("ls -1 /usr/lib/lua/prometheus-collectors/*.lua")
for c in ls_fd:lines() do
c = c:match("([^/]+)%.lua$") c = c:match("([^/]+)%.lua$")
col_mods[c] = require('prometheus-collectors.'..c) col_mods[c] = require('prometheus-collectors.'..c)
col_names[#col_names+1] = c col_names[#col_names+1] = c
end end
ls_fd:close()
if port then if port then
server = assert(socket.bind(bind, port)) server = assert(socket.bind(bind, port))

6
utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/uname.lua
View file

@ -1,12 +1,16 @@
local uname_fd = io.popen("uname -m")
local labels = { local labels = {
domainname = "", domainname = "",
nodename = "", nodename = "",
release = string.sub(get_contents("/proc/sys/kernel/osrelease"), 1, -2), release = string.sub(get_contents("/proc/sys/kernel/osrelease"), 1, -2),
sysname = string.sub(get_contents("/proc/sys/kernel/ostype"), 1, -2), sysname = string.sub(get_contents("/proc/sys/kernel/ostype"), 1, -2),
version = string.sub(get_contents("/proc/sys/kernel/version"), 1, -2), version = string.sub(get_contents("/proc/sys/kernel/version"), 1, -2),
machine = string.sub(io.popen("uname -m"):read("*a"), 1, -2) machine = string.sub(uname_fd:read("*a"), 1, -2)
} }
uname_fd:close()
local function scrape() local function scrape()
labels["domainname"] = string.sub(get_contents("/proc/sys/kernel/domainname"), 1, -2) labels["domainname"] = string.sub(get_contents("/proc/sys/kernel/domainname"), 1, -2)
labels["nodename"] = string.sub(get_contents("/proc/sys/kernel/hostname"), 1, -2) labels["nodename"] = string.sub(get_contents("/proc/sys/kernel/hostname"), 1, -2)