Skip to content

Commit 222302f

Browse files
committed
Add additional loki configuration
1 parent 2a19a7c commit 222302f

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

ansible/playbooks/grafana/docker-compose.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
services:
22
loki:
33
image: grafana/loki:3.4.2
4+
container_name: loki
45
user: '0'
56
restart: unless-stopped
67
ports:
@@ -11,13 +12,15 @@ services:
1112

1213
promtail:
1314
image: grafana/promtail:3.4.2
15+
container_name: promtail
1416
volumes:
1517
- /var/log:/var/log
1618
restart: unless-stopped
1719
command: -config.file=/etc/promtail/config.yml
1820

1921
grafana:
2022
image: grafana/grafana:11.5.2
23+
container_name: grafana
2124
environment:
2225
- GF_PATHS_PROVISIONING=/etc/grafana/provisioning
2326
- GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode
@@ -38,7 +41,7 @@ services:
3841
access: proxy
3942
orgId: 1
4043
url: http://loki:3100
41-
basicAuth: false
44+
basicAuth: true
4245
isDefault: true
4346
version: 1
4447
editable: false

ansible/tasks/install-docker-on-ubuntu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
- name: Install loki docker driver
3333
community.docker.docker_plugin:
34-
plugin_name: grafana/loki-docker-driver
34+
plugin_name: grafana/loki-docker-driver:3.4.2-amd64
3535
alias: loki
3636
state: present
3737

@@ -48,7 +48,11 @@
4848
"log-driver": "loki",
4949
"log-opts": {
5050
"loki-url": "{{ loki_url }}",
51-
"loki-batch-size": "400"
51+
"loki-batch-size": "400",
52+
"mode": "non-blocking",
53+
"loki-retries": "2",
54+
"loki-max-backoff":"800ms",
55+
"loki-timeout":"1s"
5256
}
5357
}
5458
dest: /etc/docker/daemon.json

0 commit comments

Comments
 (0)