Skip to content
Snippets Groups Projects
Commit c2f9edda authored by Cristian Weiland's avatar Cristian Weiland
Browse files

Merge branch 'issue/32' into 'master'

Issue #32: Fix logstash config example typo that prevented logstash from inserting workers data

See merge request !6
parents aaf63c97 e4a1ee57
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ with open('../../configs/workers/json/config-' + sys.argv[1] + '-' + sys.argv[2] ...@@ -33,7 +33,7 @@ with open('../../configs/workers/json/config-' + sys.argv[1] + '-' + sys.argv[2]
json.dump(data, outfile, indent=4, sort_keys=True) json.dump(data, outfile, indent=4, sort_keys=True)
if int(sys.argv[1]) <= 2014 or (int(sys.argv[1]) == 2015 and int(sys.argv[2]) <= 3): if int(sys.argv[1]) <= 2014 or (int(sys.argv[1]) == 2015 and int(sys.argv[2]) <= 3):
with open('logstash_config_2013.example') as infile: with open('previous_logstash_config.example') as infile:
example = infile.read() example = infile.read()
else: else:
with open('logstash_config.example') as infile: with open('logstash_config.example') as infile:
......
...@@ -58,7 +58,7 @@ output { ...@@ -58,7 +58,7 @@ output {
action => "index" action => "index"
user => "%(user)s" user => "%(user)s"
password => "%(password)s" password => "%(password)s"
hosts => "http://$(host)s:9200" hosts => "http://%(host)s:9200"
index => "%(index)s-%(university)s-%(date)s" index => "%(index)s-%(university)s-%(date)s"
workers => 1 workers => 1
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment