Skip to content

Commit 25e8613

Browse files
author
Frederick Ross
committed
Fixed examples after running them by hand.
Some got missed. Reran them and fixed them all.
1 parent 40512e3 commit 25e8613

File tree

4 files changed

+24
-19
lines changed

4 files changed

+24
-19
lines changed

examples/abc/b.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
"""Retrieves a list of installed apps from Splunk using the binding module."""
1616

17+
import sys, os
18+
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
19+
1720
from xml.etree import ElementTree
1821

1922
import splunklib.binding as binding

examples/abc/c.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# under the License.
1414

1515
"""Retrieves a list of installed apps from Splunk using the client module."""
16+
import sys, os
17+
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
1618

1719
import splunklib.client as client
1820

examples/dashboard/feed.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ def iterate(job):
6060
reader = results.ResultsReader(job.preview())
6161
data = []
6262

63-
for kind,result in reader:
64-
if kind == results.RESULT:
63+
for result in reader:
64+
if isinstance(result, dict):
6565
status_source_xml = result["status_source"].strip()
6666
source = status_source_xml
67-
if (status_source_xml.startswith("<a")):
67+
if status_source_xml.startswith("<a"):
6868
try:
6969
source = ElementTree.XML(status_source_xml).text
70-
except:
70+
except Exception, e:
7171
print status_source_xml
7272
raise e
7373

@@ -78,7 +78,7 @@ def iterate(job):
7878

7979
send_data(access_key = leftronic_access_key, stream_name = "top_sources", point = { "leaderboard": data })
8080

81-
return (created_job, lambda job: iterate(job))
81+
return created_job, lambda job: iterate(job)
8282

8383
def geo(service):
8484
query = "search index=twitter coordinates_type=Point coordinates_coordinates=* | fields coordinates_coordinates"
@@ -87,8 +87,8 @@ def geo(service):
8787
def iterate(job):
8888
reader = results.ResultsReader(job.preview())
8989
points = []
90-
for kind,result in reader:
91-
if kind == results.RESULT:
90+
for result in reader:
91+
if isinstance(result, dict):
9292
lng, lat = result["coordinates_coordinates"].split(",")
9393
point = {
9494
"latitude": lat,
@@ -100,16 +100,16 @@ def iterate(job):
100100
send_data(access_key = leftronic_access_key, stream_name = "geo", command = "clear")
101101
send_data(access_key = leftronic_access_key, stream_name = "geo", point = points)
102102

103-
return (created_job, lambda job: iterate(job))
103+
return created_job, lambda job: iterate(job)
104104

105105
def tweets(service):
106106
query = "search index=twitter | head 15 | fields user_name, user_screen_name, text, user_profile_image_url "
107107
created_job = service.jobs.create(query, search_mode="realtime", earliest_time="rt-5m", latest_time="rt")
108108

109109
def iterate(job):
110110
reader = results.ResultsReader(job.preview())
111-
for kind,result in reader:
112-
if kind == results.RESULT:
111+
for result in reader:
112+
if isinstance(result, dict):
113113
user = result.get("user_name", result.get("user_screen_name", ""))
114114
text = result.get("text", "")
115115
img = result.get("user_profile_image_url", "")
@@ -121,16 +121,16 @@ def iterate(job):
121121

122122
send_data(access_key = leftronic_access_key, stream_name = "tweets", point = point)
123123

124-
return (created_job, lambda job: iterate(job))
124+
return created_job, lambda job: iterate(job)
125125

126126
def counts(service):
127127
query = "search index=twitter | stats count by user_id | fields user_id, count | stats count(user_id) as user_count, sum(count) as tweet_count"
128128
created_job = service.jobs.create(query, search_mode="realtime", earliest_time="rt-5m", latest_time="rt")
129129

130130
def iterate(job):
131131
reader = results.ResultsReader(job.preview())
132-
for kind,result in reader:
133-
if kind == results.RESULT:
132+
for result in reader:
133+
if isinstance(result, dict):
134134
user_count = result["user_count"]
135135
tweet_count = result.get("tweet_count", 0)
136136

@@ -142,7 +142,7 @@ def iterate(job):
142142
point = int(tweet_count)
143143
send_data(access_key = leftronic_access_key, stream_name = "tweets_count_5m", point = point)
144144

145-
return (created_job, lambda job: iterate(job))
145+
return created_job, lambda job: iterate(job)
146146

147147
def top_tags(service):
148148
query = 'search index=twitter text=* | rex field=text max_match=1000 "#(?<tag>\w{1,})" | fields tag | mvexpand tag | top 5 tag'
@@ -152,8 +152,8 @@ def iterate(job):
152152
reader = results.ResultsReader(job.preview())
153153
data = []
154154

155-
for kind,result in reader:
156-
if kind == results.RESULT:
155+
for result in reader:
156+
if isinstance(result, dict):
157157
tag = result["tag"]
158158
count = result["count"]
159159

@@ -164,7 +164,7 @@ def iterate(job):
164164

165165
send_data(access_key = leftronic_access_key, stream_name = "top_tags", point = { "leaderboard": data })
166166

167-
return (created_job, lambda job: iterate(job))
167+
return created_job, lambda job: iterate(job)
168168

169169
def main(argv):
170170
# Parse the command line args.

examples/twitted/input.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ def main():
254254

255255
# Create the TCP input if it doesn't exist
256256
input_host = kwargs.get("inputhost", DEFAULT_SPLUNK_HOST)
257-
input_port = int(kwargs.get("inputport", DEFAULT_SPLUNK_PORT))
257+
input_port = kwargs.get("inputport", DEFAULT_SPLUNK_PORT)
258258
input_name = str(input_port)
259259
if input_name not in service.inputs:
260260
if verbose > 0: print "Creating input '%s'" % input_name
261261
service.inputs.create(
262-
"tcp", input_port, index="twitter", sourcetype="twitter")
262+
input_port, "tcp", index="twitter", sourcetype="twitter")
263263

264264
global ingest
265265
ingest = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

0 commit comments

Comments
 (0)