TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further refactoring of inputs.

Browse Source
This commit is contained in:
Jonathan Preddy
2014-07-23 11:16:56 -04:00
parent ecf75282cd
commit 4422fd0509
10 changed files with 106 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
TimberWinR.UnitTests/Configuration.cs
View File

@@ -17,49 +17,42 @@ namespace TimberWinR.UnitTests
public void OutputEvents()
{
foreach (var evt in c.Events.ToArray())
{
foreach (var evt in c.Events)
Console.WriteLine(evt);
}
}
public void OutputLogs()
{
foreach (var log in c.Logs.ToArray())
{
foreach (var log in c.Logs)
Console.WriteLine(log);
}
}
public void OutputIIS()
{
foreach (var iis in c.IIS.ToArray())
{
foreach (var iis in c.IIS)
Console.WriteLine(iis);
}
}
public void OutputIISW3C()
{
foreach (var iisw3c in c.IISW3C.ToArray())
{
foreach (var iisw3c in c.IISW3C)
Console.WriteLine(iisw3c);
}
}
public void OutputGroks()
public void OutputFilters()
{
//IEnumerable<FilterBase> filters = c.Filters;
//foreach (var grok in c.Filters)
// Console.WriteLine(grok);
foreach (var filter in c.Filters)
Console.WriteLine(filter);
}
[Test]
public void Test1()
public void Output()
{
Assert.AreEqual(c.Logs.ToArray()[1].Name, "Second Set");
OutputEvents();
OutputLogs();
OutputIIS();
OutputIISW3C();
OutputFilters();
}
[Test]
@@ -226,7 +219,6 @@ namespace TimberWinR.UnitTests
bool fullEventCode = false;
string direction = "FW";
string stringsSep = "|";
string iCheckpoint;
string binaryFormat = "PRINT";
TimberWinR.Inputs.WindowsEvent evt = c.Events.ToArray()[0];
@@ -251,7 +243,6 @@ namespace TimberWinR.UnitTests
int iCodepage = 0;
int recurse = 0;
bool splitLongLines = false;
string iCheckpoint;
TimberWinR.Inputs.TailFileInput log = c.Logs.ToArray()[0];
@@ -299,11 +290,9 @@ namespace TimberWinR.UnitTests
string location = @"c:\inetpub\logs\LogFiles\W3SVC1\*";
int iCodepage = -2;
int recurse = 0;
string minDateMod;
bool dQuotes = false;
bool dirTime = false;
bool consolidateLogs = false;
string iCheckpoint;
TimberWinR.Inputs.IISW3CLog iisw3c = c.IISW3C.ToArray()[0];
@@ -315,7 +304,7 @@ namespace TimberWinR.UnitTests
Assert.AreEqual(dQuotes, iisw3c.DQuotes);
Assert.AreEqual(dirTime, iisw3c.DirTime);
Assert.AreEqual(consolidateLogs, iisw3c.ConsolidateLogs);
Assert.IsNull(iisw3c.ICheckpoint);
Assert.IsEmpty(iisw3c.ICheckpoint);
}
}
}

1
TimberWinR/Configuration.cs
View File

@@ -180,7 +180,6 @@ namespace TimberWinR
break;
default:
throw new Exception(string.Format("Unknown tag: {0}", e.Name.ToString()));
break;
}
}
}

15
TimberWinR/Filters/DateFilter.cs
View File

@@ -48,21 +48,6 @@ namespace TimberWinR.Filters
}
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("DateFilter\n");
foreach (var prop in this.GetType().GetProperties())
{
if (prop != null)
{
sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null)));
}
}
return sb.ToString();
}
public override void Apply(JObject json)
{
JToken token = null;

19
TimberWinR/Filters/FilterBase.cs
View File

@@ -41,6 +41,23 @@ namespace TimberWinR.Filters
}
}
return retValue;
}
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append(String.Format("{0}\n", this.GetType().ToString()));
foreach (var prop in this.GetType().GetProperties())
{
if (prop != null)
{
sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null)));
}
}
return sb.ToString();
}
}
}

16
TimberWinR/Filters/GrokFilter.cs
View File

@@ -35,6 +35,8 @@ namespace TimberWinR.Filters
AddFields = new List<FieldValuePair>();
RemoveFields = new List<string>();
DropIfMatch = ParseBoolAttribute(parent, "dropIfMatch", false);
ParseMatch(parent);
ParseAddFields(parent);
ParseDropIfMatch(parent);
@@ -134,20 +136,6 @@ namespace TimberWinR.Filters
}
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("GrokFilter\n");
foreach (var prop in this.GetType().GetProperties())
{
if (prop != null)
{
sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null)));
}
}
return sb.ToString();
}
public override void Apply(Newtonsoft.Json.Linq.JObject json)
{
JToken token = null;

176
TimberWinR/Inputs/IISLog.cs
View File

@@ -10,14 +10,12 @@ namespace TimberWinR.Inputs
{
public string Name { get; private set; }
public string Location { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
// Parameters
public int ICodepage { get; private set; }
public int Recurse { get; private set; }
public string MinDateMod { get; private set; }
public string Locale { get; private set; }
public string ICheckpoint { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
public static void Parse(List<IISLog> iislogs, XElement iislogElement)
{
@@ -31,154 +29,16 @@ namespace TimberWinR.Inputs
public IISLog(XElement parent)
{
ParseName(parent);
ParseLocation(parent);
// Default values for parameters.
ICodepage = -2;
Recurse = 0;
Locale = "DEF";
ParseICodepage(parent);
ParseRecurse(parent);
ParseMinDateMod(parent);
ParseLocale(parent);
ParseICheckpoint(parent);
Name = ParseRequiredStringAttribute(parent, "name");
Location = ParseRequiredStringAttribute(parent, "location");
ICodepage = ParseIntAttribute(parent, "iCodepage", -2);
Recurse = ParseIntAttribute(parent, "recurse", 0);
MinDateMod = ParseDateAttribute(parent, "minDateMod");
Locale = ParseStringAttribute(parent, "locale", "DEF");
ICheckpoint = ParseStringAttribute(parent, "iCheckpoint");
ParseFields(parent);
}
private void ParseName(XElement parent)
{
string attributeName = "name";
try
{
XAttribute a = parent.Attribute(attributeName);
Name = a.Value;
}
catch
{
throw new TimberWinR.ConfigurationErrors.MissingRequiredAttributeException(parent, attributeName);
}
}
private void ParseLocation(XElement parent)
{
string attributeName = "location";
try
{
XAttribute a = parent.Attribute(attributeName);
Location = a.Value;
}
catch
{
throw new TimberWinR.ConfigurationErrors.MissingRequiredAttributeException(parent, attributeName);
}
}
private void ParseICodepage(XElement parent)
{
string attributeName = "iCodepage";
int valInt;
try
{
XAttribute a = parent.Attribute(attributeName);
if (int.TryParse(a.Value, out valInt))
{
ICodepage = valInt;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeIntegerValueException(a);
}
}
catch
{
}
}
private void ParseRecurse(XElement parent)
{
string attributeName = "recurse";
int valInt;
try
{
XAttribute a = parent.Attribute(attributeName);
if (int.TryParse(a.Value, out valInt))
{
Recurse = valInt;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeIntegerValueException(a);
}
}
catch
{
}
}
private void ParseMinDateMod(XElement parent)
{
string attributeName = "minDateMod";
try
{
XAttribute a = parent.Attribute(attributeName);
DateTime dt;
if (DateTime.TryParseExact(a.Value,
"yyyy-MM-dd hh:mm:ss",
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out dt))
{
MinDateMod = a.Value;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeDateValueException(a);
}
Locale = a.Value;
}
catch { }
}
private void ParseLocale(XElement parent)
{
string attributeName = "locale";
try
{
XAttribute a = parent.Attribute(attributeName);
Locale = a.Value;
}
catch { }
}
private void ParseICheckpoint(XElement parent)
{
string attributeName = "iCheckpoint";
try
{
XAttribute a = parent.Attribute(attributeName);
ICheckpoint = a.Value;
}
catch { }
}
private void ParseFields(XElement parent)
{
Dictionary<string, Type> allPossibleFields = new Dictionary<string, Type>()
@@ -205,25 +65,5 @@ namespace TimberWinR.Inputs
Fields = base.parseFields(parent, allPossibleFields);
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("IISLog\n");
sb.Append(String.Format("Name: {0}\n", Name));
sb.Append(String.Format("Location: {0}\n", Location));
sb.Append("Fields:\n");
foreach (FieldDefinition f in Fields)
{
sb.Append(String.Format("\t{0}\n", f.Name));
}
sb.Append("Parameters:\n");
sb.Append(String.Format("\tiCodepage: {0}\n", ICodepage));
sb.Append(String.Format("\trecurse: {0}\n", Recurse));
sb.Append(String.Format("\tminDateMod: {0}\n", MinDateMod));
sb.Append(String.Format("\tlocale: {0}\n", Locale));
sb.Append(String.Format("\tiCheckpoint: {0}\n", ICheckpoint));
return sb.ToString();
}
}
}

223
TimberWinR/Inputs/IISW3CLog.cs
View File

@@ -9,9 +9,6 @@ namespace TimberWinR.Inputs
{
public string Name { get; private set; }
public string Location { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
// Parameters
public int ICodepage { get; private set; }
public int Recurse { get; private set; }
public string MinDateMod { get; private set; }
@@ -19,6 +16,7 @@ namespace TimberWinR.Inputs
public bool DirTime { get; private set; }
public bool ConsolidateLogs { get; private set; }
public string ICheckpoint { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
public static void Parse(List<IISW3CLog> iisw3clogs, XElement iisw3clogElement)
{
@@ -32,198 +30,17 @@ namespace TimberWinR.Inputs
public IISW3CLog(XElement parent)
{
ParseName(parent);
ParseLocation(parent);
// Default values for parameters.
ICodepage = -2;
Recurse = 0;
DQuotes = false;
DirTime = false;
ConsolidateLogs = false;
ParseICodepage(parent);
ParseRecurse(parent);
ParseDQuotes(parent);
ParseDirTime(parent);
ParseConsolidateLogs(parent);
ParseICheckpoint(parent);
Name = ParseRequiredStringAttribute(parent, "name");
Location = ParseRequiredStringAttribute(parent, "location");
ICodepage = ParseIntAttribute(parent, "iCodepage", -2);
Recurse = ParseIntAttribute(parent, "recurse", 0);
DQuotes = ParseBoolAttribute(parent, "dQuotes", false);
DirTime = ParseBoolAttribute(parent, "dirTime", false);
ConsolidateLogs = ParseBoolAttribute(parent, "consolidateLogs", false);
ICheckpoint = ParseStringAttribute(parent, "iCheckpoint");
ParseFields(parent);
}
private void ParseName(XElement parent)
{
string attributeName = "name";
try
{
XAttribute a = parent.Attribute(attributeName);
Name = a.Value;
}
catch
{
throw new TimberWinR.ConfigurationErrors.MissingRequiredAttributeException(parent, attributeName);
}
}
private void ParseLocation(XElement parent)
{
string attributeName = "location";
try
{
XAttribute a = parent.Attribute(attributeName);
Location = a.Value;
}
catch
{
throw new TimberWinR.ConfigurationErrors.MissingRequiredAttributeException(parent, attributeName);
}
}
private void ParseICodepage(XElement parent)
{
string attributeName = "iCodepage";
int valInt;
try
{
XAttribute a = parent.Attribute(attributeName);
if (int.TryParse(a.Value, out valInt))
{
ICodepage = valInt;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeIntegerValueException(a);
}
}
catch
{
}
}
private void ParseRecurse(XElement parent)
{
string attributeName = "recurse";
int valInt;
try
{
XAttribute a = parent.Attribute(attributeName);
if (int.TryParse(a.Value, out valInt))
{
Recurse = valInt;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeIntegerValueException(a);
}
}
catch
{
}
}
private void ParseDQuotes(XElement parent)
{
string attributeName = "dQuotes";
string value;
try
{
XAttribute a = parent.Attribute(attributeName);
value = a.Value;
if (value == "ON" || value == "true")
{
DQuotes = true;
}
else if (value == "OFF" || value == "false")
{
DQuotes = false;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeValueException(parent.Attribute(attributeName));
}
}
catch { }
}
private void ParseDirTime(XElement parent)
{
string attributeName = "dirTime";
string value;
try
{
XAttribute a = parent.Attribute(attributeName);
value = a.Value;
if (value == "ON" || value == "true")
{
DirTime = true;
}
else if (value == "OFF" || value == "false")
{
DirTime = false;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeValueException(parent.Attribute(attributeName));
}
}
catch { }
}
private void ParseConsolidateLogs(XElement parent)
{
string attributeName = "consolidateLogs";
string value;
try
{
XAttribute a = parent.Attribute(attributeName);
value = a.Value;
if (value == "ON" || value == "true")
{
ConsolidateLogs = true;
}
else if (value == "OFF" || value == "false")
{
ConsolidateLogs = false;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeValueException(parent.Attribute(attributeName));
}
}
catch { }
}
private void ParseICheckpoint(XElement parent)
{
string attributeName = "iCheckpoint";
try
{
XAttribute a = parent.Attribute(attributeName);
ICheckpoint = a.Value;
}
catch { }
}
private void ParseFields(XElement parent)
{
Dictionary<string, Type> allPossibleFields = new Dictionary<string, Type>()
@@ -265,27 +82,5 @@ namespace TimberWinR.Inputs
Fields = base.parseFields(parent, allPossibleFields);
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("IISW3CLog\n");
sb.Append(String.Format("Name: {0}\n", Name));
sb.Append(String.Format("Location: {0}\n", Location));
sb.Append("Fields:\n");
foreach (FieldDefinition f in Fields)
{
sb.Append(String.Format("\t{0}\n", f.Name));
}
sb.Append("Parameters:\n");
sb.Append(String.Format("\tiCodepage: {0}\n", ICodepage));
sb.Append(String.Format("\trecurse: {0}\n", Recurse));
sb.Append(String.Format("\tminDateMod: {0}\n", MinDateMod));
sb.Append(String.Format("\tdQuotes: {0}\n", DQuotes));
sb.Append(String.Format("\tdirTime: {0}\n", DirTime));
sb.Append(String.Format("\tconsolidateLogs: {0}\n", ConsolidateLogs));
sb.Append(String.Format("\tiCheckpoint: {0}\n", ICheckpoint));
return sb.ToString();
}
}
}

56
TimberWinR/Inputs/InputBase.cs
View File

@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace TimberWinR.Inputs
@@ -71,13 +73,36 @@ namespace TimberWinR.Inputs
return retValue;
}
protected static string ParseDateAttribute(XElement e, string attributeName, string defaultValue = "")
{
string retValue = defaultValue;
XAttribute a = e.Attribute(attributeName);
if (a != null)
{
DateTime dt;
if (DateTime.TryParseExact(a.Value,
"yyyy-MM-dd hh:mm:ss",
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out dt))
{
retValue = a.Value;
}
else
{
throw new TimberWinR.ConfigurationErrors.InvalidAttributeDateValueException(a);
}
}
return retValue;
}
protected static bool ParseRequiredBoolAttribute(XElement e, string attributeName)
{
XAttribute a = e.Attribute(attributeName);
if (a == null)
throw new TimberWinR.ConfigurationErrors.InvalidAttributeValueException(e.Attribute(attributeName));
bool retValue = false;
switch (a.Value)
{
case "ON":
@@ -87,7 +112,6 @@ namespace TimberWinR.Inputs
case "OFF":
case "false":
return false;
break;
default:
throw new TimberWinR.ConfigurationErrors.InvalidAttributeValueException(e.Attribute(attributeName));
@@ -143,6 +167,32 @@ namespace TimberWinR.Inputs
}
}
return retValue;
}
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append(String.Format("{0}\n", this.GetType().ToString()));
sb.Append("Parameters:\n");
foreach (var prop in this.GetType().GetProperties())
{
if (prop != null)
{
if (prop.Name == "Fields")
{
sb.Append(String.Format("{0}:\n", prop.Name));
foreach (FieldDefinition f in (List<FieldDefinition>)prop.GetValue(this, null))
{
sb.Append(String.Format("\t{0}\n", f.Name));
}
}
else
{
sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null)));
}
}
}
return sb.ToString();
}
}
}

20
TimberWinR/Inputs/TailFileInput.cs
View File

@@ -9,12 +9,10 @@ namespace TimberWinR.Inputs
{
public string Name { get; private set; }
public string Location { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
// Parameters
public int ICodepage { get; private set; }
public int Recurse { get; private set; }
public bool SplitLongLines { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
public static void Parse(List<TailFileInput> logs, XElement logElement)
{
@@ -48,21 +46,5 @@ namespace TimberWinR.Inputs
Fields = base.parseFields(parent, allPossibleFields);
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("TextLog\n");
sb.Append(String.Format("Name: {0}\n", Name));
sb.Append(String.Format("Location: {0}\n", Location));
sb.Append("Fields:\n");
foreach (FieldDefinition f in Fields)
sb.Append(String.Format("\t{0}\n", f.Name));
sb.Append("Parameters:\n");
sb.Append(String.Format("\tiCodepage: {0}\n", ICodepage));
sb.Append(String.Format("\trecurse: {0}\n", Recurse));
sb.Append(String.Format("\tsplitLongLines: {0}\n", SplitLongLines));
return sb.ToString();
}
}
}

27
TimberWinR/Inputs/WindowsEvent.cs
View File

@@ -9,9 +9,6 @@ namespace TimberWinR.Inputs
public class WindowsEvent : InputBase
{
public string Source { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
// Parameters
public bool FullText { get; private set; }
public bool ResolveSIDS { get; private set; }
public bool FormatMsg { get; private set; }
@@ -21,6 +18,7 @@ namespace TimberWinR.Inputs
public string StringsSep { get; private set; }
public string ICheckpoint { get; private set; }
public string BinaryFormat { get; private set; }
public List<FieldDefinition> Fields { get; private set; }
public static void Parse(List<WindowsEvent> events, XElement eventElement)
{
@@ -70,28 +68,5 @@ namespace TimberWinR.Inputs
Fields = base.parseFields(parent, allPossibleFields);
}
public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("WindowsEvent\n");
sb.Append(String.Format("Source: {0}\n", Source));
sb.Append("Fields:\n");
foreach (FieldDefinition f in Fields)
{
sb.Append(String.Format("\t{0}\n", f.Name));
}
sb.Append("Parameters:\n");
sb.Append(String.Format("\tfullText: {0}\n", FullText));
sb.Append(String.Format("\tresolveSIDS: {0}\n", ResolveSIDS));
sb.Append(String.Format("\tformatMsg: {0}\n", FormatMsg));
sb.Append(String.Format("\tmsgErrorMode: {0}\n", MsgErrorMode));
sb.Append(String.Format("\tfullEventCode: {0}\n", FullEventCode));
sb.Append(String.Format("\tdirection: {0}\n", Direction));
sb.Append(String.Format("\tstringsSep: {0}\n", StringsSep));
sb.Append(String.Format("\tiCheckpoint: {0}\n", ICheckpoint));
sb.Append(String.Format("\tbinaryFormat: {0}\n", BinaryFormat));
return sb.ToString();
}
}
}