Merge origin/DRIP_2.0 into DRIP_2.0

docs/composer_files/beia/beia_docker-compose.yml

@@ -23,36 +23,36 @@ services:
          - graphite
         networks:
          - web
-    monitoring_server:
-        image: salmant/ul_monitoring_server_container_image
-        ports:
-         - "8080:8080"
-         - "4242:4242"
-         - "4245:4245"
-         - "7199:7199"
-         - "7000:7000"
-         - "7001:7001"
-         - "9160:9160"
-         - "9042:9042"
-         - "8012:8012"
-         - "61621:61621"
-        environment:
-         - MONITORING_SERVER=monitoring_server
-         - VIRTUAL_HOST=jcatascopia.beia.switch
-         - VIRTUAL_PORT=8080
-        networks:
-         - asap
-         - web
+    #monitoring_server:
+        #image: salmant/ul_monitoring_server_container_image
+        #ports:
+         #- "8080:8080"
+         #- "4242:4242"
+         #- "4245:4245"
+         #- "7199:7199"
+         #- "7000:7000"
+         #- "7001:7001"
+         #- "9160:9160"
+         #- "9042:9042"
+         #- "8012:8012"
+         #- "61621:61621"
+        #environment:
+         #- MONITORING_SERVER=monitoring_server
+         #- VIRTUAL_HOST=jcatascopia.beia.switch
+         #- VIRTUAL_PORT=8080
+        #networks:
+         #- asap
+         #- web
     monitoring_adapter:
         restart: always
         image: beia/monitoring_adapter
         environment:
          - GRAPHITE_SERVER=graphite
          - MONITORING_PREFIX=eu.beia.switch
-         - MONITORING_SERVER=${MONITORING_SERVER:-monitoring_server}
+         - MONITORING_SERVER=${MONITORING_SERVER:-147.228.242.94}
         depends_on:
          - graphite
-         - monitoring_server
+         #- monitoring_server
         networks:
          - graphite
          - data
@@ -163,4 +163,4 @@ networks:
 volumes:
     graphite_data:
     grafana_data:
-    redis_data:
+    redis_data:
\ No newline at end of file