Merge pull request #65 from tableau/patch/ReplayCreation/specifyingJs…

…onKeysExplicitly 3.0.1 release
tableau · Oct 22, 2018 · d2f2c48 · d2f2c48
2 parents 23c0751 + f0cb6d9
commit d2f2c48
Show file tree

Hide file tree

Showing 36 changed files with 102 additions and 86 deletions.
diff --git a/ArtifactProcessors/TableauDesktopLogProcessor/Properties/AssemblyInfo.cs b/ArtifactProcessors/TableauDesktopLogProcessor/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Make internal classes visible to the unit test project.
 [assembly: InternalsVisibleTo("Logshark.Tests")]
diff --git a/ArtifactProcessors/TableauServerLogProcessor/Properties/AssemblyInfo.cs b/ArtifactProcessors/TableauServerLogProcessor/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Make internal classes visible to the unit test project.
 [assembly: InternalsVisibleTo("Logshark.Tests")]
diff --git a/LogParsers.Base/Properties/AssemblyInfo.cs b/LogParsers.Base/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.ArtifactProcessorModel/Properties/AssemblyInfo.cs b/Logshark.ArtifactProcessorModel/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.CLI/Properties/AssemblyInfo.cs b/Logshark.CLI/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Required for log4net.
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/Logshark.Common/Properties/AssemblyInfo.cs b/Logshark.Common/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.ConfigSection/Properties/AssemblyInfo.cs b/Logshark.ConfigSection/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Make internal classes visible to the unit test project.
 [assembly: InternalsVisibleTo("Logshark.Tests")]
diff --git a/Logshark.ConfigSectionGenerator/Properties/AssemblyInfo.cs b/Logshark.ConfigSectionGenerator/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.ConnectionModel/Properties/AssemblyInfo.cs b/Logshark.ConnectionModel/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Required for log4net.
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]

diff --git a/Logshark.Core/Properties/AssemblyInfo.cs b/Logshark.Core/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Required for log4net.
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]

diff --git a/Logshark.PluginLib/Properties/AssemblyInfo.cs b/Logshark.PluginLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.PluginModel/Properties/AssemblyInfo.cs b/Logshark.PluginModel/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Logshark.RequestModel/Properties/AssemblyInfo.cs b/Logshark.RequestModel/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Make internal classes visible to the unit test project.
 [assembly: InternalsVisibleTo("Logshark.Tests")]
diff --git a/Logshark.Tests/Properties/AssemblyInfo.cs b/Logshark.Tests/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
 
 // Required for log4net.
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/Plugins/Apache/Properties/AssemblyInfo.cs b/Plugins/Apache/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Backgrounder/Properties/AssemblyInfo.cs b/Plugins/Backgrounder/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/ClusterController/Properties/AssemblyInfo.cs b/Plugins/ClusterController/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Config/Properties/AssemblyInfo.cs b/Plugins/Config/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/CustomWorkbooks/Properties/AssemblyInfo.cs b/Plugins/CustomWorkbooks/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Filestore/Properties/AssemblyInfo.cs b/Plugins/Filestore/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Hyper/Properties/AssemblyInfo.cs b/Plugins/Hyper/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Netstat/Properties/AssemblyInfo.cs b/Plugins/Netstat/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/Postgres/Properties/AssemblyInfo.cs b/Plugins/Postgres/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Plugins/ReplayCreation/Models/AccessSessionInfo.cs b/Plugins/ReplayCreation/Models/AccessSessionInfo.cs
@@ -8,34 +8,34 @@ namespace Logshark.Plugins.ReplayCreation.Models
     /// </summary>
     internal class AccessSessionInfo
     {
-        public string apache_request_id { get; set; }
-        public string request_method { get; set; }
-        public string request_ip { get; set; }
-        public string resource { get; set; }
-        public DateTime request_time { get; set; }
-        public string load_time { get; set; }
-        public string status_code { get; set; }
+        public string ApacheRequestID { get; set; }
+        public string RequestMethod { get; set; }
+        public string RequestID { get; set; }
+        public string Resource { get; set; }
+        public DateTime RequestTime { get; set; }
+        public string LoadTime { get; set; }
+        public string StatusCode { get; set; }
 
         /// <summary>
         /// Parse logLine and extract required data from it
         /// </summary>
         /// <param name="logLine"></param>
         public AccessSessionInfo(BsonDocument logLine)
         {
-            apache_request_id = logLine.GetValue("request_id").AsString;
-            request_method = logLine.GetValue("request_method").AsString;
-            request_ip = logLine.GetValue("request_ip").AsString;
-            resource = logLine.GetValue("resource").AsString;
-            load_time = logLine.GetValue("request_time").AsString;
+            ApacheRequestID = logLine.GetValue("request_id").AsString;
+            RequestMethod = logLine.GetValue("request_method").AsString;
+            RequestID = logLine.GetValue("request_ip").AsString;
+            Resource = logLine.GetValue("resource").AsString;
+            LoadTime = logLine.GetValue("request_time").AsString;
             var offset = logLine.GetElement("ts_offset").Value.ToString();
             var timeOffSet = int.Parse(offset);
             var ts = new System.TimeSpan(timeOffSet / 100, timeOffSet % 100, 0);
 
             //convert the current time to UTC
             var browserStartTime = (DateTime)logLine.GetElement("ts").Value - ts;
-            request_time = browserStartTime.ToUniversalTime();
+            RequestTime = browserStartTime.ToUniversalTime();
 
-            status_code = logLine.GetValue("status_code").AsString;
+            StatusCode = logLine.GetValue("status_code").AsString;
         }
     }
 }
diff --git a/Plugins/ReplayCreation/Models/BrowserSession.cs b/Plugins/ReplayCreation/Models/BrowserSession.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Logshark.Plugins.ReplayCreation.Models
 {
@@ -8,27 +9,35 @@ namespace Logshark.Plugins.ReplayCreation.Models
     public class BrowserSession
     {
         //URL that is being accessed
+        [JsonProperty("Url")]
         public string Url { get; set; }
-
+
+        [JsonProperty("BrowserStartTime")]
         public string BrowserStartTime { get; set; }
 
         //user who executed the browser session
+        [JsonProperty("User")]
         public string User { get; set; }
 
         //request status
+        [JsonProperty("HttpStatus")]
         public string HttpStatus { get; set; }
 
         //AccessRequestID from access logs
+        [JsonProperty("AccessRequestID")]
         public string AccessRequestID { get; set; }
 
         //Request time showing how long it took  to load
+        [JsonProperty("LoadTime")]
         public string LoadTime { get; set; }
 
         //correlated VizqlSession matching accessRequestID
+        [JsonProperty("VizqlSession")]
         public string VizqlSession { get; set; }
 
         //commands that were executed in this session
         //has commands and Time
+        [JsonProperty("Commands")]
         public List<TabCommand> Commands { get; set; } = new List<TabCommand>();
     }
 }
diff --git a/Plugins/ReplayCreation/Models/Command.cs b/Plugins/ReplayCreation/Models/Command.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Logshark.Plugins.ReplayCreation.Models
 {
@@ -15,12 +16,15 @@ public Command(string cmmdNameSpace, string cmdName, Dictionary<string, object>
         }
 
         // namespace of the command "tabdoc" or "tabsrv"
+        [JsonProperty("commandNamespace")]
         public string CommandNamespace { get; set; }
 
         // commandName "Select", "sort-from-indicator"
+        [JsonProperty("commandName")]
         public string CommandName { get; set; }
 
         // parameters for the command
+        [JsonProperty("commandParams")]
         public Dictionary<string, object> CommandParams { get; set; }
     }
 }
diff --git a/Plugins/ReplayCreation/Models/TabCommand.cs b/Plugins/ReplayCreation/Models/TabCommand.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 
 namespace Logshark.Plugins.ReplayCreation.Models
 {
@@ -7,8 +8,10 @@ namespace Logshark.Plugins.ReplayCreation.Models
     /// </summary>
     public class TabCommand : IComparable<TabCommand>
     {
+        [JsonProperty("Time")]
         public string Time { get; set; }
 
+        [JsonProperty("Command")]
         public Command Command { get; set; }
 
         public TabCommand(string time, Command command)

diff --git a/Plugins/ReplayCreation/Properties/AssemblyInfo.cs b/Plugins/ReplayCreation/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]