Skip to content

Commit 9e00ae2

Browse files
committed
feat(core): add elasticsearch and kibana support
1 parent 03065eb commit 9e00ae2

File tree

4 files changed

+45
-6
lines changed

4 files changed

+45
-6
lines changed

docker/docker-compose.dev.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,21 @@ services:
1616
labels:
1717
- SERVICE_NAME=mpgpdb
1818
volumes:
19-
- ./pg_data:/var/lib/postgresql/data
19+
- postgres:/var/lib/postgresql/data
20+
21+
mpgpelastickibana:
22+
image: nshou/elasticsearch-kibana
23+
hostname: mpgpelastickibana
24+
expose:
25+
- 9200
26+
- 5601
27+
ports:
28+
- 9200:9200
29+
- 5601:5601
30+
container_name: mpgpelastickibana
31+
labels:
32+
- SERVICE_NAME=mpgpelastickibana
33+
34+
volumes:
35+
postgres:
36+
# sed -i "s|%$ENV_KEY1%|$ENV_VALUE1|g;s|%$ENV_KEY2%|$ENV_VALUE2|g" appsettings.json

docker/docker-compose.prod.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
labels:
1717
- SERVICE_NAME=mpgpdb
1818
volumes:
19-
- ./pg_data:/var/lib/postgresql/data
19+
- postgres:/var/lib/postgresql/data
2020

2121
mpgpweb:
2222
links:
@@ -48,6 +48,22 @@ services:
4848
&& rm dockerize-linux-amd64-v0.6.1.tar.gz
4949
&& dockerize -wait tcp://mpgpdb:5432 -timeout 1m
5050
&& envsubst < appsettings.json > temp.json && mv -f temp.json appsettings.json
51+
&& sed -i ‘s|http://localhost:9200|http://mpgpelastickibana:9200|g' nlog.config
5152
&& dotnet Mpgp.RestApiServer.dll"
5253
54+
mpgpelastickibana:
55+
image: nshou/elasticsearch-kibana
56+
hostname: mpgpelastickibana
57+
expose:
58+
- 9200
59+
- 5601
60+
ports:
61+
- 9200:9200
62+
- 5601:5601
63+
container_name: mpgpelastickibana
64+
labels:
65+
- SERVICE_NAME=mpgpelastickibana
66+
67+
volumes:
68+
postgres:
5369
# sed -i "s|%$ENV_KEY1%|$ENV_VALUE1|g;s|%$ENV_KEY2%|$ENV_VALUE2|g" appsettings.json

src/Mpgp.RestApiServer/Mpgp.RestApiServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.6" />
3333
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="2.2.0" />
3434
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
35+
<PackageReference Include="NLog.Targets.ElasticSearch" Version="6.1.0" />
3536
<PackageReference Include="NLog.Web.AspNetCore" Version="4.7.0" />
3637
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
3738
</ItemGroup>

tools/nlog.config

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@
1212
<variable name="logLayoutAll" value="${uppercase:${level}}: [${longdate}] ${logger} '${message}' | ${exception:format=tostring}" />
1313
<variable name="logLayoutOurWeb" value="${var:logLayoutAll} |URL: ${aspnet-request-url} |ACTION: ${aspnet-mvc-action} |${callsite}" />
1414

15+
<extensions>
16+
<add assembly="NLog.Targets.ElasticSearch"/>
17+
</extensions>
18+
1519
<targets>
20+
<target xsi:type="ElasticSearch" name="elastic" uri="http://localhost:9200" index="mpgp-${date:format=yyyy.MM.dd}" documentType="logevent" includeAllProperties="true"/>
1621
<!-- Write logs to console -->
1722
<target xsi:type="Console" name="consoleAllError" layout="${var:logLayoutAll}" />
1823
<target xsi:type="Console" name="consoleOwnWebError" layout="${var:logLayoutOurWeb}" />
@@ -31,12 +36,12 @@
3136
<logger name="Mpgp.RestApiServer.Controllers.ExceptionController*" minlevel="Error" writeTo="fileClientError" final="true" /> <!-- BlackHole -->
3237

3338
<!-- All logs, including from Microsoft -->
34-
<logger name="*" maxlevel="Warn" writeTo="fileAllMain" />
39+
<logger name="*" maxlevel="Warn" writeTo="fileAllMain," />
3540
<logger name="*" minlevel="Error" writeTo="fileAllError,consoleAllError" />
3641

3742
<!-- Skip non-critical Microsoft logs and so log only own logs -->
3843
<logger name="Microsoft.*" maxlevel="Info" final="true" /> <!-- BlackHole -->
39-
<logger name="*" maxlevel="Warn" writeTo="fileOwnWebMain" />
40-
<logger name="*" minlevel="Error" writeTo="fileOwnWebError,consoleOwnWebError" />
44+
<logger name="*" maxlevel="Warn" writeTo="fileOwnWebMain,elastic" />
45+
<logger name="*" minlevel="Error" writeTo="fileOwnWebError,consoleOwnWebError,elastic" />
4146
</rules>
42-
</nlog>
47+
</nlog>

0 commit comments

Comments
 (0)