Update 5 files

- /configs/grafana-configs/datasources.yaml
- /configs/grafana-configs/grafana.ini
- /configs/grafana-configs/.env
- /.env
- /docker-cmpose.yml

.env

@@ -0,0 +1,11 @@
+HOST=
+
+GRAFANA_IMAGE=
+GRAFANA_CONTAINER_NAME=
+
+LOKI_IMAGE=
+LOKI_CONTAINER_NAME= 
+
+
+LOKI_NETWORK=
+PROXY_NETWORK=

configs/grafana-configs/.env

@@ -1,16 +1,16 @@
 GRAFANA_TOKEN=
-GRAFANA_ADMIN_ACCOUNT=admin
-GRAFANA_ADMIN_PASSWORD=admin
+GRAFANA_ADMIN_ACCOUNT=
+GRAFANA_ADMIN_PASSWORD=
 
 VERIFY_SSL=false
 GRAFANA_URL=http://grafana:3000
 
 AWS_S3_BUCKET_NAME=grafana
 AWS_S3_BUCKET_KEY=grafana-backup
-AWS_DEFAULT_REGION=ru-nsk
+AWS_DEFAULT_REGION=ru-irk
 AWS_ACCESS_KEY_ID=grafana-user
 AWS_SECRET_ACCESS_KEY=grafana-user
-AWS_ENDPOINT_URL=https://s3.domain.ru
+AWS_ENDPOINT_URL=https://s3.domain.example
 
 RESTORE=false
 ARCHIVE_FILE=

configs/grafana-configs/datasources.yaml

@@ -0,0 +1,7 @@
+apiVersion: 1
+datasources:
+- access: proxy
+  isDefault: true
+  name: loki-main
+  type: loki
+  url: http://loki:3100

configs/grafana-configs/grafana.ini

@@ -14,11 +14,11 @@ logs = /var/log/grafana
 plugins = /var/lib/grafana/plugins
 provisioning = /etc/grafana/provisioning
 [server]
-root_url = https://logs.bildme.ru
+root_url = https://loki.pm.org.ru
 [smtp]
 enabled = true
 from_address = logs@pm.org.ru
-from_name = Logs Bildme.ru
+from_name = Loki Logs
 host = smtp.mail.ru:587
 password = PASSWORD
 skip_verify = true

docker-cmpose.yml

@@ -2,17 +2,17 @@ version: "3.9"
 
 services:
   grafana:
-    image: grafana/grafana:latest
-    container_name: grafana
+    image: ${GRAFANA_IMAGE}
+    container_name: ${GRAFANA_CONTAINER_NAME}
     restart: always
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.logs.entrypoints=https"
-      - "traefik.http.routers.logs.rule=Host(`logs.${HOST}`)"
+      - "traefik.http.routers.logs.rule=Host(`grafana.${HOST}`)"
       - "traefik.http.routers.logs.tls=true"
       - "traefik.http.routers.logs.tls.certresolver=letsEncrypt"
       - "traefik.http.services.logs-service.loadbalancer.server.port=3000"
-      - "traefik.docker.network=webproxy"
+      - "traefik.docker.network=${PROXY_NETWORK}"
     environment:
       - GF_PATHS_DATA=/var/lib/grafana/data
       - GF_PATHS_LOGS=/var/log/grafana
@@ -30,12 +30,12 @@ services:
     expose:
      - 3000
     networks:
-      - loki
-      - proxy
+      - ${LOKI_NETWORK}
+      - ${PROXY_NETWORK}
 
   loki:
-    image: grafana/loki:2.6.1
-    container_name: loki
+    image: ${LOKI_IMAGE}
+    container_name: ${LOKI_CONTAINER_NAME}
     restart: always
     labels:
       - "traefik.enable=true"
@@ -45,8 +45,8 @@ services:
       - "traefik.http.routers.loki.tls.certresolver=letsEncrypt"
       - "traefik.http.routers.loki.middlewares=loki-auth"
       - "traefik.http.services.loki-service.loadbalancer.server.port=3100"
-      - "traefik.http.middlewares.loki-auth.basicauth.users=loki:$$2y$$05$$UZwmFTrItdJngPd3eLTn5uw5SKU4fyB0d22aWA0sG1A/Cx9PONtM6" # loki\loki123
-      - "traefik.docker.network=webproxy"
+      - "traefik.http.middlewares.loki-auth.basicauth.users=${BASIC_AUTH_USER}:${BASIC_AUTH_TOKEN}" 
+      - "traefik.docker.network=${PROXY_NETWORK}"
     command: -config.file=/etc/loki/local-config.yaml
     volumes:
       - ./data/loki-storage:/loki
@@ -54,11 +54,11 @@ services:
     expose:
       - 3100
     networks:
-      - loki
-      - proxy
+      - ${LOKI_NETWORK}
+      - ${PROXY_NETWORK}
 
 networks:
-  loki:
-    name: loki
-  webproxy:
-    name: proxy
+  ${LOKI_NETWORK}:
+    name: ${LOKI_NETWORK}
+  ${PROXY_NETWORK}:
+    name: ${PROXY_NETWORK}