NOISSUE - Unify MF_INFLUX_READER_DB_HOST and MF_INFLUX_WRITER_DB_HOST…

… envars (#1585) Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
absmach · Mar 29, 2022 · ce46723 · ce46723
1 parent 29f9cbb
commit ce46723
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/cmd/influxdb-reader/main.go b/cmd/influxdb-reader/main.go
@@ -50,7 +50,7 @@ const (
 	envLogLevel          = "MF_INFLUX_READER_LOG_LEVEL"
 	envPort              = "MF_INFLUX_READER_PORT"
 	envDB                = "MF_INFLUXDB_DB"
-	envDBHost            = "MF_INFLUX_READER_DB_HOST"
+	envDBHost            = "MF_INFLUXDB_HOST"
 	envDBPort            = "MF_INFLUXDB_PORT"
 	envDBUser            = "MF_INFLUXDB_ADMIN_USER"
 	envDBPass            = "MF_INFLUXDB_ADMIN_PASSWORD"

diff --git a/cmd/influxdb-writer/main.go b/cmd/influxdb-writer/main.go
@@ -39,7 +39,7 @@ const (
 	envLogLevel   = "MF_INFLUX_WRITER_LOG_LEVEL"
 	envPort       = "MF_INFLUX_WRITER_PORT"
 	envDB         = "MF_INFLUXDB_DB"
-	envDBHost     = "MF_INFLUX_WRITER_DB_HOST"
+	envDBHost     = "MF_INFLUXDB_HOST"
 	envDBPort     = "MF_INFLUXDB_PORT"
 	envDBUser     = "MF_INFLUXDB_ADMIN_USER"
 	envDBPass     = "MF_INFLUXDB_ADMIN_PASSWORD"

diff --git a/consumers/writers/influxdb/README.md b/consumers/writers/influxdb/README.md
@@ -13,7 +13,7 @@ default values.
 | MF_NATS_URL                   | NATS instance URL                                                       | nats://localhost:4222  |
 | MF_INFLUX_WRITER_LOG_LEVEL    | Log level for InfluxDB writer (debug, info, warn, error)                | error                  |
 | MF_INFLUX_WRITER_PORT         | Service HTTP port                                                       | 8180                   |
-| MF_INFLUX_WRITER_DB_HOST      | InfluxDB host                                                           | localhost              |
+| MF_INFLUXDB_HOST              | InfluxDB host                                                           | localhost              |
 | MF_INFLUXDB_PORT              | Default port of InfluxDB database                                       | 8086                   |
 | MF_INFLUXDB_ADMIN_USER        | Default user of InfluxDB database                                       | mainflux               |
 | MF_INFLUXDB_ADMIN_PASSWORD    | Default password of InfluxDB user                                       | mainflux               |
@@ -43,7 +43,7 @@ MF_NATS_URL=[NATS instance URL] \
 MF_INFLUX_WRITER_LOG_LEVEL=[Influx writer log level] \
 MF_INFLUX_WRITER_PORT=[Service HTTP port] \
 MF_INFLUXDB_DB=[InfluxDB database name] \
-MF_INFLUX_WRITER_DB_HOST=[InfluxDB database host] \
+MF_INFLUXDB_HOST=[InfluxDB database host] \
 MF_INFLUXDB_PORT=[InfluxDB database port] \
 MF_INFLUXDB_ADMIN_USER=[InfluxDB admin user] \
 MF_INFLUXDB_ADMIN_PASSWORD=[InfluxDB admin password] \

diff --git a/docker/addons/influxdb-reader/docker-compose.yml b/docker/addons/influxdb-reader/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       MF_INFLUX_READER_LOG_LEVEL: debug
       MF_INFLUX_READER_PORT: ${MF_INFLUX_READER_PORT}
       MF_INFLUXDB_DB: ${MF_INFLUXDB_DB}
-      MF_INFLUX_READER_DB_HOST: mainflux-influxdb
+      MF_INFLUXDB_HOST: mainflux-influxdb
       MF_INFLUXDB_PORT: ${MF_INFLUXDB_PORT}
       MF_INFLUXDB_ADMIN_USER: ${MF_INFLUXDB_ADMIN_USER}
       MF_INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUXDB_ADMIN_PASSWORD}

diff --git a/docker/addons/influxdb-writer/docker-compose.yml b/docker/addons/influxdb-writer/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       MF_INFLUX_WRITER_BATCH_SIZE: ${MF_INFLUX_WRITER_BATCH_SIZE}
       MF_INFLUX_WRITER_BATCH_TIMEOUT: ${MF_INFLUX_WRITER_BATCH_TIMEOUT}
       MF_INFLUXDB_DB: ${MF_INFLUXDB_DB}
-      MF_INFLUX_WRITER_DB_HOST: mainflux-influxdb
+      MF_INFLUXDB_HOST: mainflux-influxdb
       MF_INFLUXDB_PORT: ${MF_INFLUXDB_PORT}
       MF_INFLUXDB_ADMIN_USER: ${MF_INFLUXDB_ADMIN_USER}
       MF_INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUXDB_ADMIN_PASSWORD}

diff --git a/readers/influxdb/README.md b/readers/influxdb/README.md
@@ -11,7 +11,7 @@ default values.
 | Variable                     | Description                                         | Default        |
 |------------------------------|-----------------------------------------------------|----------------|
 | MF_INFLUX_READER_PORT        | Service HTTP port                                   | 8180           |
-| MF_INFLUX_READER_DB_HOST     | InfluxDB host                                       | localhost      |
+| MF_INFLUXDB_HOST             | InfluxDB host                                       | localhost      |
 | MF_INFLUXDB_PORT             | Default port of InfluxDB database                   | 8086           |
 | MF_INFLUXDB_ADMIN_USER       | Default user of InfluxDB database                   | mainflux       |
 | MF_INFLUXDB_ADMIN_PASSWORD   | Default password of InfluxDB user                   | mainflux       |
@@ -48,7 +48,7 @@ make install
 # Set the environment variables and run the service
 MF_INFLUX_READER_PORT=[Service HTTP port] \
 MF_INFLUXDB_DB=[InfluxDB database name] \
-MF_INFLUX_READER_DB_HOST=[InfluxDB database host] \
+MF_INFLUXDB_HOST=[InfluxDB database host] \
 MF_INFLUXDB_ADMIN_USER=[InfluxDB database port] \
 MF_INFLUXDB_ADMIN_USER=[InfluxDB admin user] \
 MF_INFLUXDB_ADMIN_PASSWORD=[InfluxDB admin password] \