From 418430ca9c2d92ca7cfc419fb026293238f5e407 Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Thu, 20 Mar 2014 15:59:33 -0600 Subject: [PATCH] Fix template indentation. --- metadata.rb | 2 +- templates/default/mon-thresh-config.yml.erb | 45 ++++++++++----------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/metadata.rb b/metadata.rb index 3a0bb64..60f4235 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,4 +4,4 @@ maintainer_email "hpcs-mon@hp.com" license 'All rights reserved' description 'Installs/Configures mon_thresh' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.1' +version '0.1.2' diff --git a/templates/default/mon-thresh-config.yml.erb b/templates/default/mon-thresh-config.yml.erb index 02c6a9d..2a1bcc5 100755 --- a/templates/default/mon-thresh-config.yml.erb +++ b/templates/default/mon-thresh-config.yml.erb @@ -4,8 +4,6 @@ metricSpoutTasks: 1 # log location? node['mon_thresh']['log_dir'] metricSpoutConfig: - - #Kafka settings. kafkaConsumerConfiguration: # See http://kafka.apache.org/documentation.html#api for semantics and defaults. topic: <%= @settings['kafka']['metric']['topic'] %> @@ -33,7 +31,6 @@ metricSpoutConfig: eventSpoutConfig: - #Kafka settings. kafkaConsumerConfiguration: # See http://kafka.apache.org/documentation.html#api for semantics and defaults. topic: <%= @settings['kafka']['event']['consumer_topic'] %> @@ -60,27 +57,27 @@ eventSpoutConfig: zookeeperSyncTimeMs: 2000 - kafkaProducerConfiguration: - # See http://kafka.apache.org/documentation.html#api for semantics and defaults. - topic: <%= @settings['kafka']['event']['producer_topic'] %> - metadataBrokerList: <%= @settings['kafka']['event']['host'] %> - serializerClass: kafka.serializer.StringEncoder - partitionerClass: - requestRequiredAcks: 1 - requestTimeoutMs: 10000 - producerType: sync - keySerializerClass: - compressionCodec: none - compressedTopics: - messageSendMaxRetries: 3 - retryBackoffMs: 100 - topicMetadataRefreshIntervalMs: 600000 - queueBufferingMaxMs: 5000 - queueBufferingMaxMessages: 10000 - queueEnqueueTimeoutMs: -1 - batchNumMessages: 200 - sendBufferBytes: 102400 - clientId : Threshold_Engine +kafkaProducerConfiguration: + # See http://kafka.apache.org/documentation.html#api for semantics and defaults. + topic: <%= @settings['kafka']['event']['producer_topic'] %> + metadataBrokerList: <%= @settings['kafka']['event']['host'] %> + serializerClass: kafka.serializer.StringEncoder + partitionerClass: + requestRequiredAcks: 1 + requestTimeoutMs: 10000 + producerType: sync + keySerializerClass: + compressionCodec: none + compressedTopics: + messageSendMaxRetries: 3 + retryBackoffMs: 100 + topicMetadataRefreshIntervalMs: 600000 + queueBufferingMaxMs: 5000 + queueBufferingMaxMessages: 10000 + queueEnqueueTimeoutMs: -1 + batchNumMessages: 200 + sendBufferBytes: 102400 + clientId : Threshold_Engine sporadicMetricNamespaces: