Skip to content

Commit 905ee9d

Browse files
prajeeshprathapprajeeshprathap
committed
fixed rename
1 parent 58f57e2 commit 905ee9d

File tree

7 files changed

+102
-5
lines changed

7 files changed

+102
-5
lines changed

‎ResilientMicroservices.Sample/Fluentd/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM fluent/fluentd:v1.1
2+
RUN ["gem", "install", "fluent-plugin-elasticsearch"]

‎ResilientMicroservices.Sample/Fluentd/conf/fluent.conf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<source>
2+
@type forward
3+
port 24224
4+
bind 0.0.0.0
5+
</source>
6+
7+
<filter **>
8+
@type parser
9+
format json
10+
key_name log
11+
reserve_data true
12+
</filter>
13+
14+
<match **>
15+
@type elasticsearch
16+
log_level info
17+
include_tag_key true
18+
host elasticsearch
19+
port 9200
20+
scheme http
21+
user
22+
password xxxxxx
23+
reload_connections true
24+
logstash_prefix logstash
25+
logstash_format true
26+
buffer_chunk_limit 2M
27+
buffer_queue_limit 32
28+
flush_interval 5s
29+
max_retry_wait 30
30+
disable_retry_limit
31+
num_threads 8
32+
</match>

‎ResilientMicroservices.Sample/Postman/ReactiveMicroservices.postman_collection.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info": {
3-
"_postman_id": "127d9e4c-e2fb-44b7-a7e5-fc0e3a774bdf",
3+
"_postman_id": "e3550bef-2c41-4c33-9a84-aa3588a19408",
44
"name": "ReactiveMicroservices",
55
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
66
},
@@ -83,7 +83,7 @@
8383
],
8484
"body": {
8585
"mode": "raw",
86-
"raw": "1000.0"
86+
"raw": "4000.0"
8787
},
8888
"url": {
8989
"raw": "http://localhost:32001/api/Customer/b3d27f9b-d21d-327c-164e-7fb6776f87b0",
@@ -118,15 +118,15 @@
118118
"raw": "{\r\n \"Id\": \"b4d27f9b-d21d-327c-164e-7fb6776f87b0\",\r\n \"CustomerId\": \"b3d27f9b-d21d-327c-164e-7fb6776f87b0\",\r\n \"Amount\": 800.0\r\n}"
119119
},
120120
"url": {
121-
"raw": "http://localhost:32002/api/Order/NewOrder",
121+
"raw": "http://localhost:32002/api/Orders/NewOrder",
122122
"protocol": "http",
123123
"host": [
124124
"localhost"
125125
],
126126
"port": "32002",
127127
"path": [
128128
"api",
129-
"Order",
129+
"Orders",
130130
"NewOrder"
131131
]
132132
}

‎ResilientMicroservices.Sample/ReactiveMicroservices.Sample.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Postman", "Postman", "{206A
3636
Postman\ReactiveMicroservices.postman_collection.json = Postman\ReactiveMicroservices.postman_collection.json
3737
EndProjectSection
3838
EndProject
39+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FluentD", "FluentD", "{687DCF5A-F257-40DA-A13F-64FFEAE35C4A}"
40+
ProjectSection(SolutionItems) = preProject
41+
Fluentd\Dockerfile = Fluentd\Dockerfile
42+
EndProjectSection
43+
EndProject
44+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conf", "conf", "{A3D3AF13-CBD1-4F20-98CE-66C6AB7147C1}"
45+
ProjectSection(SolutionItems) = preProject
46+
Fluentd\conf\fluent.conf = Fluentd\conf\fluent.conf
47+
EndProjectSection
48+
EndProject
3949
Global
4050
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4151
Debug|Any CPU = Debug|Any CPU
@@ -101,6 +111,7 @@ Global
101111
{20ECBDE4-534D-4849-BF9D-B3575DD9184E} = {42759AB5-81C9-4706-8128-B9F2F9D30E51}
102112
{9B7359D3-4B40-40ED-B44C-DA49F0B5C46C} = {FFC623E3-9A6C-428C-B4AB-0D239AD7EF70}
103113
{765D90BD-1BC6-4E57-9276-D0D897B5AC8D} = {FFC623E3-9A6C-428C-B4AB-0D239AD7EF70}
114+
{A3D3AF13-CBD1-4F20-98CE-66C6AB7147C1} = {687DCF5A-F257-40DA-A13F-64FFEAE35C4A}
104115
EndGlobalSection
105116
GlobalSection(ExtensibilityGlobals) = postSolution
106117
SolutionGuid = {A61F5FA7-4FD2-4CD5-92AB-985A8ECFC257}

‎ResilientMicroservices.Sample/Start.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker-compose -f "docker-compose.yml" -f "docker-compose.override.yml" -p dockercomposelocalrun up -d
1+
docker-compose -f "docker-compose.yml" -f "docker-compose.override.yml" -f "docker-compose.efk.yml" -p dockercomposelocalrun up -d

‎ResilientMicroservices.Sample/docker-compose.dcproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<DockerServiceName>orderservice</DockerServiceName>
1010
</PropertyGroup>
1111
<ItemGroup>
12+
<None Include="docker-compose.efk.yml" />
1213
<None Include="docker-compose.override.yml">
1314
<DependentUpon>docker-compose.yml</DependentUpon>
1415
</None>

‎ResilientMicroservices.Sample/docker-compose.efk.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
version: '3.4'
2+
3+
services:
4+
elasticsearch:
5+
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
6+
environment:
7+
- "discovery.type=single-node"
8+
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
9+
deploy:
10+
resources:
11+
limits:
12+
memory: 1Gi
13+
ports:
14+
- 9200:9200
15+
- 9300:9300
16+
17+
kibana:
18+
image: docker.elastic.co/kibana/kibana-oss:6.2.4
19+
depends_on:
20+
- elasticsearch
21+
links:
22+
- "elasticsearch"
23+
ports:
24+
- 5601:5601
25+
26+
fluentd:
27+
image: fluentdelasticsearch
28+
build:
29+
context: ./Fluentd
30+
dockerfile: Dockerfile
31+
volumes:
32+
- ./fluentd/conf:/fluentd/etc
33+
depends_on:
34+
- elasticsearch
35+
links:
36+
- "elasticsearch"
37+
ports:
38+
- "24224:24224"
39+
- "24224:24224/udp"
40+
41+
customerservice:
42+
depends_on:
43+
- fluentd
44+
logging:
45+
driver: fluentd
46+
47+
orderservice:
48+
depends_on:
49+
- fluentd
50+
logging:
51+
driver: fluentd

0 commit comments

Comments
 (0)