ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,086 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

87 Commits

Author SHA1 Message Date
jmanuelcorral
0706c724ad Changed default logstashUrl to null 2019-03-27 15:58:57 +01:00
jmanuelcorral
a0699501b1 Merged from Dev 2019-03-27 15:54:03 +01:00
jmanuelcorral
905f8552d9 Updated pointing to ELK external service for testing and demo purposes 2019-03-22 13:45:02 +01:00
jmanuelcorral
65b7b31d8d Done Updating versions 2019-03-21 16:38:01 +01:00
jmanuelcorral
06e07914e1 First version with Kibana/ElasticSearch & Logstash, needs refactor 2019-03-19 15:57:47 +01:00
Miguel Veloso
d5adb5f723 Update HealthChecks UI libraries to properly handle missing services. 2019-03-18 16:53:34 +00:00
Miguel Veloso
5c2b145ec2 Commented out local configuration, to avoid exception 2019-03-14 16:50:44 +00:00
Miguel Veloso
461c162056 Fix bad previous fix 2019-03-05 12:43:55 +00:00
Miguel Veloso
c19e1883f4 Fix JSON structure error. 2019-03-05 11:05:50 +00:00
Miguel Veloso
c1d7ca8951 Merge branch 'dev' into features/add-seq-sink 
# Conflicts SOLVED:
#	.gitignore
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Program.cs
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Program.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Identity/Identity.API/Program.cs
#	src/Services/Identity/Identity.API/Startup.cs
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.API/Program.cs
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Program.cs
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.API/Program.cs
#	src/Services/Ordering/Ordering.API/Startup.cs
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Program.cs
#	src/Services/Ordering/Ordering.SignalrHub/Startup.cs
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Payment/Payment.API/Program.cs
#	src/Services/Payment/Payment.API/Startup.cs
#	src/Web/WebMVC/Program.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebStatus/Program.cs
#	src/Web/WebStatus/Startup.cs
#	src/Web/WebStatus/WebStatus.csproj
 2019-02-28 15:34:12 +00:00
Igor_Sychev
e98c625f81 runfix 2019-02-28 11:43:44 +03:00
Miguel Veloso
b6b0744c74 Standarize ApplicationContext logging property 2019-02-26 21:59:16 +00:00
Miguel Veloso
38a86f19c4 General refactoring for documentation 2019-02-26 21:55:04 +00:00
Igor_Sychev
185a5dcc31 minor packages update 
replace preview apis with production
replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher
replace  loggerFactory.AddAzureWebAppDiagnostics(); with  loggerBuilder.AddAzureWebAppDiagnostics();
 2019-02-26 22:28:30 +03:00
Miguel Veloso
37409e8869 Add Seq to WebStatus 2019-02-18 16:53:29 +00:00
Ramón Tomás
a387f21029 fixed merge 2019-01-03 18:42:26 +01:00
Ramón Tomás
b9dcc80acd Merge Netcore2.2 branch 2019-01-03 18:41:58 +01:00
Ramón Tomás
dbf175f913 Fixed missing env variables in marketing.api in k8s scripts 
Added Resource path in webstatus UI when deploying with K8S
Added Liveness healthChecks
Updated k8s healthcheck configuration
 2019-01-03 17:11:56 +01:00
Ramón Tomás
fa0b1a7a6b Added serilog 2018-12-13 12:13:59 +01:00
Ramón Tomás
ffca2da0b3 Migrated to netcore 2.2 2018-12-11 13:51:58 +01:00
Ramón Tomás
25bef6dce4 Updated Webstatus startup 
Ignore temp healthchecksdb
 2018-12-04 21:49:14 +01:00
Ramón Tomás
0f6f4e6d14 Integrate HealthCheck to all eShop services and apps 
Integrate WebStatus with Healthcheck
 2018-11-30 17:43:22 +01:00
RamonTC
06e641a97f
Merge pull request #851 from erikpique/feature/60697 
Feature/60697
 2018-11-26 17:40:27 +01:00
Erik Pique
deb3d38ebe add features api 2018-11-14 16:21:50 +01:00
erikpique
6aaa718af5
Merge branch 'dev' into feature/net22preview3 2018-11-13 10:25:42 +01:00
Erik Pique
9775219a34 change netcore 2.1 to 2.2 and update nugets 2018-11-12 17:27:54 +01:00
Ramón Tomás
a92c48ee22 Removed bower from WebStatus app 
Migrated WebStatus app to Bootstrap 4
 2018-09-27 10:51:44 +02:00
eiximenis
51236fd5af Update to netcore2.1 RTM 
Updates to web Dockerfiles to support microsoft/dotnet:2.1-sdk
 2018-06-01 18:59:14 +02:00
eiximenis
684aa4927f Updates to make it work with Docker 
- Dockerfiles changes
- Minor csproj updates to bring back "dotnet bundle" cli
- Enable all protocols in SignalR
- Update package-lock.json in spa
 2018-05-16 14:45:15 +02:00
Unai Zorrilla Castro
b02c1b825d Migrate all dockerfiles to use 2.1 image. Added ApiBehaviorOptions into Catalog 2018-05-15 16:27:10 +02:00
Unai Zorrilla Castro
d1b6bc84fa Migrated projects and references to use 2.1 rc1 libraries 2018-05-15 12:42:08 +02:00
eiximenis
31669d5d2d Merge branch 'features/netcore2.1' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2018-05-11 11:26:19 +02:00
Miguel Veloso
794be31f53 Include Ordering.BackgroundTasks in webstatus check 2018-05-10 11:31:11 +01:00
Ramón Tomás
02f94eeb0e Updated k8s scripts 2018-04-16 19:28:12 +02:00
Miguel Veloso
b12b536439
Merge pull request #524 from SychevIgor/packagesupdate 
packages update
 2018-03-17 16:25:58 +00:00
Cesar De la Torre Llorente
c17ecfa16a Fallback to aspnetcore-build:2.0.5-2.1.4 until issue with aspnetcore-build:2.0 is solved: https://github.com/dotnet-architecture/eShopOnContainers/issues/543 2018-03-14 16:35:51 -07:00
Sychev Igor
039632bebd docker to 2.0.5 .net core 2018-03-05 00:59:27 +03:00
Sychev Igor
c1db0703a7 packages update 2 2018-03-04 14:10:51 +03:00
Sychev Igor
ccad354645 packages update 2018-03-04 14:10:51 +03:00
Cesar De la Torre
c5038ad77e
Merge pull request #487 from yantang-msft/FixDeployment 
Update AI k8s package version, otherwise kubernetes deployment will fail
 2018-02-09 13:12:11 -08:00
yantang
23bdd59b10 Update AI k8s package version, otherwise kubernetes deployment will fail because of deadlock. 2018-01-28 23:33:44 -08:00
Eduard Tomàs
9371eb1077 Add a endpoint returning only a 200 to be used as a liveness probe for k8s 2018-01-22 11:46:18 +01:00
Cesar De la Torre
ded64feae2
Merge pull request #452 from SychevIgor/k8appinsbeta2 
Upgrades to "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2"
 2018-01-16 12:41:29 -08:00
yanchenw
607a30491e Optimize multistage build 2018-01-04 15:00:05 -08:00
yanchenw
e4fa15b813 Optimize multi-stage build Dockerfile 
Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.

Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj.
 2018-01-04 11:01:45 -08:00
Sychev Igor
470e626802 "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2" 2018-01-04 10:11:32 +03:00
Sychev Igor
77e5f9ba5a images to support 2.0.3 packages with security fixes 2017-12-14 09:16:34 +03:00
Sychev Igor
924c735072 microsoft packages to latest. including Logging from .net standard 1.3 to 2.0 upgrade 2017-12-14 09:16:34 +03:00
Sychev Igor
595e6e49a3 Microsoft.ApplicationInsights.ServiceFabric to 2.0.1-beta1 2017-12-12 10:13:34 +03:00
yanchenw
091ed81e7b Converts to use multi-stage build Dockerfile 
1. Changes the build context of all services to the root level to be
able to access the dependencies for each project.
2. Commented out the prepublish scripts, these steps are moved into the
Dockerfile

Did not change any script yet, need help to identify what scripts we
need to change.
 2017-11-27 13:48:31 -08:00