From 024fa68e342c0301f7f2c47550154aea74993ad2 Mon Sep 17 00:00:00 2001 From: Eric Fontana Date: Thu, 29 Jan 2015 10:17:46 -0500 Subject: [PATCH] Removed Vistaprint references --- README.md | 2 +- TimberWinR.ServiceHost/config.json | 4 ++-- TimberWinR.ServiceHost/default.json | 2 +- TimberWinR.UnitTests/Configuration.cs | 2 +- TimberWinR.UnitTests/GrokFilterTests.cs | 14 +++++++------- TimberWinR.UnitTests/JsonFilterTests.cs | 4 ++-- TimberWinR/mdocs/ElasticsearchOutput.md | 2 +- TimberWinR/mdocs/JsonFilter.md | 2 +- TimberWinR/mdocs/RedisOutput.md | 2 +- chocolateyUninstall.ps1.template | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index d2a3f4a..4b59c30 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ If you really just want to try it out, grab the binary distribution, extract the into a directory, e.g. C:\TimberWinR Grab the [JSON example file](https://raw.githubusercontent.com/efontana/TimberWinR/master/TimberWinR.ServiceHost/default.json) and place it into C:\TimberWinR\default.json. -Edit the default.json file and change the Redis instance to match yours, replace 'tstlexiceapp006.vistaprint.svc' with the IP or DNS name +Edit the default.json file and change the Redis instance to match yours, replace 'tstlexiceapp006.mycompany.svc' with the IP or DNS name of the machine running redis. Fire up the collector, enable the verbose debugging to see some Windows Events. ``` diff --git a/TimberWinR.ServiceHost/config.json b/TimberWinR.ServiceHost/config.json index 41aec34..ca50885 100644 --- a/TimberWinR.ServiceHost/config.json +++ b/TimberWinR.ServiceHost/config.json @@ -90,7 +90,7 @@ "interval": 5000, "batch_count": 500, "host": [ - "tstlexiceapp006.vistaprint.svc" + "tstlexiceapp006.mycompany.svc" ] } ], @@ -99,7 +99,7 @@ "threads": 1, "interval": 5000, "host": [ - "tstlexiceapp003.vistaprint.svc" + "tstlexiceapp003.mycompany.svc" ] } ] diff --git a/TimberWinR.ServiceHost/default.json b/TimberWinR.ServiceHost/default.json index 043d20a..34665b7 100644 --- a/TimberWinR.ServiceHost/default.json +++ b/TimberWinR.ServiceHost/default.json @@ -33,7 +33,7 @@ "_comment": "Change the host to your Redis instance", "port": 6379, "host": [ - "logaggregator.vistaprint.svc" + "logaggregator.mycompany.svc" ] } ] diff --git a/TimberWinR.UnitTests/Configuration.cs b/TimberWinR.UnitTests/Configuration.cs index 1d67b0a..6f91f9e 100644 --- a/TimberWinR.UnitTests/Configuration.cs +++ b/TimberWinR.UnitTests/Configuration.cs @@ -85,7 +85,7 @@ namespace TimberWinR.UnitTests [{ ""host"": [ - ""logaggregator.vistaprint.svc"" + ""logaggregator.mycompany.svc"" ] }] } diff --git a/TimberWinR.UnitTests/GrokFilterTests.cs b/TimberWinR.UnitTests/GrokFilterTests.cs index dd1fa53..c1e4398 100644 --- a/TimberWinR.UnitTests/GrokFilterTests.cs +++ b/TimberWinR.UnitTests/GrokFilterTests.cs @@ -22,7 +22,7 @@ namespace TimberWinR.UnitTests {"Index", 7}, {"Text", null}, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; string grokJson = @"{ @@ -55,7 +55,7 @@ namespace TimberWinR.UnitTests Assert.IsTrue(grok.Apply(json)); // Verify host field added - Assert.AreEqual(json["host"].ToString(), "dev.vistaprint.net"); + Assert.AreEqual(json["host"].ToString(), "dev.mycompany.net"); // Verify two tags added Assert.AreEqual(json["tags"][0].ToString(), "rn_7"); @@ -71,7 +71,7 @@ namespace TimberWinR.UnitTests {"Index", 7}, {"Text", "crap"}, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; string grokJson = @"{ @@ -123,7 +123,7 @@ namespace TimberWinR.UnitTests } }, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; JObject json2 = new JObject @@ -140,7 +140,7 @@ namespace TimberWinR.UnitTests } }, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; @@ -223,7 +223,7 @@ namespace TimberWinR.UnitTests } }, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; string grokJson1 = @"{ @@ -311,7 +311,7 @@ namespace TimberWinR.UnitTests } }, {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"} + {"ComputerName", "dev.mycompany.net"} }; string grokJson = @"{ diff --git a/TimberWinR.UnitTests/JsonFilterTests.cs b/TimberWinR.UnitTests/JsonFilterTests.cs index c730b53..4521d3c 100644 --- a/TimberWinR.UnitTests/JsonFilterTests.cs +++ b/TimberWinR.UnitTests/JsonFilterTests.cs @@ -20,14 +20,14 @@ namespace TimberWinR.UnitTests JObject jsonInputLine1 = new JObject { {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"}, + {"ComputerName", "dev.mycompany.net"}, {"Text", "{\"Email\":\"james@example.com\",\"Active\":true,\"CreatedDate\":\"2013-01-20T00:00:00Z\",\"Roles\":[\"User\",\"Admin\"]}"} }; JObject jsonInputLine2 = new JObject { {"type", "Win32-FileLog"}, - {"ComputerName", "dev.vistaprint.net"}, + {"ComputerName", "dev.mycompany.net"}, {"Text", "{\"Email\":\"james@example.com\",\"Active\":true,\"CreatedDate\":\"2013-01-20T00:00:00Z\",\"Roles\":[\"User\",\"Admin\"]}"} }; diff --git a/TimberWinR/mdocs/ElasticsearchOutput.md b/TimberWinR/mdocs/ElasticsearchOutput.md index 3067cbb..af68bb0 100644 --- a/TimberWinR/mdocs/ElasticsearchOutput.md +++ b/TimberWinR/mdocs/ElasticsearchOutput.md @@ -26,7 +26,7 @@ Example Input: "threads": 1, "interval": 5000, "host": [ - "tstlexiceapp006.vistaprint.svc" + "tstlexiceapp006.mycompany.svc" ] } ] diff --git a/TimberWinR/mdocs/JsonFilter.md b/TimberWinR/mdocs/JsonFilter.md index 1e45ec0..6ee9348 100644 --- a/TimberWinR/mdocs/JsonFilter.md +++ b/TimberWinR/mdocs/JsonFilter.md @@ -61,7 +61,7 @@ The resulting output would be: ``` { "type": "Win32-FileLog", - "ComputerName": "dev.vistaprint.net", + "ComputerName": "dev.mycompany.net", "Text": "{\"Email\":\"james@example.com\",\"Active\":true,\"CreatedDate\":\"2013-01-20T00:00:00Z\",\"Roles\":[\"User\",\"Admin\"]}", "stuff": { "Email": "james@example.com", diff --git a/TimberWinR/mdocs/RedisOutput.md b/TimberWinR/mdocs/RedisOutput.md index eea0ba0..2a6af12 100644 --- a/TimberWinR/mdocs/RedisOutput.md +++ b/TimberWinR/mdocs/RedisOutput.md @@ -26,7 +26,7 @@ Example Input: "interval": 5000, "batch_count": 500, "host": [ - "tstlexiceapp006.vistaprint.svc" + "tstlexiceapp006.mycompany.svc" ] } ] diff --git a/chocolateyUninstall.ps1.template b/chocolateyUninstall.ps1.template index 7659c85..3b90ebb 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 = '${PROJECTGUID} /quiet' +$silentArgs = '{E04B4275-F698-4076-A327-E5103D7B5D17} /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