From 6d1076fca7ffe81730f08931739963fd9de03eda Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 23 Feb 2021 16:30:35 +0100
Subject: [PATCH] Devenv: Add gdev-influxdb2 data source (#31250)

* Add gdev-influxdb2 data source

* Change influxdb2 docker block to use 8087 port

* Update telegraf url
---
 devenv/datasources.yaml                       | 15 +++++++++++-
 devenv/datasources_docker.yaml                | 11 +++++++++
 .../blocks/influxdb2/docker-compose.yaml      | 23 ++++++++++---------
 devenv/docker/blocks/influxdb2/telegraf.conf  |  2 +-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index 405c69436ab..23d6e6b900c 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -32,6 +32,19 @@ datasources:
       timeInterval: "15s"
     secureJsonData:
       password: grafana
+  
+  - name: gdev-influxdb2
+    type: influxdb
+    access: proxy
+    url: http://localhost:8087
+    user: grafana
+    secureJsonData:
+      token: mytoken
+      password: grafana12345
+    jsonData:
+      version: Flux
+      organization: myorg
+      defaultBucket: mybucket
 
   - name: gdev-influxdb-telegraf
     type: influxdb
@@ -43,7 +56,7 @@ datasources:
       timeInterval: "10s"
     secureJsonData:
       password: grafana
-
+    
   - name: gdev-opentsdb
     type: opentsdb
     access: proxy
diff --git a/devenv/datasources_docker.yaml b/devenv/datasources_docker.yaml
index d7abd11fb3b..d99a37ef7bb 100644
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -34,6 +34,17 @@ datasources:
     secureJsonData:
       password: grafana
 
+  - name: gdev-influxdb2
+    type: influxdb
+    access: proxy
+    url: http://influxdb2:8086
+    secureJsonData:
+      token: mytoken
+    jsonData:
+      version: Flux
+      organization: myorg
+      defaultBucket: mybucket
+      
   - name: gdev-influxdb-telegraf
     type: influxdb
     access: proxy
diff --git a/devenv/docker/blocks/influxdb2/docker-compose.yaml b/devenv/docker/blocks/influxdb2/docker-compose.yaml
index a9c80830980..dc3bcee88a2 100644
--- a/devenv/docker/blocks/influxdb2/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb2/docker-compose.yaml
@@ -1,39 +1,40 @@
-  influxdb:
+  influxdb2:
     image: quay.io/influxdb/influxdb:v2.0.3
     container_name: influxdb2
     ports:
-      - '8086:8086'
+      - '8087:8086'
     environment:
       INFLUXDB_REPORTING_DISABLED: 'true'
     volumes:
       - ./docker/blocks/influxdb2/influxdb.conf:/etc/influxdb/influxdb.conf
 
   # Use the influx cli to set up an influxdb instance.
-  influxdb_cli:
+  influxdb2_cli:
     links:
-      - influxdb
+      - influxdb2
     image: quay.io/influxdb/influxdb:v2.0.3
     # Use these same configurations parameters in your telegraf configuration, mytelegraf.conf.
-    entrypoint: influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb:8086 -f
+    entrypoint: influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb2:8086 -f
       # Wait for the influxd service in the influxdb container has fully bootstrapped before trying to setup an influxdb instance with the influxdb_cli service.
     restart: on-failure:10
     depends_on:
-      - influxdb
+      - influxdb2
 
-  fake-influxdb-data:
+  fake-influxdb2-data:
     image: grafana/fake-data-gen
     links:
-      - influxdb
+      - influxdb2
     environment:
+      FD_SERVER: influxdb2
       FD_DATASOURCE: influxdb
       FD_PORT: 8086
 
-  telegraf:
+  telegraf2:
     image: telegraf
     links:
-      - influxdb
+      - influxdb2
     depends_on:
-      - influxdb_cli
+      - influxdb2_cli
     volumes:
       - ./docker/blocks/influxdb2/telegraf.conf:/etc/telegraf/telegraf.conf:ro
       - /var/log:/var/log
diff --git a/devenv/docker/blocks/influxdb2/telegraf.conf b/devenv/docker/blocks/influxdb2/telegraf.conf
index 0036556b41f..6799080c089 100644
--- a/devenv/docker/blocks/influxdb2/telegraf.conf
+++ b/devenv/docker/blocks/influxdb2/telegraf.conf
@@ -90,7 +90,7 @@
   ## urls will be written to each interval.
   # urls = ["unix:///var/run/influxdb.sock"]
   # urls = ["udp://127.0.0.1:8089"]
-  urls = ["http://influxdb:8086"]
+  urls = ["http://influxdb2:8086"]
   token = "mytoken"
   organization = "myorg"
   bucket = "mybucket"