Updates

Signed-off-by: johnsonw <[email protected]>

Author: johnsonw

chroma_core/management/commands/print-settings.py

@@ -46,7 +46,7 @@ def handle(self, *args, **kwargs):
             "UPDATE_HANDLER_PROXY_PASS": settings.UPDATE_HANDLER_PROXY_PASS,
             "GRAFANA_PORT": settings.GRAFANA_PORT,
             "GRAFANA_PROXY_PASS": settings.GRAFANA_PROXY_PASS,
-            "INFLUXDB_SERVER_FQDN": settings.INFLUXDB_SERVER_FQDN,
+            "INFLUXDB_HOST": settings.INFLUXDB_HOST,
             "INFLUXDB_PROXY_PASS": settings.INFLUXDB_PROXY_PASS,
             "TIMER_PROXY_PASS": settings.TIMER_PROXY_PASS,
             "ALLOW_ANONYMOUS_READ": json.dumps(settings.ALLOW_ANONYMOUS_READ),

docker/docker-compose.yml

@@ -136,7 +136,7 @@ services:
     environment:
       - DEVICE_AGGREGATOR_PORT=8008
       - PROXY_HOST=device
-      - INFLUXDB_SERVER_FQDN=influxdb
+      - INFLUXDB_HOST=influxdb
       - RUST_LOG=info,sqlx::query=warn
     volumes:
       - "manager-config:/var/lib/chroma"
@@ -230,7 +230,6 @@ services:
     environment:
       - DEVICE_AGGREGATOR_URL=http://device:8008
       - PROXY_HOST=iml-action-runner
-      - INFLUXDB_SERVER_FQDN=influxdb
       - LOG_LEVEL
   lustre-audit:
     image: "imlteam/manager-lustre-audit:6.2.0-dev"
@@ -396,7 +395,7 @@ services:
     environment:
       - RUST_LOG=info
       - PROXY_HOST=iml-stats
-      - INFLUXDB_SERVER_FQDN=influxdb
+      - INFLUXDB_HOST=influxdb
   iml-postoffice:
     image: "imlteam/iml-postoffice:6.2.0-dev"
     hostname: "iml-postoffice"

docker/wait-for-dependencies-postgres.sh

@@ -10,6 +10,7 @@ done
 TMP=$PROXY_HOST
 TMP2=$AMQP_BROKER_HOST
 TMP3=$DB_HOST
+TMP4=$INFLUXDB_HOST
 
 set -a
 source /var/lib/chroma/iml-settings.conf
@@ -28,6 +29,10 @@ if [[ ! -z "$TMP3" ]]; then
   export DB_HOST=$TMP3
 fi
 
+if [[ ! -z "$TMP4" ]]; then
+  export INFLUXDB_HOST=$TMP4
+fi
+
 echo "Starting dependency check"
 
 RABBIT_CHECK_URL="http://$AMQP_BROKER_USER:$AMQP_BROKER_PASSWORD@$AMQP_BROKER_HOST:15672/api/aliveness-test/$AMQP_BROKER_VHOST/"

docker/wait-for-dependencies.sh

@@ -10,6 +10,7 @@ done
 TMP=$PROXY_HOST
 TMP2=$AMQP_BROKER_HOST
 TMP3=$DB_HOST
+TMP4=$INFLUXDB_HOST
 
 set -a
 source /var/lib/chroma/iml-settings.conf
@@ -28,6 +29,10 @@ if [[ ! -z "$TMP3" ]]; then
   export DB_HOST=$TMP3
 fi
 
+if [[ ! -z "$TMP4" ]]; then
+  export INFLUXDB_HOST=$TMP4
+fi
+
 echo "Starting dependency check"
 
 RABBIT_CHECK_URL="http://$AMQP_BROKER_USER:$AMQP_BROKER_PASSWORD@$AMQP_BROKER_HOST:15672/api/aliveness-test/$AMQP_BROKER_VHOST/"

iml-manager-env/src/lib.rs

@@ -193,13 +193,13 @@ pub fn get_influxdb_port() -> String {
     get_var("INFLUXDB_PORT")
 }
 
-pub fn get_influxdb_server_fqdn() -> String {
-    get_var("INFLUXDB_SERVER_FQDN")
+pub fn get_influxdb_host() -> String {
+    get_var("INFLUXDB_HOST")
 }
 
 /// Get the influxdb address from the env or panic
 pub fn get_influxdb_addr() -> SocketAddr {
-    to_socket_addr(&get_influxdb_server_fqdn(), &get_influxdb_port())
+    to_socket_addr(&get_influxdb_host(), &get_influxdb_port())
 }
 
 /// Get the metrics influxdb database name

settings.py

@@ -62,11 +62,11 @@
 
 INFLUXDB_IML_STATS_LONG_DURATION = os.getenv("INFLUXDB_IML_STATS_LONG_DURATION", "52w")
 
-INFLUXDB_SERVER_FQDN = os.getenv("INFLUXDB_SERVER_FQDN", PROXY_HOST)
+INFLUXDB_HOST = os.getenv("INFLUXDB_HOST", PROXY_HOST)
 
 INFLUXDB_PORT = 8086
 
-INFLUXDB_PROXY_PASS = "http://{}:{}".format(INFLUXDB_SERVER_FQDN, INFLUXDB_PORT)
+INFLUXDB_PROXY_PASS = "http://{}:{}".format(INFLUXDB_HOST, INFLUXDB_PORT)
 
 REPORT_PORT = 8893