Merge

LogicMonitor.Api.Test/Users/RoleTests.cs

@@ -0,0 +1,15 @@
+namespace LogicMonitor.Api.Test.Users;
+
+public class RoleTests(ITestOutputHelper iTestOutputHelper) : TestWithOutput(iTestOutputHelper)
+{
+	[Fact]
+	public async Task GetAll()
+	{
+		var items = await LogicMonitorClient
+			.GetAllAsync<Role>(default)
+			.ConfigureAwait(true);
+
+		items.Should().NotBeNull();
+		items.Should().NotBeNullOrEmpty();
+	}
+}

LogicMonitor.Api/Alerts/InstanceGroupAlertThresholdInfo.cs

@@ -36,4 +36,23 @@ public class InstanceGroupAlertThresholdInfo
 	/// </summary>
 	[DataMember(Name = "alertExpr")]
 	public string AlertExpression { get; set; } = string.Empty;
+
+	/// <summary>
+	/// The alert transition interval
+	/// </summary>
+	[DataMember(Name = "alertTransitionInterval")]
+	public string AlertTransitionInterval { get; set; } = string.Empty;
+
+	/// <summary>
+	/// The alert clear transition interval
+	/// </summary>
+	[DataMember(Name = "alertClearTransitionInterval")]
+	public string AlertClearTransitionInterval { get; set; } = string.Empty;
+
+	/// <summary>
+	/// The alert for no data value
+	/// </summary>
+	[DataMember(Name = "alertForNoData")]
+	public int AlertForNoData { get; set; }
+
 }

LogicMonitor.Api/LogicModules/DataPointConfiguration.cs

@@ -205,7 +205,13 @@ public class DataPointConfiguration : IdentifiedItem
 	///     Parent Instance Group Alert Expression
 	/// </summary>
 	[DataMember(Name = "parentInstanceGroupAlertExpr")]
-	public string ParentInstanceGroupAlertExpression { get; set; } = string.Empty;
+	public InstanceGroupAlertThresholdInfo? ParentInstanceGroupAlertExpression { get; set; }
+
+	/// <summary>
+	///     Parent Resource Group Alert Expression
+	/// </summary>
+	[DataMember(Name = "parentResourceDataSourceAlertExpr")]
+	public object? ParentResourceDataSourceAlertExpr { get; set; }
 
 	/// <summary>
 	///     Alert for no data

LogicMonitor.Api/LogicModules/DataPointConfigurationCreationDTO.cs

@@ -52,5 +52,5 @@ public class DataPointConfigurationCreationDTO : IdentifiedItem
 	///     Parent Instance Group Alert Expression
 	/// </summary>
 	[DataMember(Name = "parentInstanceGroupAlertExpr")]
-	public string ParentInstanceGroupAlertExpression { get; set; } = string.Empty;
+	public InstanceGroupAlertThresholdInfo? ParentInstanceGroupAlertExpression { get; set; }
 }

LogicMonitor.Api/LogicMonitorClient.cs

@@ -467,7 +467,7 @@ public async Task PutAsync(string subUrl, object @item, CancellationToken cancel
 			// Check the outer HTTP status code
 			if (!httpResponseMessage.IsSuccessStatusCode)
 			{
-				if ((int)httpResponseMessage.StatusCode != 429 && httpResponseMessage.ReasonPhrase != "Too Many Requests")
+				if ((int)httpResponseMessage.StatusCode != 429)
 				{
 					if (WaitDuringLogicMonitorUpgrades && httpResponseMessage.StatusCode == HttpStatusCode.ServiceUnavailable)
 					{
@@ -870,7 +870,7 @@ public async Task DeleteAsync(string subUrl, CancellationToken cancellationToken
 			// Check the outer HTTP status code
 			if (!httpResponseMessage.IsSuccessStatusCode)
 			{
-				if ((int)httpResponseMessage.StatusCode != 429 && httpResponseMessage.ReasonPhrase != "Too Many Requests")
+				if ((int)httpResponseMessage.StatusCode != 429)
 				{
 					if (WaitDuringLogicMonitorUpgrades && httpResponseMessage.StatusCode == HttpStatusCode.ServiceUnavailable)
 					{
@@ -1017,7 +1017,7 @@ public async Task DeleteAsync(string subUrl, CancellationToken cancellationToken
 			// NOT A SUCCESS :-(
 
 			var statusCode = (int)httpResponseMessage.StatusCode;
-			var tooManyRequests = statusCode == 429 && httpResponseMessage.ReasonPhrase.Equals("Too Many Requests", StringComparison.OrdinalIgnoreCase);
+			var tooManyRequests = statusCode == 429;
 
 			if (!tooManyRequests)
 			{
@@ -1188,11 +1188,10 @@ public async Task DeleteAsync(string subUrl, CancellationToken cancellationToken
 			if (!httpResponseMessage.IsSuccessStatusCode)
 			{
 
-				if ((int)httpResponseMessage.StatusCode != 429 && httpResponseMessage.ReasonPhrase != "Too Many Requests")
+				if ((int)httpResponseMessage.StatusCode != 429)
 				{
 					if (WaitDuringLogicMonitorUpgrades && httpResponseMessage.StatusCode == HttpStatusCode.ServiceUnavailable)
 					{
-						// TODO: could also check the reason phrase, and / or the RESPONSE (which contains "Service Temporarily Unavailable")
 						_logger.LogDebug("{Prefix} Service Unavailable. Waiting 10000ms", prefix);
 						await Task.Delay(10000, cancellationToken).ConfigureAwait(false);
 						continue;
@@ -1296,7 +1295,7 @@ public async Task DeleteAsync(string subUrl, CancellationToken cancellationToken
 			// Check the outer HTTP status code
 			if (!httpResponseMessage.IsSuccessStatusCode)
 			{
-				if ((int)httpResponseMessage.StatusCode != 429 && httpResponseMessage.ReasonPhrase != "Too Many Requests")
+				if ((int)httpResponseMessage.StatusCode != 429)
 				{
 					if (WaitDuringLogicMonitorUpgrades && httpResponseMessage.StatusCode == HttpStatusCode.ServiceUnavailable)
 					{

LogicMonitor.Api/Users/PrivilegeObjectType.cs

@@ -107,5 +107,11 @@ public enum PrivilegeObjectType
 	/// Module
 	/// </summary>
 	[DataMember(Name = "module")]
-	Module
+	Module,
+
+	/// <summary>
+	/// Cost Optimzsation
+	/// </summary>
+	[DataMember(Name = "costOptimization")]
+	CostOptimization
 }

LogicMonitor.Api/Users/User.cs

@@ -216,6 +216,12 @@ public class User : IdentifiedItem, IHasEndpoint
 	[DataMember(Name = "immediateForceLogout")]
 	public bool ImmediateForceLogout { get; set; }
 
+	/// <summary>
+	///    The last authorized IP address
+	/// </summary>
+	[DataMember(Name = "lastAuthIp")]
+	public string LastAuthIp { get; set; } = string.Empty;
+
 	/// <summary>
 	///    The endpoint
 	/// </summary>