summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2013-10-16 11:34:47 -0700
committerClark Boylan <clark.boylan@gmail.com>2013-10-21 10:17:48 -0700
commitd69b469b11757b334f600a7718512ec86683528a (patch)
tree744e49d30460fb809a2e62f1a6bda777841211ed
parentc7932eaf206b16dbdce61f517d991b8c69b1a021 (diff)
Upgrade Logstash to 1.2.1.
* modules/logstash/manifests/init.pp: Download and install Logstash 1.2.1. * modules/openstack_project/files/logstash/log-gearman-client.py: Logstash 1.2.1 comes with a new schema. Update the job data sent to log push workers to better accomodate the new schema. * modules/openstack_project/files/logstash/log-gearman-worker.py: Push Logstash 1.2.1 schema compliant JSON to the Logstash TCP input. * modules/openstack_project/templates/logstash/indexer.conf.erb: Logstash 1.2.1 comes with a new schema and many input and filter changes. Use the newly supported features like conditionals to keep the config up to date. * modules/kibana/templates/config.rb.erb: Change the default field for kibana to 'message'. It was @message which is deprecated in the new logstash schema. Change-Id: Id19fc05bcce8d42c5c0cf33df3da7e95f5794107
-rwxr-xr-xtemplates/config.rb.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/config.rb.erb b/templates/config.rb.erb
index b59843e..2917ca9 100755
--- a/templates/config.rb.erb
+++ b/templates/config.rb.erb
@@ -40,7 +40,7 @@ module KibanaConfig
40 40
41 # Change which fields are shown by default. Must be set as an array 41 # Change which fields are shown by default. Must be set as an array
42 # Default_fields = ['@fields.vhost','@fields.response','@fields.request'] 42 # Default_fields = ['@fields.vhost','@fields.response','@fields.request']
43 Default_fields = ['@message'] 43 Default_fields = ['message']
44 44
45 # If set to true, Kibana will use the Highlight feature of Elasticsearch to 45 # If set to true, Kibana will use the Highlight feature of Elasticsearch to
46 # display highlighted search results 46 # display highlighted search results
@@ -49,7 +49,7 @@ module KibanaConfig
49 # A field needs to be specified for the highlight feature. By default, 49 # A field needs to be specified for the highlight feature. By default,
50 # Elasticsearch doesn't allow highlighting on _all because the field has to 50 # Elasticsearch doesn't allow highlighting on _all because the field has to
51 # be either stored or part of the _source field. 51 # be either stored or part of the _source field.
52 Highlighted_field = "@message" 52 Highlighted_field = "message"
53 53
54 # Make URLs clickable in detailed view 54 # Make URLs clickable in detailed view
55 Clickable_URLs = true 55 Clickable_URLs = true
@@ -122,10 +122,10 @@ module KibanaConfig
122 # field called _all that is searched when no field is specified. 122 # field called _all that is searched when no field is specified.
123 # Dropping _all can reduce index size significantly. If you do that 123 # Dropping _all can reduce index size significantly. If you do that
124 # you'll need to change primary_field to be '@message' 124 # you'll need to change primary_field to be '@message'
125 Primary_field = '@message' 125 Primary_field = 'message'
126 126
127 # Default Elastic Search index to query 127 # Default Elastic Search index to query
128 Default_index = '@message' 128 Default_index = 'message'
129 129
130 # TODO: This isn't functional yet 130 # TODO: This isn't functional yet
131 # Prevent wildcard search terms which result in extremely slow queries 131 # Prevent wildcard search terms which result in extremely slow queries