OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-24 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Upgrade Mongo, Cassandra and Influx docker images (#1354)

Browse Source 
* NOISSUE - Upgrade Mongo, Cassandra and Influx docker images

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Use cassandra version 3.11.9

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Add MF_INFLUXDB_HTTP_AUTH_ENABLED envar

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Use influxdb 1.8.4-alpine

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Use influxdb 1.8.4

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
This commit is contained in:
Manuel Imperiale 2021-02-05 12:32:21 +01:00 committed by GitHub
parent 8b2ae46324
commit ca5ff63dfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.env
View File

@ -208,15 +208,18 @@ MF_CASSANDRA_READER_DB_KEYSPACE=mainflux
MF_CASSANDRA_READER_SERVER_CERT=
MF_CASSANDRA_READER_SERVER_KEY=
### InfluxDB
MF_INFLUXDB_PORT= 8086
MF_INFLUXDB_DB: mainflux
MF_INFLUXDB_ADMIN_USER: mainflux
MF_INFLUXDB_ADMIN_PASSWORD: mainfllux
MF_INFLUXDB_HTTP_AUTH_ENABLED: true
### InfluxDB Writer
MF_INFLUX_WRITER_LOG_LEVEL=debug
MF_INFLUX_WRITER_PORT=8900
MF_INFLUX_WRITER_BATCH_SIZE=5000
MF_INFLUX_WRITER_BATCH_TIMEOUT=5
MF_INFLUX_WRITER_DB_PORT=8086
MF_INFLUX_WRITER_DB_USER=mainflux
MF_INFLUX_WRITER_DB_PASS=mainflux
MF_INFLUX_WRITER_DB=mainflux
MF_INFLUX_WRITER_GRAFANA_PORT=3001
MF_INFLUX_WRITER_CONTENT_TYPE=application/senml+json
MF_INFLUX_WRITER_TRANSFORMER=senml
@ -224,12 +227,8 @@ MF_INFLUX_WRITER_TRANSFORMER=senml
### InfluxDB Reader
MF_INFLUX_READER_LOG_LEVEL=debug
MF_INFLUX_READER_PORT=8905
MF_INFLUX_READER_DB_PORT=8086
MF_INFLUX_READER_DB_USER=mainflux
MF_INFLUX_READER_DB_PASS=mainflux
MF_INFLUX_READER_DB=mainflux
MF_INFLUX_READER_SERVER_CERT=
MF_INFLUX_READER_SERVER_KEY=
MF_INFLUX_READER_SERVER_CERT=
### MongoDB Writer
MF_MONGO_WRITER_LOG_LEVEL=debug

8
cmd/influxdb-reader/main.go
View File

@ -45,11 +45,11 @@ const (
envLogLevel = "MF_INFLUX_READER_LOG_LEVEL"
envPort = "MF_INFLUX_READER_PORT"
envDB = "MF_INFLUX_READER_DB"
envDB = "MF_INFLUXDB_DB"
envDBHost = "MF_INFLUX_READER_DB_HOST"
envDBPort = "MF_INFLUX_READER_DB_PORT"
envDBUser = "MF_INFLUX_READER_DB_USER"
envDBPass = "MF_INFLUX_READER_DB_PASS"
envDBPort = "MF_INFLUXDB_PORT"
envDBUser = "MF_INFLUXDB_ADMIN_USER"
envDBPass = "MF_INFLUXDB_ADMIN_PASSWORD"
envClientTLS = "MF_INFLUX_READER_CLIENT_TLS"
envCACerts = "MF_INFLUX_READER_CA_CERTS"
envServerCert = "MF_INFLUX_READER_SERVER_CERT"

8
cmd/influxdb-writer/main.go
View File

@ -44,11 +44,11 @@ const (
envNatsURL = "MF_NATS_URL"
envLogLevel = "MF_INFLUX_WRITER_LOG_LEVEL"
envPort = "MF_INFLUX_WRITER_PORT"
envDB = "MF_INFLUX_WRITER_DB"
envDB = "MF_INFLUXDB_DB"
envDBHost = "MF_INFLUX_WRITER_DB_HOST"
envDBPort = "MF_INFLUX_WRITER_DB_PORT"
envDBUser = "MF_INFLUX_WRITER_DB_USER"
envDBPass = "MF_INFLUX_WRITER_DB_PASS"
envDBPort = "MF_INFLUXDB_PORT"
envDBUser = "MF_INFLUXDB_ADMIN_USER"
envDBPass = "MF_INFLUXDB_ADMIN_PASSWORD"
envConfigPath = "MF_INFLUX_WRITER_CONFIG_PATH"
envContentType = "MF_INFLUX_WRITER_CONTENT_TYPE"
envTransformer = "MF_INFLUX_WRITER_TRANSFORMER"

2
consumers/writers/cassandra/setup_test.go
View File

@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
logger.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
container, err := pool.Run("cassandra", "3.11.3", []string{})
container, err := pool.Run("cassandra", "3.11.9", []string{})
if err != nil {
logger.Error(fmt.Sprintf("Could not start container: %s", err))
}

19
consumers/writers/influxdb/README.md
View File

@ -14,18 +14,17 @@ default values.
| 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_INFLUX_WRITER_DB_PORT | Default port of InfluxDB database | 8086 |
| MF_INFLUX_WRITER_DB_USER | Default user of InfluxDB database | mainflux |
| MF_INFLUX_WRITER_DB_PASS | Default password of InfluxDB user | mainflux |
| MF_INFLUX_WRITER_DB | InfluxDB database name | messages |
| 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 |
| MF_INFLUXDB_DB | InfluxDB database name | mainflux |
| MF_INFLUX_WRITER_CONFIG_PATH | Configuration file path with NATS subjects list | /configs.toml |
| MF_INFLUX_WRITER_CONTENT_TYPE | Message payload Content Type | application/senml+json |
| MF_INFLUX_WRITER_TRANSFORMER | Message transformer type | senml |
## Deployment
The service itself is distributed as Docker container. Check the [`influxdb-writer`](https://github.com/mainflux/mainflux/blob/master/docker/addons/influxdb-writer/docker-compose.yml#L35-L58) service section in
docker-compose to see how service is deployed.
The service itself is distributed as Docker container. Check the [`influxdb-writer`](https://github.com/mainflux/mainflux/blob/master/docker/addons/influxdb-writer/docker-compose.yml#L35-L58) service section in docker-compose to see how service is deployed.
To start the service, execute the following shell script:
@ -45,11 +44,11 @@ make install
MF_NATS_URL=[NATS instance URL] \
MF_INFLUX_WRITER_LOG_LEVEL=[Influx writer log level] \
MF_INFLUX_WRITER_PORT=[Service HTTP port] \
MF_INFLUX_WRITER_DB=[InfluxDB database name] \
MF_INFLUXDB_DB=[InfluxDB database name] \
MF_INFLUX_WRITER_DB_HOST=[InfluxDB database host] \
MF_INFLUX_WRITER_DB_PORT=[InfluxDB database port] \
MF_INFLUX_WRITER_DB_USER=[InfluxDB admin user] \
MF_INFLUX_WRITER_DB_PASS=[InfluxDB admin password] \
MF_INFLUXDB_PORT=[InfluxDB database port] \
MF_INFLUXDB_ADMIN_USER=[InfluxDB admin user] \
MF_INFLUXDB_ADMIN_PASSWORD=[InfluxDB admin password] \
MF_INFLUX_WRITER_CONFIG_PATH=[Configuration file path with filters list] \
MF_POSTGRES_WRITER_TRANSFORMER=[Message transformer type] \
$GOBIN/mainflux-influxdb

2
consumers/writers/influxdb/setup_test.go
View File

@ -24,7 +24,7 @@ func TestMain(m *testing.M) {
"INFLUXDB_USER_PASSWORD=test",
"INFLUXDB_DB=test",
}
container, err := pool.Run("influxdb", "1.6.4-alpine", cfg)
container, err := pool.Run("influxdb", "1.8.4", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}

2
consumers/writers/mongodb/setup_test.go
View File

@ -25,7 +25,7 @@ func TestMain(m *testing.M) {
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "3.6-jessie", cfg)
container, err := pool.Run("mongo", "4.4.3-bionic", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}

2
docker/addons/cassandra-writer/docker-compose.yml
View File

@ -17,7 +17,7 @@ volumes:
services:
cassandra:
image: cassandra:3.11.3
image: cassandra:3.11.9
container_name: mainflux-cassandra
restart: on-failure
networks:

8
docker/addons/influxdb-reader/docker-compose.yml
View File

@ -22,11 +22,11 @@ services:
environment:
MF_INFLUX_READER_LOG_LEVEL: debug
MF_INFLUX_READER_PORT: ${MF_INFLUX_READER_PORT}
MF_INFLUX_READER_DB: ${MF_INFLUX_READER_DB}
MF_INFLUXDB_DB: ${MF_INFLUXDB_DB}
MF_INFLUX_READER_DB_HOST: mainflux-influxdb
MF_INFLUX_READER_DB_PORT: ${MF_INFLUX_READER_DB_PORT}
MF_INFLUX_READER_DB_USER: ${MF_INFLUX_READER_DB_USER}
MF_INFLUX_READER_DB_PASS: ${MF_INFLUX_READER_DB_PASS}
MF_INFLUXDB_PORT: ${MF_INFLUXDB_PORT}
MF_INFLUXDB_ADMIN_USER: ${MF_INFLUXDB_ADMIN_USER}
MF_INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUXDB_ADMIN_PASSWORD}
MF_INFLUX_READER_SERVER_CERT: ${MF_INFLUX_READER_SERVER_CERT}
MF_INFLUX_READER_SERVER_KEY: ${MF_INFLUX_READER_SERVER_KEY}
MF_JAEGER_URL: ${MF_JAEGER_URL}

19
docker/addons/influxdb-writer/docker-compose.yml
View File

@ -18,17 +18,18 @@ volumes:
services:
influxdb:
image: influxdb:1.8.3-alpine
image: influxdb:1.8.4
container_name: mainflux-influxdb
restart: on-failure
environment:
INFLUXDB_DB: ${MF_INFLUX_WRITER_DB}
INFLUXDB_ADMIN_USER: ${MF_INFLUX_WRITER_DB_USER}
INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUX_WRITER_DB_PASS}
INFLUXDB_DB: ${MF_INFLUXDB_DB}
INFLUXDB_ADMIN_USER: ${MF_INFLUXDB_ADMIN_USER}
INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUXDB_ADMIN_PASSWORD}
INFLUXDB_HTTP_AUTH_ENABLED: ${MF_INFLUXDB_HTTP_AUTH_ENABLED}
networks:
- docker_mainflux-base-net
ports:
- ${MF_INFLUX_WRITER_DB_PORT}:${MF_INFLUX_WRITER_DB_PORT}
- ${MF_INFLUXDB_PORT}:${MF_INFLUXDB_PORT}
volumes:
- mainflux-influxdb-volume:/var/lib/influxdb
@ -44,11 +45,11 @@ services:
MF_INFLUX_WRITER_PORT: ${MF_INFLUX_WRITER_PORT}
MF_INFLUX_WRITER_BATCH_SIZE: ${MF_INFLUX_WRITER_BATCH_SIZE}
MF_INFLUX_WRITER_BATCH_TIMEOUT: ${MF_INFLUX_WRITER_BATCH_TIMEOUT}
MF_INFLUX_WRITER_DB: ${MF_INFLUX_WRITER_DB}
MF_INFLUXDB_DB: ${MF_INFLUXDB_DB}
MF_INFLUX_WRITER_DB_HOST: mainflux-influxdb
MF_INFLUX_WRITER_DB_PORT: ${MF_INFLUX_WRITER_DB_PORT}
MF_INFLUX_WRITER_DB_USER: ${MF_INFLUX_WRITER_DB_USER}
MF_INFLUX_WRITER_DB_PASS: ${MF_INFLUX_WRITER_DB_PASS}
MF_INFLUXDB_PORT: ${MF_INFLUXDB_PORT}
MF_INFLUXDB_ADMIN_USER: ${MF_INFLUXDB_ADMIN_USER}
MF_INFLUXDB_ADMIN_PASSWORD: ${MF_INFLUXDB_ADMIN_PASSWORD}
MF_INFLUX_WRITER_TRANSFORMER: ${MF_INFLUX_WRITER_TRANSFORMER}
ports:
- ${MF_INFLUX_WRITER_PORT}:${MF_INFLUX_WRITER_PORT}

2
docker/addons/mongodb-writer/docker-compose.yml
View File

@ -20,7 +20,7 @@ volumes:
services:
mongodb:
image: mongo:3.6-jessie
image: mongo:4.4.3-bionic
container_name: mainflux-mongodb
restart: on-failure
environment:

2
readers/cassandra/setup_test.go
View File

@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
logger.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
container, err := pool.Run("cassandra", "3.11.3", []string{})
container, err := pool.Run("cassandra", "3.11.9", []string{})
if err != nil {
logger.Error(fmt.Sprintf("Could not start container: %s", err))
}

19
readers/influxdb/README.md
View File

@ -12,10 +12,10 @@ default values.
|------------------------------|-----------------------------------------------------|----------------|
| MF_INFLUX_READER_PORT | Service HTTP port | 8180 |
| MF_INFLUX_READER_DB_HOST | InfluxDB host | localhost |
| MF_INFLUX_READER_DB_PORT | Default port of InfluxDB database | 8086 |
| MF_INFLUX_READER_DB_USER | Default user of InfluxDB database | mainflux |
| MF_INFLUX_READER_DB_PASS | Default password of InfluxDB user | mainflux |
| MF_INFLUX_READER_DB | InfluxDB database name | messages |
| 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 |
| MF_INFLUXDB_DB | InfluxDB database name | mainflux |
| MF_INFLUX_READER_CLIENT_TLS | Flag that indicates if TLS should be turned on | false |
| MF_INFLUX_READER_CA_CERTS | Path to trusted CAs in PEM format | |
| MF_INFLUX_READER_SERVER_CERT | Path to server certificate in pem format | |
@ -26,8 +26,7 @@ default values.
## Deployment
The service itself is distributed as Docker container. Check the [`influxdb-reader`](https://github.com/mainflux/mainflux/blob/master/docker/addons/influxdb-reader/docker-compose.yml#L17-L40) service section in
docker-compose to see how service is deployed.
The service itself is distributed as Docker container. Check the [`influxdb-reader`](https://github.com/mainflux/mainflux/blob/master/docker/addons/influxdb-reader/docker-compose.yml#L17-L40) service section in docker-compose to see how service is deployed.
To start the service, execute the following shell script:
@ -45,11 +44,11 @@ make install
# Set the environment variables and run the service
MF_INFLUX_READER_PORT=[Service HTTP port] \
MF_INFLUX_READER_DB=[InfluxDB database name] \
MF_INFLUXDB_DB=[InfluxDB database name] \
MF_INFLUX_READER_DB_HOST=[InfluxDB database host] \
MF_INFLUX_READER_DB_PORT=[InfluxDB database port] \
MF_INFLUX_READER_DB_USER=[InfluxDB admin user] \
MF_INFLUX_READER_DB_PASS=[InfluxDB admin password] \
MF_INFLUXDB_ADMIN_USER=[InfluxDB database port] \
MF_INFLUXDB_ADMIN_USER=[InfluxDB admin user] \
MF_INFLUXDB_ADMIN_PASSWORD=[InfluxDB admin password] \
MF_INFLUX_READER_CLIENT_TLS=[Flag that indicates if TLS should be turned on] \
MF_INFLUX_READER_CA_CERTS=[Path to trusted CAs in PEM format] \
MF_INFLUX_READER_SERVER_CERT=[Path to server pem certificate file] \

2
readers/influxdb/setup_test.go
View File

@ -32,7 +32,7 @@ func TestMain(m *testing.M) {
"INFLUXDB_USER_PASSWORD=test",
"INFLUXDB_DB=test",
}
container, err := pool.Run("influxdb", "1.6.4-alpine", cfg)
container, err := pool.Run("influxdb", "1.8.4", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}

2
readers/mongodb/setup_test.go
View File

@ -27,7 +27,7 @@ func TestMain(m *testing.M) {
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "3.6-jessie", cfg)
container, err := pool.Run("mongo", "4.4.3-bionic", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}

2
twins/mongodb/setup_test.go
View File

@ -30,7 +30,7 @@ func TestMain(m *testing.M) {
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "3.6-jessie", cfg)
container, err := pool.Run("mongo", "4.4.3-bionic", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}