prometheus-node-exporter-lua: fix nat scraper

[feed/packages.git] / utils / prometheus-node-exporter-lua / files / usr / bin / prometheus-node-exporter-lua

diff --git a/utils/prometheus-node-exporter-lua/files/usr/bin/prometheus-node-exporter-lua b/utils/prometheus-node-exporter-lua/files/usr/bin/prometheus-node-exporter-lua
index fea846926b204d25c5ccfcbde9abbb775e875105..488374ddd22c725e69827cae7e2963fce3ee2510 100755 (executable)
--- a/utils/prometheus-node-exporter-lua/files/usr/bin/prometheus-node-exporter-lua
+++ b/utils/prometheus-node-exporter-lua/files/usr/bin/prometheus-node-exporter-lua
@@ -248,27 +248,25 @@ function scraper_time()
   metric("node_time", "counter", nil, os.time())
 end
 
+uname_labels = {
+domainname = "",
+nodename = "",
+release = string.sub(get_contents("/proc/sys/kernel/osrelease"), 1, -2),
+sysname = string.sub(get_contents("/proc/sys/kernel/ostype"), 1, -2),
+version = string.sub(get_contents("/proc/sys/kernel/version"), 1, -2),
+machine = string.sub(io.popen("uname -m"):read("*a"), 1, -2)
+}
+
 function scraper_uname()
-  -- version can have spaces, so grab it directly
-  local version = string.sub(io.popen("uname -v"):read("*a"), 1, -2)
-  -- avoid individual popen calls for the rest of the values
-  local uname_string = io.popen("uname -a"):read("*a")
-  local sysname, nodename, release = unpack(space_split(uname_string))
-  local labels = {domainname = "(none)", nodename = nodename, release = release,
-                  sysname = sysname, version = version}
-
-  -- The machine hardware name is immediately after the version string, so add
-  -- up the values we know and add in the 4 spaces to find the offset...
-  machine_offset = string.len(sysname .. nodename .. release .. version) + 4
-  labels['machine'] = string.match(string.sub(uname_string, machine_offset), "(%S+)" )
-  metric("node_uname_info", "gauge", labels, 1)
+  uname_labels["domainname"] = string.sub(get_contents("/proc/sys/kernel/domainname"), 1, -2)
+  uname_labels["nodename"] = string.sub(get_contents("/proc/sys/kernel/hostname"), 1, -2)
+  metric("node_uname_info", "gauge", uname_labels, 1)
 end
 
 function scraper_nat()
   -- documetation about nf_conntrack:
   -- https://www.frozentux.net/iptables-tutorial/chunkyhtml/x1309.html
-  -- local natstat = line_split(get_contents("/proc/net/nf_conntrack"))
-  local natstat = line_split(get_contents("nf_conntrack"))
+  local natstat = line_split(get_contents("/proc/net/nf_conntrack"))
 
   nat_metric =  metric("node_nat_traffic", "gauge" )
   for i, e in ipairs(natstat) do
@@ -327,18 +325,11 @@ end
 -- Web server-specific functions
 
 function http_ok_header()
-  output("HTTP/1.1 200 OK\r")
-  output("Server: lua-metrics\r")
-  output("Content-Type: text/plain; version=0.0.4\r")
-  output("\r")
+  output("HTTP/1.0 200 OK\r\nServer: lua-metrics\r\nContent-Type: text/plain; version=0.0.4\r\n\r")
 end
 
 function http_not_found()
-  output("HTTP/1.1 404 Not Found\r")
-  output("Server: lua-metrics\r")
-  output("Content-Type: text/plain\r")
-  output("\r")
-  output("ERROR: File Not Found.")
+  output("HTTP/1.0 404 Not Found\r\nServer: lua-metrics\r\nContent-Type: text/plain\r\n\r\nERROR: File Not Found.")
 end
 
 function serve(request)