Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b7bd8a1

Browse filesBrowse files
loktionov129loktionov129
committed
feat(core): add grafana + prometheus
1 parent 782709e commit b7bd8a1
Copy full SHA for b7bd8a1

19 files changed

+445-21Lines changed: 445 additions & 21 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎docker/docker-compose.dev.yml‎

Copy file name to clipboardExpand all lines: docker/docker-compose.dev.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- postgres:/var/lib/postgresql/data
2020

2121
mpgpelastickibana:
22-
image: nshou/elasticsearch-kibana
22+
image: mpgp129/mpgpelastickibana
2323
hostname: mpgpelastickibana
2424
expose:
2525
- 9200
Collapse file

‎docker/docker-compose.prod.yml‎

Copy file name to clipboardExpand all lines: docker/docker-compose.prod.yml
+49-13Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,26 @@ services:
1818
volumes:
1919
- postgres:/var/lib/postgresql/data
2020

21+
mpgpelastickibana:
22+
image: mpgp129/mpgpelastickibana
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+
2134
mpgpweb:
2235
links:
2336
- mpgpdb
37+
- mpgpelastickibana
2438
depends_on:
2539
- mpgpdb
40+
- mpgpelastickibana
2641
image: mpgp129/mpgpweb
2742
hostname: mpgpweb
2843
expose:
@@ -44,25 +59,46 @@ services:
4459
/bin/sh -c "
4560
apt-get install -y wget
4661
&& wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz
47-
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.6.1.tar.gz
48-
&& rm dockerize-linux-amd64-v0.6.1.tar.gz
49-
&& dockerize -wait tcp://mpgpdb:5432 -timeout 1m
62+
&& tar -C ./ -xzvf dockerize-linux-amd64-v0.6.1.tar.gz
63+
&& ./dockerize -wait tcp://mpgpdb:5432 -timeout 1m
64+
&& rm dockerize-linux-amd64-v0.6.1.tar.gz dockerize
5065
&& envsubst < appsettings.json > temp.json && mv -f temp.json appsettings.json
51-
&& sed -i ‘s|http://localhost:9200|http://mpgpelastickibana:9200|g' nlog.config
66+
&& sed -i 's|http://localhost:9200|http://mpgpelastickibana:9200|g' nlog.config
5267
&& dotnet Mpgp.RestApiServer.dll"
5368
54-
mpgpelastickibana:
55-
image: nshou/elasticsearch-kibana
56-
hostname: mpgpelastickibana
69+
mpgpprometheus:
70+
links:
71+
- mpgpweb
72+
depends_on:
73+
- mpgpweb
74+
image: mpgp129/mpgpprometheus
75+
hostname: mpgpprometheus
5776
expose:
58-
- 9200
59-
- 5601
77+
- 9090
6078
ports:
61-
- 9200:9200
62-
- 5601:5601
63-
container_name: mpgpelastickibana
79+
- 9090:9090
80+
container_name: mpgpprometheus
6481
labels:
65-
- SERVICE_NAME=mpgpelastickibana
82+
- SERVICE_NAME=mpgpprometheus
83+
84+
mpgpgrafana:
85+
environment:
86+
- GF_SECURITY_ADMIN_PASSWORD=12345678
87+
links:
88+
- mpgpelastickibana
89+
- mpgpprometheus
90+
depends_on:
91+
- mpgpelastickibana
92+
- mpgpprometheus
93+
image: mpgp129/mpgpgrafana
94+
hostname: mpgpgrafana
95+
expose:
96+
- 3000
97+
ports:
98+
- 3000:3000
99+
container_name: mpgpgrafana
100+
labels:
101+
- SERVICE_NAME=mpgpgrafana
66102

67103
volumes:
68104
postgres:
Collapse file

‎docker/mpgpdb/.dockerignore‎

Copy file name to clipboardExpand all lines: docker/mpgpdb/.dockerignore
+7-6Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1+
.DS_Store
2+
.travis.yml
3+
.circleci
14
.github
25
.git
36
.gitignore
47
.dockerignore
58
libs
69
scripts
7-
src/**/[Oo]bj/
8-
src/**/[Bb]in/
9-
src/**/[Dd]ebug/
10-
src/**/[Rr]elease/
11-
TestResults/
10+
src
11+
tools
12+
TestResults
1213
.nuget/
1314
_ReSharper.*/
14-
packages/
15+
packages
1516
PublishProfiles/
1617
*.user
1718
*.suo
Collapse file

‎docker/mpgpelastickibana/Dockerfile‎

Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM nshou/elasticsearch-kibana AS mpgpelastickibana
2+
3+
USER root
4+
RUN apk add curl
5+
6+
USER elasticsearch
7+
8+
COPY ./docker/mpgpelastickibana/index.json /home/elasticsearch/
9+
10+
CMD sh kibana/bin/kibana --host 0.0.0.0 -Q \
11+
& sh elasticsearch/bin/elasticsearch -E http.host=0.0.0.0 --quiet \
12+
& sleep 60 \
13+
&& curl -XPOST http://localhost:5601/api/saved_objects/index-pattern/13fd5de0-d09f-11e9-ac5e-6b76646c8bd0 -H 'Content-Type: application/json' -H 'kbn-xsrf: true' -d @index.json \
14+
&& sh
Collapse file

‎docker/mpgpelastickibana/index.json‎

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"attributes": {
3+
"title": "mpgp-*",
4+
"fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"EventId.Id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"EventId_Id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"KeyId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"KeyId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"exception.ErrorCode\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"exception.ErrorCode.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"exception.HResult\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"exception.Message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"exception.Message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"exception.Source\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"exception.Source.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"exception.StackTrace\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"exception.StackTrace.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
5+
}
6+
}
Collapse file

‎docker/mpgpgrafana/.dockerignore‎

Copy file name to clipboard
+36Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.DS_Store
2+
.travis.yml
3+
.circleci
4+
.github
5+
.git
6+
.gitignore
7+
.dockerignore
8+
artifacts
9+
libs
10+
scripts
11+
src
12+
tools
13+
TestResults
14+
.nuget/
15+
_ReSharper.*/
16+
packages
17+
PublishProfiles/
18+
*.user
19+
*.suo
20+
*.cache
21+
*.docstates
22+
_ReSharper.*
23+
nuget.exe
24+
*net45.csproj
25+
*k10.csproj
26+
*.psess
27+
*.vsp
28+
*.pidb
29+
*.userprefs
30+
*DS_Store
31+
*.ncrunchsolution
32+
*.*sdf
33+
*.ipch
34+
.vs/
35+
project.lock.json
36+
docker/pg_data/
Collapse file

‎docker/mpgpgrafana/Dockerfile‎

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM grafana/grafana AS mpgpgrafana
2+
3+
ADD ./docker/mpgpgrafana/dashboards /var/lib/grafana/dashboards
4+
ADD ./docker/mpgpgrafana/provisioning /etc/grafana/provisioning
5+
ADD ./docker/mpgpgrafana/config.ini /etc/grafana/config.ini
Collapse file

‎docker/mpgpgrafana/config.ini‎

Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[paths]
2+
provisioning = /etc/grafana/provisioning
3+
4+
[server]
5+
enable_gzip = true
6+
7+
[users]
8+
default_theme = light

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.