From 288eb97344d783115bf7c6520399b285cfd22ceb Mon Sep 17 00:00:00 2001 From: David Bond Date: Thu, 7 Dec 2023 20:20:56 +0000 Subject: [PATCH] Fixed pascal casing of "SDT" --- .../ScheduledDownTimeTests.cs | 2 +- LogicMonitor.Api.Test/TestPortalConfig.cs | 4 +-- LogicMonitor.Api.Test/TestWithOutput.cs | 6 ++-- .../Websites/WebsiteTests.cs | 6 ++-- .../Dashboards/NOCWidgetDataItem.cs | 10 +++---- .../LogicMonitorClient_Websites.cs | 2 +- LogicMonitor.Api/Reports/SlaReportMetric.cs | 2 +- .../Reports/WebsiteOverviewReport.cs | 2 +- .../Reports/WebsiteSlaReportMetric.cs | 2 +- LogicMonitor.Api/Settings/HttpIntegration.cs | 30 +++++++++++++++++++ LogicMonitor.Api/Topologies/Topology.cs | 6 ++++ .../Topologies/TopologyConnection.cs | 9 ++++++ 12 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 LogicMonitor.Api/Topologies/TopologyConnection.cs diff --git a/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs b/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs index 61f1e049..a8c42f23 100644 --- a/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs +++ b/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs @@ -195,7 +195,7 @@ await LogicMonitorClient public async Task AddAndDeleteAResourceGroupSdt() { const string initialComment = "LogicMonitor.Api unit tests - AddAndDeleteAResourceGroupSdt initial comment"; - var resourceGroupId = SDTResourceGroupId; + var resourceGroupId = SdtResourceGroupId; var sdtCreationDto = new ResourceGroupScheduledDownTimeCreationDto(resourceGroupId) { Comment = initialComment, diff --git a/LogicMonitor.Api.Test/TestPortalConfig.cs b/LogicMonitor.Api.Test/TestPortalConfig.cs index 9b0741ca..4a9ccffe 100644 --- a/LogicMonitor.Api.Test/TestPortalConfig.cs +++ b/LogicMonitor.Api.Test/TestPortalConfig.cs @@ -39,7 +39,7 @@ internal TestPortalConfig(ILogger logger) WindowsDeviceLargeDeviceDataSourceId = int.Parse(Configuration["Config:WindowsDeviceLargeDeviceDataSourceId"] ?? "0", CultureInfo.InvariantCulture); ServiceDeviceId = int.Parse(Configuration["Config:ServiceDeviceId"] ?? "0", CultureInfo.InvariantCulture); CollectorId = int.Parse(Configuration["Config:CollectorId"] ?? "0", CultureInfo.InvariantCulture); - SDTResourceGroupId = int.Parse(Configuration["Config:SDTResourceGroupId"] ?? "0", CultureInfo.InvariantCulture); + SdtResourceGroupId = int.Parse(Configuration["Config:SDTResourceGroupId"] ?? "0", CultureInfo.InvariantCulture); TestDashboardId = int.Parse(Configuration["Config:TestDashboardId"] ?? "0", CultureInfo.InvariantCulture); WebsiteGroupFullPath = Configuration["Config:WebsiteGroupFullPath"] ?? ""; DeviceGroupFullPath = Configuration["Config:DeviceGroupFullPath"] ?? ""; @@ -78,7 +78,7 @@ internal TestPortalConfig(ILogger logger) internal int CollectorId { get; } - public int SDTResourceGroupId { get; } + public int SdtResourceGroupId { get; } public string AlertRuleName { get; } diff --git a/LogicMonitor.Api.Test/TestWithOutput.cs b/LogicMonitor.Api.Test/TestWithOutput.cs index e70235c8..c8d60795 100644 --- a/LogicMonitor.Api.Test/TestWithOutput.cs +++ b/LogicMonitor.Api.Test/TestWithOutput.cs @@ -20,7 +20,7 @@ public abstract class TestWithOutput protected int WindowsDeviceId { get; } - protected int SDTResourceGroupId { get; } + protected int SdtResourceGroupId { get; } protected int WindowsDeviceLargeDeviceDataSourceId { get; } @@ -44,12 +44,12 @@ protected TestWithOutput(ITestOutputHelper iTestOutputHelper) WindowsDeviceLargeDeviceDataSourceId = testPortalConfig.WindowsDeviceLargeDeviceDataSourceId; ServiceDeviceId = testPortalConfig.ServiceDeviceId; NetflowDeviceId = testPortalConfig.NetflowDeviceId; - SDTResourceGroupId = testPortalConfig.SDTResourceGroupId; + SdtResourceGroupId = testPortalConfig.SdtResourceGroupId; TestDashboardId = testPortalConfig.TestDashboardId; DeviceGroupFullPath = testPortalConfig.DeviceGroupFullPath; WebsiteGroupFullPath = testPortalConfig.WebsiteGroupFullPath; ResourceGroupFullPath = testPortalConfig.ResourceGroupFullPath; - SDTResourceGroupId = testPortalConfig.SDTResourceGroupId; + SdtResourceGroupId = testPortalConfig.SdtResourceGroupId; WebsiteName = testPortalConfig.WebsiteName; SnmpDeviceId = testPortalConfig.SnmpDeviceId; AllWidgetsDashboardId = testPortalConfig.AllWidgetsDashboardId; diff --git a/LogicMonitor.Api.Test/Websites/WebsiteTests.cs b/LogicMonitor.Api.Test/Websites/WebsiteTests.cs index d145f694..0531838e 100644 --- a/LogicMonitor.Api.Test/Websites/WebsiteTests.cs +++ b/LogicMonitor.Api.Test/Websites/WebsiteTests.cs @@ -153,7 +153,7 @@ await LogicMonitorClient ParentId = "1", Properties = [ - new EntityProperty {Name = "name", Value = "value"} + new EntityProperty { Name = "name", Value = "value" } ] //TestLocation = new TestLocation { All = true, SmgIds = new List { 1, 2, 4, 3, 5, 6 } } }, default).ConfigureAwait(true); @@ -293,14 +293,14 @@ await LogicMonitorClient } [Fact] - public async Task GetWebsiteSDTs() + public async Task GetWebsiteSdts() { var websiteList = await LogicMonitorClient .GetAllAsync(default) .ConfigureAwait(true); var sdts = await LogicMonitorClient - .GetWebsiteSDTListAsync(websiteList[0].Id, new Filter(), default) + .GetWebsiteSdtListAsync(websiteList[0].Id, new Filter(), default) .ConfigureAwait(true); sdts.Should().NotBeNull(); } diff --git a/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs b/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs index bf89d481..96122cef 100644 --- a/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs +++ b/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs @@ -10,7 +10,7 @@ public class NOCWidgetDataItem /// Whether this is in scheduled downtime /// [DataMember(Name = "inSDT")] - public bool InSDT { get; set; } + public bool InSdt { get; set; } /// /// The type of the widget data item @@ -79,13 +79,13 @@ public class NOCWidgetDataItem /// Number in scheduled downtime error alerts /// [DataMember(Name = "inSDTErrorAlert")] - public int InSDTErrorAlert { get; set; } + public int InSdtErrorAlert { get; set; } /// /// Number of in scheduled downtime and confirmed error alerts /// [DataMember(Name = "inSDTAndConfirmedErrorAlert")] - public int InSDTAndConfirmedErrorAlert { get; set; } + public int InSdtAndConfirmedErrorAlert { get; set; } /// /// Number of error alerts @@ -103,13 +103,13 @@ public class NOCWidgetDataItem /// Number in scheduled downtime and critical alerts /// [DataMember(Name = "inSDTCriticalAlert")] - public int InSDTCriticalAlert { get; set; } + public int InSdtCriticalAlert { get; set; } /// /// Number in scheduled downtime and confirmed critical alerts /// [DataMember(Name = "inSDTAndConfirmedCriticalAlert")] - public int InSDTAndConfirmedCriticalAlert { get; set; } + public int InSdtAndConfirmedCriticalAlert { get; set; } /// /// Number of critical alerts diff --git a/LogicMonitor.Api/LogicMonitorClient_Websites.cs b/LogicMonitor.Api/LogicMonitorClient_Websites.cs index 884131f9..be152dbf 100644 --- a/LogicMonitor.Api/LogicMonitorClient_Websites.cs +++ b/LogicMonitor.Api/LogicMonitorClient_Websites.cs @@ -372,7 +372,7 @@ await Task.WhenAll(alertFilterList.Select(async individualAlertFilter => /// /// get a list of SDTs for a website /// - public async Task> GetWebsiteSDTListAsync( + public async Task> GetWebsiteSdtListAsync( int websiteId, Filter filter, CancellationToken cancellationToken) diff --git a/LogicMonitor.Api/Reports/SlaReportMetric.cs b/LogicMonitor.Api/Reports/SlaReportMetric.cs index 4e6857c3..3eeee39c 100644 --- a/LogicMonitor.Api/Reports/SlaReportMetric.cs +++ b/LogicMonitor.Api/Reports/SlaReportMetric.cs @@ -52,5 +52,5 @@ public class SlaReportMetric /// The exclusion SDT type /// [DataMember(Name = "exclusionSDTType")] - public string ExclusionSDTType { get; set; } = string.Empty; + public string ExclusionSdtType { get; set; } = string.Empty; } diff --git a/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs b/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs index 18cced9d..e40ac33e 100644 --- a/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs +++ b/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs @@ -34,7 +34,7 @@ public class WebsiteOverviewReport : DateRangeReport /// Whether to exclude SDT /// [DataMember(Name = "excludeSDT")] - public bool ExcludeSDT { get; set; } + public bool ExcludeSdt { get; set; } /// /// Whether to exclude services with 100% availability diff --git a/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs b/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs index 4c1a7522..96445c3e 100644 --- a/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs +++ b/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs @@ -22,5 +22,5 @@ public class WebsiteSlaReportMetric /// Whether to exclude alerts occurring in SDT /// [DataMember(Name = "excludeSDT")] - public bool ExcludeSDT { get; set; } + public bool ExcludeSdt { get; set; } } diff --git a/LogicMonitor.Api/Settings/HttpIntegration.cs b/LogicMonitor.Api/Settings/HttpIntegration.cs index c10cfc39..e5b45269 100644 --- a/LogicMonitor.Api/Settings/HttpIntegration.cs +++ b/LogicMonitor.Api/Settings/HttpIntegration.cs @@ -84,6 +84,36 @@ public class HttpIntegration : Integration [DataMember(Name = "ackOAuthVersion")] public string? AckOAuthVersion { get; set; } = string.Empty; + /// + /// The ACK OAuth grant type + /// + [DataMember(Name = "ackOAuthGrantType")] + public string? AckOAuthGrantType { get; set; } = string.Empty; + + /// + /// The ACK OAuth access token Url + /// + [DataMember(Name = "ackOAuthAccessTokenUrl")] + public string? AckOAuthAccessTokenUrl { get; set; } = string.Empty; + + /// + /// The ACK OAuth client id + /// + [DataMember(Name = "ackOAuthClientId")] + public string? AckOAuthClientId { get; set; } = string.Empty; + + /// + /// The ACK OAuth client secret + /// + [DataMember(Name = "ackOAuthClientSecret")] + public string? AckOAuthClientSecret { get; set; } = string.Empty; + + /// + /// The ACK OAuth scope + /// + [DataMember(Name = "ackOAuthScope")] + public string? AckOAuthScope { get; set; } = string.Empty; + /// /// The OAuth version /// diff --git a/LogicMonitor.Api/Topologies/Topology.cs b/LogicMonitor.Api/Topologies/Topology.cs index 0b60af56..a50cd16b 100644 --- a/LogicMonitor.Api/Topologies/Topology.cs +++ b/LogicMonitor.Api/Topologies/Topology.cs @@ -67,6 +67,12 @@ public class Topology : NamedItem, IHasEndpoint [DataMember(Name = "views")] public List Views { get; set; } = []; + /// + /// The connections + /// + [DataMember(Name = "connections")] + public List Connection { get; set; } = []; + /// /// The REST API endpoint /// diff --git a/LogicMonitor.Api/Topologies/TopologyConnection.cs b/LogicMonitor.Api/Topologies/TopologyConnection.cs new file mode 100644 index 00000000..896571ef --- /dev/null +++ b/LogicMonitor.Api/Topologies/TopologyConnection.cs @@ -0,0 +1,9 @@ +namespace LogicMonitor.Api.Topologies; + +/// +/// A Topology connection +/// +[DataContract] +public class TopologyConnection +{ +} \ No newline at end of file