Merge branch 'master' into feat/logging

PlaceOS · Mar 15, 2022 · a7c1166 · a7c1166
2 parents 38a31e4 + 150646d
commit a7c1166
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.env b/.env
@@ -53,7 +53,8 @@ RETHINKDB_PORT=28015
 RETHINKDB_VERSION=2.4
 
 # Analytics variables
-ENABLE_ANALYTICS=true
+
+ENABLE_ANALYTICS=false
 
 # INFLUX_USER=placeos
 # INFLUX_PASSWORD=development
@@ -70,7 +71,7 @@ POSTGRES_PASSWORD=development
 
 # Logging variables
 
-ENABLE_KIBANA=true
+ENABLE_KIBANA=false
 LOGSTASH_HOST=logstash
 LOGSTASH_PORT=12201
 KIBANA_PORT=443

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -486,7 +486,7 @@ services:
 
   # Aggregates logs and forwards them to Elasticsearch.
   logstash:
-    image: blacktop/logstash:${ELASTIC_VERSION:-7.6}
+    image: blacktop/logstash:${ELASTIC_VERSION:-7.10.2}
     profiles:
       - kibana
     restart: always
@@ -503,7 +503,7 @@ services:
 
   # Run 'docker-compose run --rm validate-logstash-config' to quickly check the logstash config.
   validate-logstash-config:
-    image: blacktop/logstash:${ELASTIC_VERSION:-7.6}
+    image: blacktop/logstash:${ELASTIC_VERSION:-7.10.2}
     profiles:
       - kibana
     restart: "no"
@@ -549,7 +549,7 @@ services:
   # Takes care of piling up Elasticsearch indices/logs. Can do many other things as well.
   # Set up a cron job that runs "docker-compose run --rm curator --config /config.yml /action-file.yml" every once in a while.
   curator:
-    image: bobrik/curator:5.7.6
+    image: bobrik/curator:5.8.1
     profiles:
       - kibana
     container_name: curator
@@ -562,7 +562,7 @@ services:
 
   # Gets metrics from host machine and send to elastic
   metricbeat:
-    image: elastic/metricbeat:${ELASTIC_VERSION:-7.6}
+    image: elastic/metricbeat:${ELASTIC_VERSION:-7.10.2}
     profiles:
       - metricbeat
     restart: unless-stopped

diff --git a/placeos b/placeos
@@ -310,10 +310,12 @@ start_environment() (
         "Bringing up services..." \
         "Failed to start services."
 
-    run_or_abort \
-        "${base_path}/scripts/init-influxdb" \
-        "Configuring InfluxDB..." \
-        "Failed to configure InfluxDB."
+    if [[ $PROFILES == *"analytics"* ]]; then
+        run_or_abort \
+            "${base_path}/scripts/init-influxdb" \
+            "Configuring InfluxDB..." \
+            "Failed to configure InfluxDB."
+    fi
 
     [ ${hard_reset} == "true" ] && hard_reset