diff --git a/conf/docker/conf/mc-observability/influxdb/influxdb_init/init-database.sh b/conf/docker/conf/mc-observability/influxdb/influxdb_init/init-database.sh index ffdd1a3..85d9919 100644 --- a/conf/docker/conf/mc-observability/influxdb/influxdb_init/init-database.sh +++ b/conf/docker/conf/mc-observability/influxdb/influxdb_init/init-database.sh @@ -2,5 +2,8 @@ PREFIX="influx -host 127.0.0.1 -port $INFLUXDB_INIT_PORT -username ${INFLUXDB_ADMIN_USER} -password ${INFLUXDB_ADMIN_PASSWORD} -execute" +# Quote the DB name: it contains a hyphen, which the InfluxQL parser rejects +# when unquoted (the image's INFLUXDB_DB env triggers an unquoted CREATE and fails). +$PREFIX 'CREATE DATABASE "mc-observability"' $PREFIX "CREATE DATABASE insight" $PREFIX "CREATE DATABASE downsampling" diff --git a/conf/docker/docker-compose.yaml b/conf/docker/docker-compose.yaml index fa6f1c5..ddf9de3 100644 --- a/conf/docker/docker-compose.yaml +++ b/conf/docker/docker-compose.yaml @@ -1368,7 +1368,9 @@ services: - INFLUXDB_HTTP_AUTH_ENABLED=${MC_OBSERVABILITY_INFLUXDB_HTTP_AUTH_ENABLED:-true} - INFLUXDB_ADMIN_USER=${MC_OBSERVABILITY_INFLUXDB_ADMIN_USER:-mc-agent} - INFLUXDB_ADMIN_PASSWORD=${MC_OBSERVABILITY_INFLUXDB_ADMIN_PASSWORD:-mc-agent} - - INFLUXDB_DB=${MC_OBSERVABILITY_INFLUXDB_DB:-mc-observability} + # INFLUXDB_DB intentionally omitted: the image entrypoint issues an + # unquoted "CREATE DATABASE mc-observability" which fails on the hyphen. + # The DB is created (quoted) by influxdb_init/init-database.sh instead. volumes: - ./conf/mc-observability/influxdb/influxdb_init:/docker-entrypoint-initdb.d - ./container-volume/mc-observability/influxdb/influxdb_data:/var/lib/influxdb @@ -1408,7 +1410,9 @@ services: - INFLUXDB_HTTP_AUTH_ENABLED=${MC_OBSERVABILITY_INFLUXDB_HTTP_AUTH_ENABLED:-true} - INFLUXDB_ADMIN_USER=${MC_OBSERVABILITY_INFLUXDB_ADMIN_USER:-mc-agent} - INFLUXDB_ADMIN_PASSWORD=${MC_OBSERVABILITY_INFLUXDB_ADMIN_PASSWORD:-mc-agent} - - INFLUXDB_DB=${MC_OBSERVABILITY_INFLUXDB_DB:-mc-observability} + # INFLUXDB_DB intentionally omitted: the image entrypoint issues an + # unquoted "CREATE DATABASE mc-observability" which fails on the hyphen. + # The DB is created (quoted) by influxdb_init/init-database.sh instead. volumes: - ./conf/mc-observability/influxdb/influxdb_init:/docker-entrypoint-initdb.d - ./container-volume/mc-observability/influxdb/influxdb2_data:/var/lib/influxdb