Merge pull request #545 from NuGet/master

Merge hardcode tables change and AI hotfix into dev

Author: Scott Bommarito

src/Search.GenerateAuxiliaryData/Settings/dev.json

@@ -2,7 +2,7 @@
   "Initialization": {
     "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$",
     "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
-    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdev0;AccountKey=$$Dev-NuGetDev0Storage-Key$$"
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$"
   },
 
   "GalleryDb": {

src/Search.GenerateAuxiliaryData/Settings/prod.json

@@ -2,7 +2,7 @@
   "Initialization": {
     "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$",
     "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
-    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetprod0;AccountKey=$$Prod-NuGetProd0Storage-Key$$"
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$"
   },
 
   "GalleryDb": {

src/Stats.CreateAzureCdnWarehouseReports/Scripts/Stats.CreateAzureCdnWarehouseReports.cmd

@@ -8,10 +8,10 @@ echo "Starting job - #{Jobs.stats.createazurecdnwarehousereports.Title}"
 title #{Jobs.stats.createazurecdnwarehousereports.Title}
 
 start /w stats.createazurecdnwarehousereports.exe ^
-    -Configuration "#{Jobs.stats.createazurecdnwarehousereports.Configuration}"
-	-InstrumentationKey "#{Jobs.stats.createazurecdnwarehousereports.InstrumentationKey}" ^
-	-Interval #{Jobs.stats.createazurecdnwarehousereports.Interval}  ^
-	-verbose true
+    -Configuration "#{Jobs.stats.createazurecdnwarehousereports.Configuration}" ^
+    -InstrumentationKey "#{Jobs.stats.createazurecdnwarehousereports.InstrumentationKey}" ^
+    -Interval #{Jobs.stats.createazurecdnwarehousereports.Interval}  ^
+    -verbose true
 
 echo "Finished #{Jobs.stats.createazurecdnwarehousereports.Title}"
 

src/Stats.ImportAzureCdnStatistics/DataImporter.cs

@@ -10,6 +10,12 @@ namespace Stats.ImportAzureCdnStatistics
 {
     internal class DataImporter
     {
+        public enum Table
+        {
+            Fact_Dist_Download,
+            Fact_Download
+        }
+
         private readonly Func<Task<SqlConnection>> _openStatisticsSqlConnectionAsync;
         private const string _sqlSelectTop1FromTable = "SELECT TOP 1 * FROM [dbo].[{0}]";
 
@@ -18,8 +24,9 @@ public DataImporter(Func<Task<SqlConnection>> openStatisticsSqlConnectionAsync)
             _openStatisticsSqlConnectionAsync = openStatisticsSqlConnectionAsync;
         }
 
-        public async Task<DataTable> GetDataTableAsync(string tableName)
+        public async Task<DataTable> GetDataTableAsync(Table table)
         {
+            var tableName = table.ToString();
             var dataTable = new DataTable();
             var query = string.Format(_sqlSelectTop1FromTable, tableName);
 

src/Stats.ImportAzureCdnStatistics/Warehouse.cs

@@ -126,7 +126,7 @@ public async Task<DataTable> CreateAsync(IReadOnlyCollection<PackageStatistics>
 
             // create facts data rows by linking source data with dimensions
             var dataImporter = new DataImporter(_openStatisticsSqlConnectionAsync);
-            var factsDataTable = await dataImporter.GetDataTableAsync("Fact_Download");
+            var factsDataTable = await dataImporter.GetDataTableAsync(DataImporter.Table.Fact_Download);
 
             var knownOperationsAvailable = operations.Any();
             var knownClientsAvailable = clients.Any();
@@ -247,7 +247,7 @@ public async Task<DataTable> CreateAsync(IReadOnlyCollection<ToolStatistics> sou
 
             // create facts data rows by linking source data with dimensions
             var dataImporter = new DataImporter(_openStatisticsSqlConnectionAsync);
-            var dataTable = await dataImporter.GetDataTableAsync("Fact_Dist_Download");
+            var dataTable = await dataImporter.GetDataTableAsync(DataImporter.Table.Fact_Dist_Download);
 
             var knownClientsAvailable = clients.Any();
             var knownPlatformsAvailable = platforms.Any();

src/StatusAggregator/Parse/OutdatedSearchServiceInstanceIncidentParser.cs

@@ -5,18 +5,22 @@
 using NuGet.Services.Incidents;
 using NuGet.Services.Status;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace StatusAggregator.Parse
 {
     public class OutdatedSearchServiceInstanceIncidentParser : EnvironmentPrefixIncidentParser
     {
-        private const string SubtitleRegEx = "A search service instance is using an outdated index!";
+        private const string SubtitleRegEx = "All search service instances are using an outdated index!";
 
         public OutdatedSearchServiceInstanceIncidentParser(
             IEnumerable<IIncidentParsingFilter> filters, 
             ILogger<OutdatedSearchServiceInstanceIncidentParser> logger)
-            : base(SubtitleRegEx, filters, logger)
+            : base(
+                  SubtitleRegEx, 
+                  filters.Where(f => !(f is SeverityFilter)), // The incident is always severity 4.
+                  logger)
         {
         }