diff --git a/.gitignore b/.gitignore
index 18c02ca6..d83f71d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,7 @@ creds.txt
cws-test/newCWSDir
.DS_Store
-install/logging/logstash-7.9.0.zip
-install/logging/logstash-6.4.2.zip
+install/logging/logstash-*.zip
*personal_dev.sh
diff --git a/cws-adaptation-engine/pom.xml b/cws-adaptation-engine/pom.xml
index 4417dfe4..221ed207 100644
--- a/cws-adaptation-engine/pom.xml
+++ b/cws-adaptation-engine/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-adaptation-engine
diff --git a/cws-adaptation/pom.xml b/cws-adaptation/pom.xml
index f411adcb..976fb60f 100644
--- a/cws-adaptation/pom.xml
+++ b/cws-adaptation/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-adaptation
diff --git a/cws-core/pom.xml b/cws-core/pom.xml
index eca6249a..22699c6f 100644
--- a/cws-core/pom.xml
+++ b/cws-core/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-core
diff --git a/cws-engine-service/pom.xml b/cws-engine-service/pom.xml
index 54009394..a368bbde 100644
--- a/cws-engine-service/pom.xml
+++ b/cws-engine-service/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-engine-service
diff --git a/cws-engine/pom.xml b/cws-engine/pom.xml
index c99fdaa0..0eb1c383 100644
--- a/cws-engine/pom.xml
+++ b/cws-engine/pom.xml
@@ -4,7 +4,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-engine
diff --git a/cws-installer/pom.xml b/cws-installer/pom.xml
index ee408166..a292d7c6 100644
--- a/cws-installer/pom.xml
+++ b/cws-installer/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-installer
diff --git a/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java b/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java
index 63eb29ce..96a5d7f9 100644
--- a/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java
+++ b/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java
@@ -1077,6 +1077,7 @@ private static void setupElasticsearch() {
read_elasticsearch_host = readRequiredLine("Enter the Elasticsearch host (be sure to include protocol in URL: http:// or https://): ",
"You must enter a hostname");
}
+
elasticsearch_host = read_elasticsearch_host.toLowerCase();
} else {
elasticsearch_host = readLine("Enter the Elasticsearch host. " +
diff --git a/cws-service/pom.xml b/cws-service/pom.xml
index e3548754..c33af369 100644
--- a/cws-service/pom.xml
+++ b/cws-service/pom.xml
@@ -4,7 +4,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-service
diff --git a/cws-tasks/pom.xml b/cws-tasks/pom.xml
index b385f3b9..9226c2f3 100644
--- a/cws-tasks/pom.xml
+++ b/cws-tasks/pom.xml
@@ -4,7 +4,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-tasks
diff --git a/cws-test/pom.xml b/cws-test/pom.xml
index 8b7b9bd8..3fe882f8 100644
--- a/cws-test/pom.xml
+++ b/cws-test/pom.xml
@@ -3,7 +3,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-test
diff --git a/cws-ui/pom.xml b/cws-ui/pom.xml
index ec6ab3ac..7d0f73fd 100644
--- a/cws-ui/pom.xml
+++ b/cws-ui/pom.xml
@@ -5,7 +5,7 @@
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
cws-ui
diff --git a/dev.sh b/dev.sh
index 74ff720e..15b2b9fe 100755
--- a/dev.sh
+++ b/dev.sh
@@ -72,7 +72,7 @@ BASE_PORT=8000
tab ${DIST}/console-only/cws "./start_cws.sh -d $BASE_PORT; tail -f $LOG_FILE"
print "Waiting for console startup..."
-sleep 100
+sleep 180
# -----------------
# CONFIGURE WORKERS
diff --git a/install/docker/console-db-es-ls-kibana/config.properties b/install/docker/console-db-es-ls-kibana/config.properties
index 4d4ee816..3a0ae756 100644
--- a/install/docker/console-db-es-ls-kibana/config.properties
+++ b/install/docker/console-db-es-ls-kibana/config.properties
@@ -107,12 +107,12 @@ cws_notification_emails=[AdminEmailAddresses(comma separated)]
# If you wish to use an unsecured Elasticsearch host, you may do so
# by specifying elasticsearch_use_auth=n below.
elasticsearch_use_auth=n
-elasticsearch_host=es
+elasticsearch_host=http://es
elasticsearch_port=9200
# This allows CWS to use a user provided Logstash service, thus CWS will not install
# nor start its own.
-user_provided_logstash=y
+user_provided_logstash=n
history_level=full
diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml
index 2b1ddb9b..5fb61622 100644
--- a/install/docker/console-db-es-ls-kibana/docker-compose.yml
+++ b/install/docker/console-db-es-ls-kibana/docker-compose.yml
@@ -23,7 +23,7 @@ services:
labels:
com.example.service: "es"
com.example.description: "For searching and indexing data"
- image: elasticsearch:7.9.0
+ image: elasticsearch:7.16.2
container_name: cws-es
networks:
- frontend
@@ -49,56 +49,56 @@ services:
#soft: 65536
#hard: 65536
#mem_limit: 2g
- kibana:
- labels:
- com.example.service: "kibana"
- com.example.description: "Data visualisation and for log aggregation"
- image: kibana:7.9.0
- container_name: cws-kibana
- ports:
- - "5601:5601"
- networks:
- - frontend
- - backend
- environment:
- - ELASTICSEARCH_URL=http://es:9200
- depends_on:
- - es
- logstash:
- labels:
- com.example.service: "logstash"
- com.example.description: "For logging data"
- image: docker.elastic.co/logstash/logstash:7.9.0
- container_name: cws_logstash
- volumes:
- - ./cws-logstash.conf:/home/cws_user/cws-logstash.conf:ro
- - logs-volume:/cws_logs:ro
- command: logstash -f /home/cws_user/cws-logstash.conf
- environment:
- - XPACK_MONITORING_ENABLED=false
- healthcheck:
- test: ["CMD-SHELL", "curl --silent --fail localhost:9600 || exit 1"]
- interval: 5s
- timeout: 2s
- retries: 12
- depends_on:
- - es
- ports:
- - "9600:9600"
- networks:
- - frontend
- - backend
+# kibana:
+# labels:
+# com.example.service: "kibana"
+# com.example.description: "Data visualisation and for log aggregation"
+# image: kibana:7.16.2
+# container_name: cws-kibana
+# ports:
+# - "5601:5601"
+# networks:
+# - frontend
+# - backend
+# environment:
+# - ELASTICSEARCH_URL=http://es:9200
+# depends_on:
+# - es
+# logstash:
+# labels:
+# com.example.service: "logstash"
+# com.example.description: "For logging data"
+# image: docker.elastic.co/logstash/logstash:7.16.2
+# container_name: cws_logstash
+# volumes:
+# - ./cws-logstash.conf:/home/cws_user/cws-logstash.conf:ro
+# - logs-volume:/cws_logs:ro
+# command: logstash -f /home/cws_user/cws-logstash.conf
+# environment:
+# - XPACK_MONITORING_ENABLED=false
+# healthcheck:
+# test: ["CMD-SHELL", "curl --silent --fail localhost:9600 || exit 1"]
+# interval: 5s
+# timeout: 2s
+# retries: 12
+# depends_on:
+# - es
+# ports:
+# - "9600:9600"
+# networks:
+# - frontend
+# - backend
cws:
container_name: cws-console
labels:
com.example.service: "cws-server"
com.example.description: "Common Workflow Service"
- image: nasa-ammos/common-workflow-service:2.0
+ image: nasa-ammos/common-workflow-service:2.2.0-pre
depends_on:
- db
- es
- - logstash
- - kibana
+# - logstash
+# - kibana
ports:
- "38080:38080"
- "38443:38443"
@@ -111,7 +111,7 @@ services:
- DB_HOST=db
- DB_USER=root
- DB_PW=test
- - ES_HOST=es
+ - ES_HOST=http://es
- ES_PORT=9200
volumes:
- ./config.properties:/home/cws_user/config.properties:ro
diff --git a/install/docker/cws-image/Dockerfile b/install/docker/cws-image/Dockerfile
index 5889b674..2cca31c9 100644
--- a/install/docker/cws-image/Dockerfile
+++ b/install/docker/cws-image/Dockerfile
@@ -1,7 +1,7 @@
-FROM centos:7
+FROM oraclelinux:8
RUN yum update -y && \
- yum install -y mariadb-server mariadb-client java-1.8.0-openjdk java-1.8.0-openjdk-devel && \
+ yum install -y mariadb-server java-1.8.0-openjdk java-1.8.0-openjdk-devel && \
yum clean all
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
diff --git a/install/docker/cws-image/build.sh b/install/docker/cws-image/build.sh
index d0ecbfff..a0fd6ed2 100755
--- a/install/docker/cws-image/build.sh
+++ b/install/docker/cws-image/build.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-ver='2.1-pre' # update this each CWS release
+ver='2.2.0-pre' # update this each CWS release
echo
echo "ATTENTION: If changes were made to the source code or config files, don't forget to rebuild the cws .tar.gz package file before running this script."
diff --git a/install/docker/cws-image/wait_for_mariadb.sh b/install/docker/cws-image/wait_for_mariadb.sh
index 2f55e1b8..46aaf805 100755
--- a/install/docker/cws-image/wait_for_mariadb.sh
+++ b/install/docker/cws-image/wait_for_mariadb.sh
@@ -19,7 +19,7 @@ while ! mysql --host="${DB_HOST}" --user="${DB_USER}" --password="${DB_PW}" -e "
fi;
done
-while ! curl -s http://$ES_HOST:$ES_PORT; do
+while ! curl -s $ES_HOST:$ES_PORT; do
sleep 1
echo "Retry wait for ES"
done
diff --git a/install/docker/es-only/docker-compose.yml b/install/docker/es-only/docker-compose.yml
index 1c163f1e..d09b1b6e 100644
--- a/install/docker/es-only/docker-compose.yml
+++ b/install/docker/es-only/docker-compose.yml
@@ -6,7 +6,7 @@ services:
labels:
com.example.service: "es"
com.example.description: "For searching and indexing data"
- image: elasticsearch:7.9.0
+ image: elasticsearch:7.16.2
container_name: cws-es
networks:
- frontend
@@ -32,21 +32,21 @@ services:
#soft: 65536
#hard: 65536
#mem_limit: 2g
- kibana:
- labels:
- com.example.service: "kibana"
- com.example.description: "Data visualisation and for log aggregation"
- image: kibana:7.9.0
- container_name: cws-kibana
- ports:
- - "5601:5601"
- networks:
- - frontend
- - backend
- environment:
- - ELASTICSEARCH_URL=http://es:9200
- depends_on:
- - es
+# kibana:
+# labels:
+# com.example.service: "kibana"
+# com.example.description: "Data visualisation and for log aggregation"
+# image: kibana:7.16.2
+# container_name: cws-kibana
+# ports:
+# - "5601:5601"
+# networks:
+# - frontend
+# - backend
+# environment:
+# - ELASTICSEARCH_URL=http://es:9200
+# depends_on:
+# - es
networks:
frontend:
diff --git a/pom.xml b/pom.xml
index 5e077ab1..44c0ea47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gov.nasa.jpl.ammos.ids.cws
common-workflow-service
- 2.1.0-pre.3
+ 2.2.0-pre
pom
cws
CWS
diff --git a/utils.sh b/utils.sh
index f4c3dc75..46899847 100644
--- a/utils.sh
+++ b/utils.sh
@@ -5,10 +5,10 @@
# Shell utility functions and environment settings used throughout CWS setup scripts
# Update versions as necessary
-export CWS_VER='2.1.0-pre.3' # update this each CWS release
+export CWS_VER='2.2.0-pre' # update this each CWS release
export CAMUNDA_VER='7.13.0'
export TOMCAT_VER='9.0.33'
-export LOGSTASH_VER='7.9.0'
+export LOGSTASH_VER='7.16.2'
# Prints the provided string, tagging with the script that called it
function print () {