Merge pull request #649 from exceptionless/feature/discard-join

Feature/discard join

Author: ejsmith

.github/workflows/build.yaml

@@ -1,8 +1,5 @@
 name: Build
 on: [ push, pull_request ]
-env:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  DOTNET_NOLOGO: true
 
 jobs:
   build:
@@ -71,7 +68,7 @@ jobs:
       if: github.event_name != 'pull_request'
       uses: azure/setup-helm@v1
       with:
-        version: v3.2.3
+        version: v3.3.0
     - name: Deploy Changes to Development Environment
       if: github.ref == 'refs/heads/feature/discard-join' && github.event_name != 'pull_request'
       run: |

.github/workflows/elasticsearch-docker.yml

@@ -8,9 +8,9 @@ on:
 jobs:
 
   build:
- 
+
     runs-on: ubuntu-latest
- 
+
     steps:
     - uses: actions/checkout@v1
     - name: Build custom Elasticsearch docker image

.vscode/settings.json

@@ -15,5 +15,6 @@
         "editorconfig",
         "elasticsearch",
         "gitignore"
-    ]
+    ],
+    "powershell.codeFormatting.addWhitespaceAroundPipe": true
 }

Dockerfile

@@ -78,7 +78,7 @@ CMD [ "dotnet", "Exceptionless.Web.dll" ]
 
 # completely self-contained
 
-FROM exceptionless/elasticsearch:7.7.1 AS exceptionless
+FROM exceptionless/elasticsearch:7.8.1 AS exceptionless
 
 WORKDIR /app
 COPY --from=api-publish /app/src/Exceptionless.Web/out ./

Exceptionless.sln

@@ -1,21 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30001.183
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Core", "src\Exceptionless.Core\Exceptionless.Core.csproj", "{3E5B39D5-7ACD-486B-9F90-59116B67952D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{98A5A2F7-BBA9-4B65-91C9-88E18D474341}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.github\workflows\build.yaml = .github\workflows\build.yaml
 		build\common.props = build\common.props
 		CONTRIBUTING.md = CONTRIBUTING.md
+		docker-compose.yml = docker-compose.yml
 		Dockerfile = Dockerfile
 		global.json = global.json
 		LICENSE.txt = LICENSE.txt
 		NuGet.Config = NuGet.Config
 		README.md = README.md
-		docker-compose.yml = docker-compose.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Insulation", "src\Exceptionless.Insulation\Exceptionless.Insulation.csproj", "{75D9D89F-09F2-43A6-8B53-E1518E9FA822}"
@@ -56,7 +57,8 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
 			GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A90AFA5-B81C-4B1B-9DFA-2D90F8CA0EF0}
-			EndGlobalSection
+	EndGlobalSection
 EndGlobal

NuGet.Config

@@ -2,5 +2,6 @@
 <configuration>
   <packageSources>
     <add key="Foundatio" value="https://f.feedz.io/foundatio/foundatio/nuget/index.json" />
+    <add key="StackOverflow" value="https://www.myget.org/F/stackoverflow/api/v3/index.json" />
   </packageSources>
 </configuration>

build/common.props

@@ -13,6 +13,8 @@
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <ReferenceFoundatioSource>false</ReferenceFoundatioSource>
+    <ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
   </PropertyGroup>
 
   <ItemGroup>

build/docker-entrypoint.sh

@@ -12,6 +12,10 @@ else
     mkdir -p /var/log/supervisor
     mkdir -p Temp/
 
+    sed -i -E "s/app\//app\/wwwroot\//" /usr/local/bin/bootstrap
+    sed -i -E "s/nginx//" /usr/local/bin/bootstrap
+    /usr/local/bin/bootstrap
+
     supervisord -c /etc/supervisord.conf
     sleep 3
 

docker-compose.dev.yml

@@ -52,7 +52,7 @@ services:
       - appdata:/app/storage
 
   elasticsearch:
-    image: exceptionless/elasticsearch:7.7.1
+    image: exceptionless/elasticsearch:7.9.0
     environment:
       discovery.type: single-node
       xpack.security.enabled: 'false'
@@ -62,11 +62,11 @@ services:
       - 9300:9300
     volumes:
       - esdata7:/usr/share/elasticsearch/data
-  
+
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:7.7.1
+    image: docker.elastic.co/kibana/kibana:7.9.0
     ports:
       - 5601:5601
 

docker-compose.yml

@@ -5,27 +5,27 @@ version: '3.5'
 
 services:
   elasticsearch:
-    image: exceptionless/elasticsearch:7.7.1
+    image: exceptionless/elasticsearch:7.9.0
     environment:
       discovery.type: single-node
       xpack.security.enabled: 'false'
       ES_JAVA_OPTS: -Xms1g -Xmx1g
     ports:
       - 9200:9200
       - 9300:9300
-  
+
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:7.7.1
+    image: docker.elastic.co/kibana/kibana:7.9.0
     ports:
       - 5601:5601
 
   redis:
     image: redis:6.0-alpine
     ports:
       - 6379:6379
-  
+
   ui:
     image: exceptionless/ui:latest
     environment:
@@ -34,7 +34,7 @@ services:
       EX_Html5Mode: 'true'
     ports:
       - 5100:80
-  
+
   ready:
     image: dadarek/wait-for-dependencies
     command: elasticsearch:9200