Skip to content

Commit bf41904

Browse files
niemyjskiniemyjski
committed
#145 Updated to elasticsearch-rc2
1 parent 4b90c74 commit bf41904

File tree

12 files changed

+81
-78
lines changed

12 files changed

+81
-78
lines changed

‎src/Exceptionless.Api/Exceptionless.Api.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Elasticsearch.Net, Version=5.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Elasticsearch.Net.5.0.0-rc1\lib\net46\Elasticsearch.Net.dll</HintPath>
54+
<HintPath>..\..\packages\Elasticsearch.Net.5.0.0-rc2\lib\net46\Elasticsearch.Net.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Exceptionless.DateTimeExtensions, Version=3.2.55.0, Culture=neutral, processorArchitecture=MSIL">
@@ -66,20 +66,20 @@
6666
<HintPath>..\..\packages\Foundatio.4.2.1183\lib\net46\Foundatio.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="Foundatio.Parsers.ElasticQueries, Version=5.0.167.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Foundatio.Parsers.ElasticQueries.5.0.167-pre\lib\net46\Foundatio.Parsers.ElasticQueries.dll</HintPath>
69+
<Reference Include="Foundatio.Parsers.ElasticQueries, Version=5.0.169.0, Culture=neutral, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\Foundatio.Parsers.ElasticQueries.5.0.169-pre\lib\net46\Foundatio.Parsers.ElasticQueries.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Foundatio.Parsers.LuceneQueries, Version=5.0.167.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Foundatio.Parsers.LuceneQueries.5.0.167-pre\lib\net46\Foundatio.Parsers.LuceneQueries.dll</HintPath>
73+
<Reference Include="Foundatio.Parsers.LuceneQueries, Version=5.0.169.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Foundatio.Parsers.LuceneQueries.5.0.169-pre\lib\net46\Foundatio.Parsers.LuceneQueries.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="Foundatio.Repositories, Version=5.0.324.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\Foundatio.Repositories.5.0.324-pre\lib\net46\Foundatio.Repositories.dll</HintPath>
77+
<Reference Include="Foundatio.Repositories, Version=5.0.325.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\..\packages\Foundatio.Repositories.5.0.325-pre\lib\net46\Foundatio.Repositories.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
81-
<Reference Include="Foundatio.Repositories.Elasticsearch, Version=5.0.324.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\..\packages\Foundatio.Repositories.Elasticsearch.5.0.324-pre\lib\net46\Foundatio.Repositories.Elasticsearch.dll</HintPath>
81+
<Reference Include="Foundatio.Repositories.Elasticsearch, Version=5.0.325.0, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\..\packages\Foundatio.Repositories.Elasticsearch.5.0.325-pre\lib\net46\Foundatio.Repositories.Elasticsearch.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="McSherry.SemanticVersioning, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -112,7 +112,7 @@
112112
<Private>True</Private>
113113
</Reference>
114114
<Reference Include="Nest, Version=5.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
115-
<HintPath>..\..\packages\NEST.5.0.0-rc1\lib\net46\Nest.dll</HintPath>
115+
<HintPath>..\..\packages\NEST.5.0.0-rc2\lib\net46\Nest.dll</HintPath>
116116
<Private>True</Private>
117117
</Reference>
118118
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/Exceptionless.Api/packages.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="5.1.1" targetFramework="net461" />
4-
<package id="Elasticsearch.Net" version="5.0.0-rc1" targetFramework="net461" />
4+
<package id="Elasticsearch.Net" version="5.0.0-rc2" targetFramework="net461" />
55
<package id="Exceptionless.DateTimeExtensions" version="3.2.55" targetFramework="net461" />
66
<package id="FluentValidation" version="6.2.1.0" targetFramework="net461" />
77
<package id="Foundatio" version="4.2.1183" targetFramework="net461" />
8-
<package id="Foundatio.Parsers.ElasticQueries" version="5.0.167-pre" targetFramework="net461" />
9-
<package id="Foundatio.Parsers.LuceneQueries" version="5.0.167-pre" targetFramework="net461" />
10-
<package id="Foundatio.Repositories" version="5.0.324-pre" targetFramework="net461" />
11-
<package id="Foundatio.Repositories.Elasticsearch" version="5.0.324-pre" targetFramework="net461" />
8+
<package id="Foundatio.Parsers.ElasticQueries" version="5.0.169-pre" targetFramework="net461" />
9+
<package id="Foundatio.Parsers.LuceneQueries" version="5.0.169-pre" targetFramework="net461" />
10+
<package id="Foundatio.Repositories" version="5.0.325-pre" targetFramework="net461" />
11+
<package id="Foundatio.Repositories.Elasticsearch" version="5.0.325-pre" targetFramework="net461" />
1212
<package id="McSherry.SemanticVersioning" version="1.2.0" targetFramework="net461" />
1313
<package id="Microsoft.AspNet.Cors" version="5.2.3" targetFramework="net461" />
1414
<package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net461" />
@@ -22,7 +22,7 @@
2222
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net461" />
2323
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net461" />
2424
<package id="modernhttpclient" version="2.4.2" targetFramework="net461" />
25-
<package id="NEST" version="5.0.0-rc1" targetFramework="net461" />
25+
<package id="NEST" version="5.0.0-rc2" targetFramework="net461" />
2626
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
2727
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net461" />
2828
<package id="OAuth2" version="0.8.40" targetFramework="net461" />

‎src/Exceptionless.Core/Exceptionless.Core.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="Elasticsearch.Net, Version=5.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\Elasticsearch.Net.5.0.0-rc1\lib\net46\Elasticsearch.Net.dll</HintPath>
49+
<HintPath>..\..\packages\Elasticsearch.Net.5.0.0-rc2\lib\net46\Elasticsearch.Net.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Exceptionless.DateTimeExtensions, Version=3.2.55.0, Culture=neutral, processorArchitecture=MSIL">
@@ -61,20 +61,20 @@
6161
<HintPath>..\..\packages\Foundatio.4.2.1183\lib\net46\Foundatio.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Foundatio.Parsers.ElasticQueries, Version=5.0.167.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Foundatio.Parsers.ElasticQueries.5.0.167-pre\lib\net46\Foundatio.Parsers.ElasticQueries.dll</HintPath>
64+
<Reference Include="Foundatio.Parsers.ElasticQueries, Version=5.0.169.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\Foundatio.Parsers.ElasticQueries.5.0.169-pre\lib\net46\Foundatio.Parsers.ElasticQueries.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="Foundatio.Parsers.LuceneQueries, Version=5.0.167.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Foundatio.Parsers.LuceneQueries.5.0.167-pre\lib\net46\Foundatio.Parsers.LuceneQueries.dll</HintPath>
68+
<Reference Include="Foundatio.Parsers.LuceneQueries, Version=5.0.169.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\Foundatio.Parsers.LuceneQueries.5.0.169-pre\lib\net46\Foundatio.Parsers.LuceneQueries.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
72-
<Reference Include="Foundatio.Repositories, Version=5.0.324.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\..\packages\Foundatio.Repositories.5.0.324-pre\lib\net46\Foundatio.Repositories.dll</HintPath>
72+
<Reference Include="Foundatio.Repositories, Version=5.0.325.0, Culture=neutral, processorArchitecture=MSIL">
73+
<HintPath>..\..\packages\Foundatio.Repositories.5.0.325-pre\lib\net46\Foundatio.Repositories.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76-
<Reference Include="Foundatio.Repositories.Elasticsearch, Version=5.0.324.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Foundatio.Repositories.Elasticsearch.5.0.324-pre\lib\net46\Foundatio.Repositories.Elasticsearch.dll</HintPath>
76+
<Reference Include="Foundatio.Repositories.Elasticsearch, Version=5.0.325.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\Foundatio.Repositories.Elasticsearch.5.0.325-pre\lib\net46\Foundatio.Repositories.Elasticsearch.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="MaxMind.Db, Version=2.0.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
@@ -94,7 +94,7 @@
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="Nest, Version=5.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
97-
<HintPath>..\..\packages\NEST.5.0.0-rc1\lib\net46\Nest.dll</HintPath>
97+
<HintPath>..\..\packages\NEST.5.0.0-rc2\lib\net46\Nest.dll</HintPath>
9898
<Private>True</Private>
9999
</Reference>
100100
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/Exceptionless.Core/Repositories/Configuration/Indexes/StackIndex/StackIndexType.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ public override TypeMappingDescriptor<Stack> BuildMapping(TypeMappingDescriptor<
1818
.AllField(a => a.Enabled(false))
1919
.Properties(p => p
2020
.SetupDefaults()
21-
.Keyword(f => f.Name(s => s.OrganizationId).RootAlias(Alias.OrganizationId))
22-
.Keyword(f => f.Name(s => s.ProjectId).RootAlias(Alias.ProjectId))
23-
.Keyword(f => f.Name(s => s.SignatureHash).RootAlias(Alias.SignatureHash))
24-
.Keyword(f => f.Name(e => e.Type).RootAlias(Alias.Type))
25-
.Date(f => f.Name(s => s.FirstOccurrence).RootAlias(Alias.FirstOccurrence))
26-
.Date(f => f.Name(s => s.LastOccurrence).RootAlias(Alias.LastOccurrence))
27-
.Text(f => f.Name(s => s.Title).RootAlias(Alias.Title).IncludeInAll().Boost(1.1))
28-
.Text(f => f.Name(s => s.Description).RootAlias(Alias.Description).IncludeInAll())
29-
.Text(f => f.Name(s => s.Tags).RootAlias(Alias.Tags).IncludeInAll().Boost(1.2).AddKeywordField())
30-
.Text(f => f.Name(s => s.References).RootAlias(Alias.References).IncludeInAll())
31-
.Date(f => f.Name(s => s.DateFixed).RootAlias(Alias.DateFixed))
21+
.Keyword(f => f.Name(s => s.OrganizationId).Alias(Alias.OrganizationId))
22+
.Keyword(f => f.Name(s => s.ProjectId).Alias(Alias.ProjectId))
23+
.Keyword(f => f.Name(s => s.SignatureHash).Alias(Alias.SignatureHash))
24+
.Keyword(f => f.Name(e => e.Type).Alias(Alias.Type))
25+
.Date(f => f.Name(s => s.FirstOccurrence).Alias(Alias.FirstOccurrence))
26+
.Date(f => f.Name(s => s.LastOccurrence).Alias(Alias.LastOccurrence))
27+
.Text(f => f.Name(s => s.Title).Alias(Alias.Title).IncludeInAll().Boost(1.1))
28+
.Text(f => f.Name(s => s.Description).Alias(Alias.Description).IncludeInAll())
29+
.Text(f => f.Name(s => s.Tags).Alias(Alias.Tags).IncludeInAll().Boost(1.2).AddKeywordField())
30+
.Text(f => f.Name(s => s.References).Alias(Alias.References).IncludeInAll())
31+
.Date(f => f.Name(s => s.DateFixed).Alias(Alias.DateFixed))
3232
.Boolean(f => f.Name(Alias.IsFixed))
33-
.Keyword(f => f.Name(s => s.FixedInVersion).RootAlias(Alias.FixedInVersion))
34-
.Boolean(f => f.Name(s => s.IsHidden).RootAlias(Alias.IsHidden))
35-
.Boolean(f => f.Name(s => s.IsRegressed).RootAlias(Alias.IsRegressed))
36-
.Boolean(f => f.Name(s => s.OccurrencesAreCritical).RootAlias(Alias.OccurrencesAreCritical))
37-
.Number(f => f.Name(s => s.TotalOccurrences).RootAlias(Alias.TotalOccurrences))
33+
.Keyword(f => f.Name(s => s.FixedInVersion).Alias(Alias.FixedInVersion))
34+
.Boolean(f => f.Name(s => s.IsHidden).Alias(Alias.IsHidden))
35+
.Boolean(f => f.Name(s => s.IsRegressed).Alias(Alias.IsRegressed))
36+
.Boolean(f => f.Name(s => s.OccurrencesAreCritical).Alias(Alias.OccurrencesAreCritical))
37+
.Number(f => f.Name(s => s.TotalOccurrences).Alias(Alias.TotalOccurrences))
3838
);
3939
}
4040

‎src/Exceptionless.Core/Repositories/StackRepository.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ Instant parseDate(def dt) {
7777

7878
var request = new UpdateRequest<Stack, Stack>(GetIndexById(stackId), ElasticType.Type, stackId) {
7979
RetryOnConflict = 3,
80-
Script = script,
81-
Params = new Dictionary<string, object>(3) {
82-
{ "minOccurrenceDateUtc", minOccurrenceDateUtc },
83-
{ "maxOccurrenceDateUtc", maxOccurrenceDateUtc },
84-
{ "count", count }
80+
Script = new InlineScript(script) {
81+
Params = new Dictionary<string, object>(3) {
82+
{ "minOccurrenceDateUtc", minOccurrenceDateUtc },
83+
{ "maxOccurrenceDateUtc", maxOccurrenceDateUtc },
84+
{ "count", count }
85+
}
8586
}
8687
};
8788

‎src/Exceptionless.Core/Utility/EventStats.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ private double[] GetNumbers(AggregationsHelper aggregations, IEnumerable<FieldAg
301301
break;
302302
case FieldAggregationType.Term:
303303
var termResult = aggregations.Terms(field.Key);
304-
results.Add(termResult?.Buckets.Count > 0 ? termResult.Buckets[0].DocCount ?? 0 : 0);
304+
results.Add(termResult?.Buckets.Count > 0 ? termResult.Buckets.First().DocCount ?? 0 : 0);
305305
break;
306306
default:
307307
throw new InvalidOperationException($"Unknown FieldAggregation type: {field.Type}");

‎src/Exceptionless.Core/packages.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="5.1.1" targetFramework="net461" />
4-
<package id="Elasticsearch.Net" version="5.0.0-rc1" targetFramework="net461" />
4+
<package id="Elasticsearch.Net" version="5.0.0-rc2" targetFramework="net461" />
55
<package id="Exceptionless.DateTimeExtensions" version="3.2.55" targetFramework="net461" />
66
<package id="FluentValidation" version="6.2.1.0" targetFramework="net461" />
77
<package id="Foundatio" version="4.2.1183" targetFramework="net461" />
8-
<package id="Foundatio.Parsers.ElasticQueries" version="5.0.167-pre" targetFramework="net461" />
9-
<package id="Foundatio.Parsers.LuceneQueries" version="5.0.167-pre" targetFramework="net461" />
10-
<package id="Foundatio.Repositories" version="5.0.324-pre" targetFramework="net461" />
11-
<package id="Foundatio.Repositories.Elasticsearch" version="5.0.324-pre" targetFramework="net461" />
8+
<package id="Foundatio.Parsers.ElasticQueries" version="5.0.169-pre" targetFramework="net461" />
9+
<package id="Foundatio.Parsers.LuceneQueries" version="5.0.169-pre" targetFramework="net461" />
10+
<package id="Foundatio.Repositories" version="5.0.325-pre" targetFramework="net461" />
11+
<package id="Foundatio.Repositories.Elasticsearch" version="5.0.325-pre" targetFramework="net461" />
1212
<package id="MaxMind.Db" version="2.1.2" targetFramework="net461" />
1313
<package id="MaxMind.GeoIP2" version="2.7.1" targetFramework="net461" />
1414
<package id="McSherry.SemanticVersioning" version="1.2.0" targetFramework="net461" />
1515
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
1616
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net461" />
1717
<package id="modernhttpclient" version="2.4.2" targetFramework="net461" />
18-
<package id="NEST" version="5.0.0-rc1" targetFramework="net461" />
18+
<package id="NEST" version="5.0.0-rc2" targetFramework="net461" />
1919
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
2020
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net461" />
2121
<package id="Pegasus" version="3.1.2" targetFramework="net461" />

0 commit comments

Comments
 (0)