Changeset 4a0da0e513a734ae484e56cee0fdc99f321e3766

Timestamp:

01/25/12 22:30:15 (1 year ago)

Author:

Philip Maddox <pmaddox@circonus.com>

git-committer:

Philip Maddox <pmaddox@circonus.com> 1327530615 -0500

git-parent:

[2c77cc6f256e2dd45190aaf508321a230e0095d4]

git-author:

Philip Maddox <pmaddox@circonus.com> 1327530615 -0500

Message:

Added support for EHLO response metrics

Files:

• src/modules-lua/noit/module/smtp.lua (modified) (2 diffs)

src/modules-lua/noit/module/smtp.lua

@@ -144 +144 @@
-    local elapsed_ms = math.floor(tostring(elapsed) * 1000)
-    check.metric(phase .. "_time",  elapsed_ms)
+
+    if phase == 'ehlo' and message ~= nil then
+      local fields = string.split(message, "\r\n")
+      if fields ~= nil then
+        local response = ""
+        local extensions = ""
+        if fields[1] ~= nil then
+          response = fields[1]
+          check.metric("ehlo_response_banner", response)
+        end
+        if expected_code == actual_code and fields[1] ~= nil then
+          table.remove(fields, 1)
+          for line, value in pairs(fields) do
+            if value ~= nil and value ~= "" then
+              value = value:gsub("^%s*(.-)%s*$", "%1")
+              local subfields = string.split(value, "%s+", 1)
+              if subfields ~= nil and subfields[1] ~= nil then
+                local header = subfields[1]
+                if subfields[2] ~= nil then
+                  check.metric("ehlo_response_" .. string.lower(header), subfields[2])
+                else
+                  check.metric("ehlo_response_" .. string.lower(header), 'true')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
-    return success
-  end
@@ -214 +243 @@
-end
-
+-- from http://www.wellho.net/resources/ex.php4?item=u108/split
+-- modified to split up to 'max' times
+function string:split(delimiter, max)
+  local result = { }
+  local from  = 1
+  local delim_from, delim_to = string.find( self, delimiter, from  )
+  local nb = 0
+  if max == nil then
+    max = 0
+  end
+  while delim_from do
+    local insert_string = string.sub( self, from , delim_from-1 )
+    nb = nb + 1
+    table.insert( result, insert_string )
+    from  = delim_to + 1
+    delim_from, delim_to = string.find( self, delimiter, from  )
+    if nb == max then
+      break
+    end
+  end
+  local last_res = string.sub (self, from)
+  if last_res ~= nil and last_res ~= "" then
+    table.insert( result, last_res )
+  end
+  return result
+end
+