Merge branch '4.8.0' into add-health-check-and-configuration-vulnerab…

…ilities-index-pattern

docker/osd-dev/dev.yml

@@ -1,15 +1,15 @@
 version: '2.2'
 
-x-logging: &logging
-  logging:
-    driver: loki
-    options:
-      loki-url: 'http://host.docker.internal:3100/loki/api/v1/push'
+# x-logging: &logging
+#   logging:
+#     driver: loki
+#     options:
+#       loki-url: 'http://host.docker.internal:3100/loki/api/v1/push'
 
 services:
   exporter:
     image: quay.io/prometheuscommunity/elasticsearch-exporter:latest
-    <<: *logging
+    # <<: *logging
     hostname: exporter-osd-${OS_VERSION}
     profiles:
       - 'saml'
@@ -24,7 +24,7 @@ services:
 
   imposter:
     image: outofcoffee/imposter
-    <<: *logging
+    # <<: *logging
     hostname: imposter-osd-${OS_VERSION}
     networks:
       - os-dev
@@ -37,7 +37,7 @@ services:
 
   generator:
     image: cfssl/cfssl
-    <<: *logging
+    # <<: *logging
     profiles:
       - 'saml'
       - 'standard'
@@ -128,7 +128,7 @@ services:
         condition: service_completed_successfully
         required: false
     image: opensearchproject/opensearch:${OS_VERSION}
-    <<: *logging
+    # <<: *logging
     profiles:
       - 'saml'
       - 'standard'
@@ -183,7 +183,7 @@ services:
     networks:
       - os-dev
       - mon
-    <<: *logging
+    # <<: *logging
     # restart: always
     entrypoint:
       - '/bin/bash'
@@ -220,7 +220,7 @@ services:
       - devel
       - mon
     user: '1000:1000'
-    <<: *logging
+    # <<: *logging
     ports:
       - ${OSD_PORT}:5601
     environment:
@@ -274,7 +274,7 @@ services:
     profiles:
       - 'saml'
     hostname: idp
-    <<: *logging
+    # <<: *logging
     networks:
       - os-dev
       - mon
@@ -303,7 +303,7 @@ services:
     profiles:
       - 'saml'
     hostname: idpsetup
-    <<: *logging
+    # <<: *logging
     networks:
       - os-dev
       - mon