Update the auto-discovery scripts.

Refs #5855

diff --git a/contrib/discover-snmp.py b/contrib/discover-snmp.py
index 61d9c5fb76a2602adc311850d8b49dde17b86c88..c74b17ed4ca015c4905bb434135e0ba818a25f44 100755 (executable)
--- a/contrib/discover-snmp.py
+++ b/contrib/discover-snmp.py
@@ -53,10 +53,10 @@ for plugin in plugins:
     print("  import \"snmp-extend-service\",")
     print()
     print("  check_command = \"snmp-extend\",")
-    print("  macros.community = \"%s\"," % (community))
-    print("  macros.plugin = \"%s\"," % (plugin))
+    print("  vars.community = \"%s\"," % (community))
+    print("  vars.plugin = \"%s\"," % (plugin))
     print()
-    print("  assign where host.macros.address == \"%s\"" % (ipaddr))
+    print("  assign where host.vars.address == \"%s\"" % (ipaddr))
     print("}")
     print()
 

diff --git a/contrib/discover.py b/contrib/discover.py
index a24d35f41ca06f60653bbab4444ada376f39debd..79744acfd4446153bfb61bd362d7fe2a369ba27a 100755 (executable)
--- a/contrib/discover.py
+++ b/contrib/discover.py
@@ -109,7 +109,7 @@ def print_host(host):
     print "object Host \"%s\" {" % (host["name"])
     print "\timport \"discovered-host\","
     print ""
-    print "\tmacros.address = \"%s\"," % (host["address"])
+    print "\tvars.address = \"%s\"," % (host["address"])
     print "}"
     print ""
 
@@ -119,7 +119,7 @@ def print_host(host):
         print ""
         print "\tcheck_command = \"%s\"," % (service["command"])
         print ""
-        print "\tmacros.port = %s" % (service["port"])
+        print "\tvars.port = %s" % (service["port"])
         print "}"
         print ""