From c16331ac10daed84d2ba6fe9e216f5eb75441bca Mon Sep 17 00:00:00 2001 From: Eric Fontana Date: Wed, 11 Mar 2015 10:28:13 -0400 Subject: [PATCH] Incorporated changes from reviews --- TimberWinR/Outputs/Elasticsearch.cs | 2 +- TimberWinR/Parser.cs | 2 +- TimberWinR/mdocs/ElasticsearchOutput.md | 4 ++-- chocolateyUninstall.ps1.template | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TimberWinR/Outputs/Elasticsearch.cs b/TimberWinR/Outputs/Elasticsearch.cs index 260c176..9dae391 100644 --- a/TimberWinR/Outputs/Elasticsearch.cs +++ b/TimberWinR/Outputs/Elasticsearch.cs @@ -163,7 +163,7 @@ namespace TimberWinR.Outputs { try { - // Grab all messages with same index and type + // Grab all messages with same index and type (this is the whole point, group the same ones) var bulkTypeName = this._parameters.GetTypeName(messages[0]); var bulkIndexName = this._parameters.GetIndexName(messages[0]); diff --git a/TimberWinR/Parser.cs b/TimberWinR/Parser.cs index b100526..09933cb 100644 --- a/TimberWinR/Parser.cs +++ b/TimberWinR/Parser.cs @@ -524,7 +524,7 @@ namespace TimberWinR.Parser public ElasticsearchOutputParameters() { FlushSize = 5000; - IdleFlushTimeInSeconds = 1; + IdleFlushTimeInSeconds = 10; Protocol = "http"; Port = 9200; Index = ""; diff --git a/TimberWinR/mdocs/ElasticsearchOutput.md b/TimberWinR/mdocs/ElasticsearchOutput.md index b6b93ce..3b01552 100644 --- a/TimberWinR/mdocs/ElasticsearchOutput.md +++ b/TimberWinR/mdocs/ElasticsearchOutput.md @@ -8,11 +8,11 @@ The following parameters are allowed when configuring the Redis output. | Parameter | Type | Description | Details | Default | | :-------------|:---------|:------------------------------------------------------------| :--------------------------- | :-- | | *flush_size* | integer | Maximum number of messages before flushing | | 50000 | -| *host* | [string] | The hostname(s) of your Elasticsearch server(s) | IP or DNS name | | +| *host* | [string] | Array of hostname(s) of your Elasticsearch server(s) | IP or DNS name | | | *idle_flush_time* | integer | Maximum number of seconds elapsed before triggering a flush | | 10 | | *index* | [string] | The index name to use | index used/created | logstash-yyyy.dd.mm | | *interval* | integer | Interval in milliseconds to sleep during batch sends | Interval | 5000 | -| *max_queue_size* | integer | Maximum Elasticsearch queue depth | | 50000 | +| *max_queue_size* | integer | Maximum Elasticsearch queue depth | | 5000 | | *port* | integer | Elasticsearch port number | This port must be open | 9200 | | *queue_overflow_discard_oldest* | bool | If true, discard oldest messages when max_queue_size reached otherwise discard newest | | true | | *threads* | [string] | Number of Threads | Number of worker threads processing messages | 1 | diff --git a/chocolateyUninstall.ps1.template b/chocolateyUninstall.ps1.template index 9f209d6..7659c85 100644 --- a/chocolateyUninstall.ps1.template +++ b/chocolateyUninstall.ps1.template @@ -1,7 +1,7 @@ $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages $installerType = 'msi' #only one of these: exe, msi, msu $url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url -$silentArgs = '{02388D50-DE8F-4F6E-8CEE-B93077DD77B6} /quiet' +$silentArgs = '${PROJECTGUID} /quiet' $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes