splunk · madhadron · Dec 1, 2012 · Nov 27, 2012 · Nov 29, 2012 · Nov 29, 2012
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 1.0
 
+* The argument order of Inputs.create has been swapped to have name first. This is consistent with
+  all other collections and all other operations on Inputs.
+* All the .contains methods on collections have been removed. Use Python's `in` operator instead.
+* Confs has been renamed to Configurations, and ConfFile to ConfigurationFile.
 * Stanza.submit now takes a dictionary of key/value pairs specifying the stanza instead of a raw string.
 * Namespace handling has changed subtly. Code that depends on namespace handling in detail may break.
 * Added User.role_entities to return a list of the actual entity objects for the

diff --git a/examples/analytics/input.py b/examples/analytics/input.py
@@ -44,9 +44,11 @@ def __init__(self, application_name, splunk_info, index = ANALYTICS_INDEX_NAME):
         if ANALYTICS_SOURCETYPE not in self.splunk.confs['props']:
             self.splunk.confs["props"].create(ANALYTICS_SOURCETYPE)
             stanza = self.splunk.confs["props"][ANALYTICS_SOURCETYPE]
-            stanza.submit("LINE_BREAKER = (%s)" % EVENT_TERMINATOR)
-            stanza.submit("CHARSET = UTF-8")
-            stanza.submit("SHOULD_LINEMERGE = false")
+            stanza.submit({
+                "LINE_BREAKER": "(%s)" % EVENT_TERMINATOR,
+                "CHARSET": "UTF-8",
+                "SHOULD_LINEMERGE": "false"
+            })
         assert(ANALYTICS_SOURCETYPE in self.splunk.confs['props'])
 
     @staticmethod

diff --git a/examples/conf.py b/examples/conf.py
@@ -43,6 +43,8 @@ def create(self, opts):
             kvpair = argv[2].split("=")
             if len(kvpair) != 2:
                 error("Creating a k/v pair requires key and value", 2)
+            else:
+                key, value = kvpair
 
         if not cpres and not spres:
             error("Conf name and stanza name is required for create", 2)
@@ -58,7 +60,7 @@ def create(self, opts):
 
         # create key/value pair under existing stanza
         stanza = conf[stan]
-        stanza.submit(argv[2])
+        stanza.submit({key: value})
 
 
     def delete(self, opts):

diff --git a/examples/index.py b/examples/index.py
@@ -67,7 +67,7 @@ def create(self, argv):
 
         name = argv[0]
 
-        if self.service.indexes.contains(name):
+        if name in self.service.indexes:
             print "Index '%s' already exists" % name
             return
 
@@ -131,7 +131,7 @@ def foreach(self, argv, func):
         if len(opts.args) == 0:
             error("Command requires an index name", 2)
         for name in opts.args:
-            if not self.service.indexes.contains(name):
+            if name not in self.service.indexes:
                 error("Index '%s' does not exist" % name, 2)
             index = self.service.indexes[name]
             func(index)
@@ -143,7 +143,7 @@ def update(self, argv):
             error("Command requires an index name", 2)
         name = argv[0]
 
-        if not self.service.indexes.contains(name):
+        if name not in self.service.indexes:
             error("Index '%s' does not exist" % name, 2)
         index = self.service.indexes[name]
 

diff --git a/examples/stail.py b/examples/stail.py
@@ -17,11 +17,13 @@
 """Tails a realtime search using the export endpoint and prints results to
    stdout."""
 
-from pprint import pprint
 import sys
+sys.path.insert(0, '../')
+
+from pprint import pprint
 
 from splunklib.client import connect
-import splunklib.results as results
+from splunklib.results import ResultsReader
 
 import utils
 
@@ -43,13 +45,9 @@ def main():
             latest_time="rt", 
             search_mode="realtime")
 
-        reader = results.ResultsReader(result.body)
-        while True:
-            kind = reader.read()
-            if kind == None: break
-            if kind == results.RESULT:
-                event = reader.value
-                pprint(event)
+        for result in ResultsReader(result.body):
+            if result is not None:
+                print pprint(result)
 
     except KeyboardInterrupt:
         print "\nInterrupted."

diff --git a/examples/submit.py b/examples/submit.py
@@ -48,7 +48,7 @@ def main(argv):
     kwargs_splunk = dslice(opts.kwargs, FLAGS_SPLUNK)
     service = client.connect(**kwargs_splunk)
 
-    if not service.indexes.contains(index):
+    if index not in service.indexes:
         error("Index '%s' does not exist." % index, 2)
 
     kwargs_submit = dslice(opts.kwargs, 
@@ -69,7 +69,7 @@ def main(argv):
     cn = service.indexes[index].attach(**kwargs_submit)
     try:
         while True:
-            line = sys.stdin.readline()
+            line = sys.stdin.readline().rstrip('\r\n')
             if len(line) == 0: break
             cn.write(line)
     finally:

diff --git a/examples/twitted/input.py b/examples/twitted/input.py
@@ -245,15 +245,15 @@ def main():
     service = client.connect(**kwargs)
 
     # Create the index if it doesn't exist
-    if not service.indexes.contains("twitter"):
+    if 'twitter' not in service.indexes:
         if verbose > 0: print "Creating index 'twitter' .."
         service.indexes.create("twitter")
 
     # Create the TCP input if it doesn't exist
     input_host = kwargs.get("inputhost", DEFAULT_SPLUNK_HOST)
     input_port = int(kwargs.get("inputport", DEFAULT_SPLUNK_PORT))
     input_name = str(input_port)
-    if not service.inputs.contains(input_name):
+    if input_name not in service.inputs:
         if verbose > 0: print "Creating input '%s'" % input_name
         service.inputs.create(
             "tcp", input_port, index="twitter", sourcetype="twitter")

diff --git a/examples/upload.py b/examples/upload.py
@@ -59,7 +59,7 @@ def main(argv):
     service = client.connect(**kwargs_splunk)
 
     name = opts.kwargs['index']
-    if not service.indexes.contains(name):
+    if name not in service.indexes:
         error("Index '%s' does not exist." % name, 2)
     index = service.indexes[name]