File tree Expand file tree Collapse file tree 2 files changed +21
-3
lines changed
config/grafana/datasources Expand file tree Collapse file tree 2 files changed +21
-3
lines changed Original file line number Diff line number Diff line change @@ -3,24 +3,33 @@ apiVersion: 1
33datasources :
44 - name : Elasticsearch-logs-es01
55 type : elasticsearch
6- url : http ://sentinel-kit-db-elasticsearch-es01:9200
6+ url : https ://sentinel-kit-db-elasticsearch-es01:9200
77 access : proxy
88 isDefault : false
99 version : 9
1010 database : ' *'
11+ basicAuth : true
12+ basicAuthUser : elastic
13+ secureJsonData :
14+ basicAuthPassword : " ${ES_PASSWORD}"
1115 jsonData :
1216 esVersion : 90
1317 timeField : ' @timestamp'
1418 maxConcurrentShardRequests : 5
1519 readOnly : false
1620 orgId : 1
21+
1722 - name : Elasticsearch-logs-es02
1823 type : elasticsearch
19- url : http ://sentinel-kit-db-elasticsearch-es02:9200
24+ url : https ://sentinel-kit-db-elasticsearch-es02:9200
2025 access : proxy
2126 isDefault : false
2227 version : 9
2328 database : ' *'
29+ basicAuth : true
30+ basicAuthUser : elastic
31+ secureJsonData :
32+ basicAuthPassword : " ${ES_PASSWORD}"
2433 jsonData :
2534 esVersion : 90
2635 timeField : ' @timestamp'
Original file line number Diff line number Diff line change @@ -313,20 +313,29 @@ services:
313313 hostname : ${SENTINELKIT_GRAFANA_HOSTNAME}
314314 image : grafana/grafana:latest
315315 restart : on-failure
316+ user : " 0"
316317 volumes :
317- - ./config/certificates/grafana :/etc/grafana/ssl :ro
318+ - ./config/certificates/elasticsearch/ca/ca.crt :/etc/grafana/certs/elasticsearch-ca.crt :ro
318319 - ./data/grafana:/var/lib/grafana
319320 - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
320321 - ./config/grafana/dashboards:/etc/grafana/provisioning/dashboards
321322 environment :
322323 - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER}
323324 - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}
324325 - GF_SERVER_HTTP_PORT=3000
326+ - ES_PASSWORD=${ELASTICSEARCH_PASSWORD}
325327 networks :
326328 - sentinel-kit-network
327329 depends_on :
328330 - sentinel-kit-utils-prometheus
329331 - sentinel-kit-db-elasticsearch-es01
332+ entrypoint :
333+ - /bin/sh
334+ - -c
335+ - |
336+ cp /etc/grafana/certs/elasticsearch-ca.crt /usr/local/share/ca-certificates/elasticsearch-ca.crt
337+ update-ca-certificates
338+ /run.sh
330339
331340 sentinel-kit-utils-phpmyadmin :
332341 container_name : sentinel-kit-utils-phpmyadmin
You can’t perform that action at this time.
0 commit comments