Devenv: Fix fake data gen docker to use same network (#41355)

* Dev: MSSql fake data gen docker to use same network * Fix all datasources that used network_mode: bridge
4 years ago · ea583e7d42
parent b304965bbe
commit ea583e7d42
8 changed files with 4 additions and 13 deletions
--- a/devenv/docker/blocks/elastic2/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic2/docker-compose.yaml
@ -9,7 +9,7 @@

  fake-elastic-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
-      FD_DATASOURCE: elasticsearch2
+      FD_SERVER: elasticsearch2
+      FD_DATASOURCE: elasticsearch
      FD_PORT: 9200
--- a/devenv/docker/blocks/graphite/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite/docker-compose.yaml
@ -7,7 +7,6 @@

  fake-graphite11-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: graphite
      FD_PORT: 2103
--- a/devenv/docker/blocks/graphite09/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite09/docker-compose.yaml
@ -10,10 +10,7 @@

  fake-graphite09-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: graphite
      FD_PORT: 2303
      FD_GRAPHITE_VERSION: 0.9
-
-
--- a/devenv/docker/blocks/graphite1/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite1/docker-compose.yaml
@ -7,7 +7,6 @@

  fake-graphite1-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: graphite
      FD_PORT: 2203
--- a/devenv/docker/blocks/mssql/docker-compose.yaml
+++ b/devenv/docker/blocks/mssql/docker-compose.yaml
@ -13,7 +13,6 @@

  fake-mssql-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: mssql
-      FD_PORT: 1433
+      FD_PORT: 1433
--- a/devenv/docker/blocks/mysql/docker-compose.yaml
+++ b/devenv/docker/blocks/mysql/docker-compose.yaml
@ -11,8 +11,6 @@

  fake-mysql-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: mysql
      FD_PORT: 3306
-
--- a/devenv/docker/blocks/opentsdb/docker-compose.yaml
+++ b/devenv/docker/blocks/opentsdb/docker-compose.yaml
@ -5,7 +5,7 @@

  fake-opentsdb-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: opentsdb
+      FD_PORT: 4242

--- a/devenv/docker/blocks/postgres/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres/docker-compose.yaml
@ -15,7 +15,6 @@

  fake-postgres-data:
    image: grafana/fake-data-gen
-    network_mode: bridge
    environment:
      FD_DATASOURCE: postgres
      FD_PORT: 5432