Tag enhancement

seq-app-opsgenie.sln.DotSettings

@@ -20,4 +20,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CI/@EntryIndexedValue">CI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=app_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jira/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Opsgenie/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Seq.App.Opsgenie/HandlebarsTemplate.cs → src/Seq.App.Opsgenie/Classes/HandlebarsTemplate.cs

@@ -6,7 +6,7 @@
 using Seq.Apps;
 using Seq.Apps.LogEvents;
 
-namespace Seq.App.Opsgenie
+namespace Seq.App.Opsgenie.Classes
 {
     class HandlebarsTemplate
     {
@@ -26,32 +26,33 @@ public string Render(Event<LogEventData> evt)
             if (evt == null) throw new ArgumentNullException(nameof(evt));
             return FormatTemplate(_template, evt, _host);
         }
-        
+
         static string FormatTemplate(Func<object, string> template, Event<LogEventData> evt, Host host)
         {
-            var properties = (IDictionary<string,object>) ToDynamic(evt.Data.Properties ?? new Dictionary<string, object>());
+            var properties =
+                (IDictionary<string, object>) ToDynamic(evt.Data.Properties ?? new Dictionary<string, object>());
 
-            var payload = (IDictionary<string,object>) ToDynamic(new Dictionary<string, object>
+            var payload = (IDictionary<string, object>) ToDynamic(new Dictionary<string, object>
             {
-                { "$Id",                  evt.Id },
-                { "$UtcTimestamp",        evt.TimestampUtc },
-                { "$LocalTimestamp",      evt.Data.LocalTimestamp },
-                { "$Level",               evt.Data.Level },
-                { "$MessageTemplate",     evt.Data.MessageTemplate },
-                { "$Message",             evt.Data.RenderedMessage },
-                { "$Exception",           evt.Data.Exception },
-                { "$Properties",          properties },
-                { "$EventType",           "$" + evt.EventType.ToString("X8") },
-                { "$Instance",            host.InstanceName },
-                { "$ServerUri",           host.BaseUri },
+                {"$Id", evt.Id},
+                {"$UtcTimestamp", evt.TimestampUtc},
+                {"$LocalTimestamp", evt.Data.LocalTimestamp},
+                {"$Level", evt.Data.Level},
+                {"$MessageTemplate", evt.Data.MessageTemplate},
+                {"$Message", evt.Data.RenderedMessage},
+                {"$Exception", evt.Data.Exception},
+                {"$Properties", properties},
+                {"$EventType", "$" + evt.EventType.ToString("X8")},
+                {"$Instance", host.InstanceName},
+                {"$ServerUri", host.BaseUri},
                 // Note, this will only be valid when events are streamed directly to the app, and not when the app is sending an alert notification.
-                { "$EventUri",            string.Concat(host.BaseUri, "#/events?filter=@Id%20%3D%20'", evt.Id, "'&amp;show=expanded") } 
+                {
+                    "$EventUri",
+                    string.Concat(host.BaseUri, "#/events?filter=@Id%20%3D%20'", evt.Id, "'&amp;show=expanded")
+                }
             });
 
-            foreach (var property in properties)
-            {
-                payload[property.Key] = property.Value;
-            }
+            foreach (var property in properties) payload[property.Key] = property.Value;
 
             return template(payload);
         }
@@ -67,10 +68,7 @@ static object ToDynamic(object o)
                 return result;
             }
 
-            if (o is IEnumerable<object> enumerable)
-            {
-                return enumerable.Select(ToDynamic).ToArray();
-            }
+            if (o is IEnumerable<object> enumerable) return enumerable.Select(ToDynamic).ToArray();
 
             return o;
         }

src/Seq.App.Opsgenie/Classes/OpsGenieData.cs

@@ -0,0 +1,33 @@
+using System;
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
+// ReSharper disable ClassNeverInstantiated.Global
+
+namespace Seq.App.Opsgenie.Classes
+{
+    public class OpsGenieData
+    {
+        public OpsGenieData()
+        {
+            Success = false;
+            Action = string.Empty;
+            ProcessedAt = DateTime.Now;
+            IntegrationId = string.Empty;
+            IsSuccess = false;
+            Status = string.Empty;
+            AlertId = string.Empty;
+            Alias = string.Empty;
+        }
+
+        public bool Success { get; set; }
+        public string Action { get; set; }
+        public DateTime ProcessedAt { get; set; }
+        public string IntegrationId { get; set; }
+        public bool IsSuccess { get; set; }
+        public string Status { get; set; }
+        public string AlertId { get; set; }
+        public string Alias { get; set; }
+    }
+}

src/Seq.App.Opsgenie/Classes/OpsGenieResponse.cs

@@ -0,0 +1,19 @@
+// ReSharper disable UnusedMember.Global
+
+namespace Seq.App.Opsgenie.Classes
+{
+    public class OpsGenieResponse
+    {
+        public OpsGenieResponse()
+        {
+            Result = string.Empty;
+            RequestId = string.Empty;
+            Took = -1;
+        }
+
+        public OpsGenieData Data { get; set; }
+        public string Result { get; set; }
+        public string RequestId { get; set; }
+        public decimal Took { get; set; }
+    }
+}

src/Seq.App.Opsgenie/Classes/OpsGenieResult.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Net.Http;
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
+// ReSharper disable NotAccessedField.Global
+
+namespace Seq.App.Opsgenie.Classes
+{
+    public class OpsGenieResult
+    {
+        public OpsGenieResult()
+        {
+            Ok = false;
+            StatusCode = -1;
+            HttpResponse = null;
+            Response = null;
+            Error = null;
+            ResponseBody = string.Empty;
+        }
+
+        public bool Ok { get; set; }
+        public int StatusCode { get; set; }
+        public HttpResponseMessage HttpResponse { get; set; }
+        public OpsGenieResponse Response { get; set; }
+        public Exception Error { get; set; }
+        public string ResponseBody { get; set; }
+    }
+}

src/Seq.App.Opsgenie/OpsgenieAlert.cs → src/Seq.App.Opsgenie/Classes/OpsgenieAlert.cs

@@ -3,24 +3,17 @@
 // Properties on this type are serialized into the JSON payload sent to OpsGenie.
 // ReSharper disable MemberCanBePrivate.Global, UnusedAutoPropertyAccessor.Global
 
-namespace Seq.App.Opsgenie
+namespace Seq.App.Opsgenie.Classes
 {
     class OpsgenieAlert
     {
-        public string Message { get; }
-        public string Alias { get; }
-        public string Description { get; }
-        public string Priority { get; }
-        public List<Responder> Responders { get; }
-        public string Source { get; }
-        public string[] Tags { get; }
-
         public OpsgenieAlert(
             string message,
             string alias,
             string description,
             string priority,
             List<Responder> responders,
+            Dictionary<string, string> details,
             string source,
             string[] tags)
         {
@@ -29,8 +22,18 @@ public OpsgenieAlert(
             Description = description;
             Priority = priority;
             Responders = responders;
+            Details = details;
             Source = source;
             Tags = tags;
         }
-    }    
+
+        public string Message { get; }
+        public string Alias { get; }
+        public string Description { get; }
+        public string Priority { get; }
+        public List<Responder> Responders { get; }
+        public Dictionary<string, string> Details { get; }
+        public string Source { get; }
+        public string[] Tags { get; }
+    }
 }

src/Seq.App.Opsgenie/Priority.cs → src/Seq.App.Opsgenie/Classes/Priority.cs

@@ -1,7 +1,7 @@
 // Values of this type are populated from user-provided configuration.
 // ReSharper disable UnusedMember.Global
 
-namespace Seq.App.Opsgenie
+namespace Seq.App.Opsgenie.Classes
 {
     public enum Priority
     {
@@ -11,4 +11,4 @@ public enum Priority
         P4 = 4,
         P5 = 5
     }
-}
+}

src/Seq.App.Opsgenie/Responder.cs → src/Seq.App.Opsgenie/Classes/Responder.cs

@@ -1,13 +1,16 @@
 using System.Text.Json.Serialization;
+// ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace Seq.App.Opsgenie
+namespace Seq.App.Opsgenie.Classes
 {
     class Responder
     {
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public string Username { get; set; }
+
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public string Name { get; set; }
+
         public ResponderType Type { get; set; }
     }
-}
+}

src/Seq.App.Opsgenie/ResponderType.cs → src/Seq.App.Opsgenie/Classes/ResponderType.cs

@@ -1,7 +1,7 @@
 // Used to maintain the (JSON) OpsGenie API contract.
 // ReSharper disable UnusedMember.Global
 
-namespace Seq.App.Opsgenie
+namespace Seq.App.Opsgenie.Classes
 {
     enum ResponderType
     {
@@ -10,4 +10,4 @@ enum ResponderType
         Escalation,
         Schedule
     }
-}
+}

src/Seq.App.Opsgenie/Interfaces/IOpsgenieApiClient.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Seq.App.Opsgenie.Classes;
+
+namespace Seq.App.Opsgenie.Interfaces
+{
+    interface IOpsgenieApiClient
+    {
+        Task<OpsGenieResult> CreateAsync(OpsgenieAlert alert);
+    }
+}

src/Seq.App.Opsgenie/OpsgenieApiClient.cs

@@ -6,15 +6,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Seq.Apps;
+using Seq.App.Opsgenie.Classes;
+using Seq.App.Opsgenie.Interfaces;
 
 namespace Seq.App.Opsgenie
 {
     class OpsgenieApiClient : IOpsgenieApiClient, IDisposable
     {
         const string OpsgenieCreateAlertUrl = "https://api.opsgenie.com/v2/alerts";
-        readonly HttpClient _httpClient = new HttpClient();
-        readonly Encoding _utf8Encoding = new UTF8Encoding(false);
+
         static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -24,23 +24,21 @@ class OpsgenieApiClient : IOpsgenieApiClient, IDisposable
             }
         };
 
-        public static string Serialize(IEnumerable list)
-        {
-            return JsonSerializer.Serialize(list, SerializerOptions);
-        }
-
-        public static string Serialize(OpsgenieAlert alert)
-        {
-            return JsonSerializer.Serialize(alert, SerializerOptions);
-        }
+        readonly HttpClient _httpClient = new HttpClient();
+        readonly Encoding _utf8Encoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
 
         public OpsgenieApiClient(string apiKey)
         {
             if (apiKey == null) throw new ArgumentNullException(nameof(apiKey));
             _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("GenieKey", apiKey);
         }
 
-        public async Task<HttpResponseMessage> CreateAsync(OpsgenieAlert alert)
+        public void Dispose()
+        {
+            _httpClient.Dispose();
+        }
+
+        public async Task<OpsGenieResult> CreateAsync(OpsgenieAlert alert)
         {
             if (alert == null) throw new ArgumentNullException(nameof(alert));
 
@@ -50,21 +48,41 @@ public async Task<HttpResponseMessage> CreateAsync(OpsgenieAlert alert)
                 "application/json");
 
             var response = await _httpClient.PostAsync(OpsgenieCreateAlertUrl, content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+            var result = new OpsGenieResult
+            {
+                StatusCode = (int) response.StatusCode,
+                Ok = response.IsSuccessStatusCode,
+                HttpResponse = response,
+                ResponseBody = responseBody
+            };
+
+            try
+            {
+                var opsGenieResponse =
+                    JsonSerializer.Deserialize<OpsGenieResponse>(responseBody,
+                        new JsonSerializerOptions {PropertyNameCaseInsensitive = true});
 
-            if (!response.IsSuccessStatusCode)
+                result.Response = opsGenieResponse;
+            }
+            catch (Exception ex)
             {
-                var responseBody = await response.Content.ReadAsStringAsync();
-                var fragment = responseBody.Substring(0, Math.Min(1024, responseBody.Length));                
-                throw new SeqAppException(
-                    $"Opsgenie alert creation failed ({response.StatusCode}/{response.ReasonPhrase}): {fragment}");
+                result.Ok = false;
+                result.Error = ex;
             }
 
-            return response;
+
+            return result;
         }
 
-        public void Dispose()
+        public static string Serialize(IEnumerable list)
         {
-            _httpClient.Dispose();
+            return JsonSerializer.Serialize(list, SerializerOptions);
+        }
+
+        public static string Serialize(OpsgenieAlert alert)
+        {
+            return JsonSerializer.Serialize(alert, SerializerOptions);
         }
     }
 }