BAH-3508 | Refactor. Remove logging configurations (#95)

Bahmni · Sep 2, 2024 · 4bf28c4 · 4bf28c4
1 parent dcd5075
commit 4bf28c4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 122 deletions.
diff --git a/bahmni-lite/.env b/bahmni-lite/.env
@@ -4,6 +4,8 @@ COMPOSE_PROFILES=emr
 # Environment variable to set the timezone for the containers
 TZ=UTC
 
+LOKI_URL=http://localhost:3100/loki/api/v1/push
+
 # Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker.
 OPENMRS_HOST=openmrs
 OPENMRS_PORT=8080
@@ -109,11 +111,6 @@ SMS_ORIGINATOR=
 SMS_PROVIDER_API="https://api.d7networks.com/messages/v1/send"
 SMS_COUNTRY_CODE=+91
 
-#Loki Environment Variables
-LOKI_IMAGE_TAG=2.6.0
-PROMTAIL_IMAGE_TAG=2.6.0
-GRAFANA_IMAGE_TAG=9.4.7
-
 #Crater-Atomfeed Environment variables
 CRATER_USERNAME=[email protected]
 CRATER_PASSWORD=Crater123

diff --git a/bahmni-lite/.env.dev b/bahmni-lite/.env.dev
@@ -4,6 +4,8 @@ COMPOSE_PROFILES=emr
 # Environment variable to set the timezone for the containers
 TZ=UTC
 
+LOKI_URL=http://localhost:3100/loki/api/v1/push
+
 # Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker.
 OPENMRS_HOST=openmrs
 OPENMRS_PORT=8080
@@ -109,11 +111,6 @@ SMS_ORIGINATOR=
 SMS_PROVIDER_API="https://api.d7networks.com/messages/v1/send"
 SMS_COUNTRY_CODE=+91
 
-#Loki Environment Variables
-LOKI_IMAGE_TAG=2.6.0
-PROMTAIL_IMAGE_TAG=2.6.0
-GRAFANA_IMAGE_TAG=latest
-
 #Crater-Atomfeed Environment variables
 CRATER_USERNAME=[email protected]
 CRATER_PASSWORD=Crater123

diff --git a/bahmni-lite/docker-compose.yml b/bahmni-lite/docker-compose.yml
@@ -6,7 +6,7 @@ x-default-logging: &default
 x-loki-logging: &loki
   driver: loki
   options:
-    loki-url: http://localhost:3100/loki/api/v1/push
+    loki-url: ${LOKI_URL:?}
     mode: non-blocking
     max-buffer-size: 4m
     loki-retries: "3"

diff --git a/bahmni-standard/.env b/bahmni-standard/.env
@@ -4,6 +4,8 @@ COMPOSE_PROFILES=emr
 # Environment variable to set the timezone for the containers
 TZ=UTC
 
+LOKI_URL=http://localhost:3100/loki/api/v1/push
+
 # Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker.
 OPENMRS_HOST=openmrs
 OPENMRS_PORT=8080
@@ -124,11 +126,6 @@ PATIENT_DOCUMENTS_TAG=latest
 APPOINTMENTS_IMAGE_TAG=latest
 APPOINTMENTS_PATH=
 
-#Loki Environment Variables
-LOKI_IMAGE_TAG=2.6.0
-PROMTAIL_IMAGE_TAG=2.6.0
-GRAFANA_IMAGE_TAG=latest
-
 #PACS DB Server Environment Variables
 PACS_DB_HOST=pacsdb
 PACS_DB_PORT=5432

diff --git a/bahmni-standard/.env.dev b/bahmni-standard/.env.dev
@@ -4,6 +4,8 @@ COMPOSE_PROFILES=emr
 # Environment variable to set the timezone for the containers
 TZ=UTC
 
+LOKI_URL=http://localhost:3100/loki/api/v1/push
+
 # Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker.
 OPENMRS_HOST=openmrs
 OPENMRS_PORT=8080
@@ -124,11 +126,6 @@ PATIENT_DOCUMENTS_TAG=latest
 APPOINTMENTS_IMAGE_TAG=latest
 APPOINTMENTS_PATH=
 
-#Loki Environment Variables
-LOKI_IMAGE_TAG=2.6.0
-PROMTAIL_IMAGE_TAG=2.6.0
-GRAFANA_IMAGE_TAG=latest
-
 #PACS DB Server Environment Variables
 PACS_DB_HOST=pacsdb
 PACS_DB_PORT=5432

diff --git a/bahmni-standard/docker-compose.yml b/bahmni-standard/docker-compose.yml
@@ -6,7 +6,7 @@ x-default-logging: &default
 x-loki-logging: &loki
   driver: loki
   options:
-    loki-url: http://localhost:3100/loki/api/v1/push
+    loki-url: ${LOKI_URL:?}
     mode: non-blocking
     max-buffer-size: 4m
     loki-retries: "3"

diff --git a/logging/datasource.yml b/logging/datasource.yml
diff --git a/logging/docker-compose.yml b/logging/docker-compose.yml
diff --git a/logging/loki-config.yaml b/logging/loki-config.yaml