Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ES and logstash to 8.12.0 #200

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
- **Download Logstash**:
- [**download-file-action**](https://github.com/marketplace/actions/download-file-to-workspace): This action downloads a file from the internet into the workspace
- Downloads Logstash using a URL
- Renames the file as `logstash-8.8.0.zip`
- Renames the file as `logstash-8.12.0.zip`
- Stores Logstash in appropriate directory
- **Check for Logstash**:
- List files in the directory where Logstash is expected
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/camunda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
- name: Download Logstash
uses: carlosperate/download-file-action@v1
with:
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
file-name: logstash-8.8.0.zip
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
file-name: logstash-8.12.0.zip
location: install/logging/

- name: Check for Logstash
Expand Down Expand Up @@ -186,8 +186,8 @@ jobs:
- name: Download Logstash
uses: carlosperate/download-file-action@v1
with:
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
file-name: logstash-8.8.0.zip
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
file-name: logstash-8.12.0.zip
location: install/logging/

- name: Check for Logstash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ldap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
- name: Download Logstash
uses: carlosperate/download-file-action@v1
with:
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
file-name: logstash-8.8.0.zip
file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
file-name: logstash-8.12.0.zip
location: install/logging/

- name: Check for Logstash
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
- A database for CWS to use. `cws_dev` is a good default name.
- A database user with full access to the above database.
- [**ITerm2**](https://iterm2.com/): Currently these build scripts include commands to open new terminal windows using ITerm2, so they are best run from that terminal.
- **Logstash 8.8.0+**: Download Logstash for your platform. Uncompress it (only if it is a .tar.gz) and then ZIP back it up with the filename 'logstash-8.8.0.zip' and place in `install/logging/`. This is a temporary workaround while we clean up our installation process. You can find the zip download [here](https://www.elastic.co/downloads/logstash).
- **Elasticsearch 8.8.0+**: CWS requires an externally-configured elasticsearch cluster to be set up. You can use an SSL Secure Elasticsearch with or without authentication, or an Insecure HTTP Elasticsearch.
- **Logstash 8.12.0+**: Download Logstash for your platform. Uncompress it (only if it is a .tar.gz) and then ZIP back it up with the filename 'logstash-8.12.0.zip' and place in `install/logging/`. This is a temporary workaround while we clean up our installation process. You can find the zip download [here](https://www.elastic.co/downloads/logstash).
- **Elasticsearch 8.12.0+**: CWS requires an externally-configured elasticsearch cluster to be set up. You can use an SSL Secure Elasticsearch with or without authentication, or an Insecure HTTP Elasticsearch.
- The "Elasticsearch Setup" instruction below provides a contained Dockerized way of running Elasticsearch. This serves as an alternative to installing Elasticsearch.
- Tomcat **keystore, truststore, storepass files** (needed for CWS web console to work properly). To generate an open-source **.keystore** and **cws_truststore.jks** use the script `./generate-certs.sh` [here](https://github.com/NASA-AMMOS/common-workflow-service/tree/develop/cws-certs)
- You will need to add your own Tomcat keystore file to this path: `install/.keystore`
Expand Down
11 changes: 5 additions & 6 deletions install/cws-ui/configuration.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,6 @@
<td>CWS Version</td>
<td>${version}</td>
</tr>
<tr>
<td>Camunda Version</td>
<td>${camundaVersion}</td>
</tr>

<tr>
<td>CWS Database Type</td>
<td>${dbType}</td>
Expand Down Expand Up @@ -247,9 +242,13 @@
<td>${historyLevel?capitalize}</td>
</tr>
<tr>
<td>CWS History Days To Live</td>
<td>CWS History Days To Live (Logs & ES)</td>
<td>${historyDaysToLive}</td>
</tr>
<tr>
<td>Camunda Version</td>
<td>${camundaVersion}</td>
</tr>
<tr>
<td>Java Version</td>
<td>${javaVersion}</td>
Expand Down
6 changes: 3 additions & 3 deletions install/docker/console-db-es-ls-kibana/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
labels:
com.example.service: "es"
com.example.description: "For searching and indexing data"
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
container_name: cws-es
# networks:
# - frontend
Expand Down Expand Up @@ -54,7 +54,7 @@ services:
# labels:
# com.example.service: "kibana"
# com.example.description: "Data visualisation and for log aggregation"
# image: kibana:8.8.0
# image: kibana:8.12.0
# container_name: cws-kibana
# ports:
# - "5601:5601"
Expand All @@ -69,7 +69,7 @@ services:
# labels:
# com.example.service: "logstash"
# com.example.description: "For logging data"
# image: logstash:8.8.0
# image: logstash:8.12.0
# container_name: cws-logstash
# volumes:
# - ./cws-logstash.conf:/home/cws_user/cws-logstash.conf:ro
Expand Down
2 changes: 1 addition & 1 deletion install/docker/cws-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM oraclelinux:8

RUN yum update -y && \
yum install -y mysql java-11-openjdk java-11-openjdk-devel rsync which && \
yum install -y mysql java-17-openjdk java-17-openjdk-devel rsync which && \
yum clean all

ENV JAVA_HOME /usr/lib/jvm/java-openjdk
Expand Down
5 changes: 5 additions & 0 deletions install/docker/cws-image/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ ls /home/cws_user/cws/server/apache-tomcat-9.0.75/logs
# Clear out any previous logs before starting (Note: Previous logs will cause CWS not to start)
rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.75/logs/*

mkdir ~/.cws
echo "changeit" > ~/.cws/creds
chmod 700 ~/.cws
chmod 600 ~/.cws/creds

cd cws
./configure.sh ../config.properties Y

Expand Down
4 changes: 2 additions & 2 deletions install/docker/es-only/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
labels:
com.example.service: "es"
com.example.description: "For searching and indexing data"
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
container_name: cws-es-only
networks:
- es-net
Expand Down Expand Up @@ -35,7 +35,7 @@ services:
# labels:
# com.example.service: "kibana"
# com.example.description: "Data visualisation and for log aggregation"
# image: kibana:8.8.0
# image: kibana:8.12.0
# container_name: cws-kibana
# ports:
# - "5601:5601"
Expand Down
2 changes: 1 addition & 1 deletion install/docker/worker-ls/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
# labels:
# com.example.service: "logstash"
# com.example.description: "For logging data"
# image: docker.elastic.co/logstash/logstash:8.8.0
# image: docker.elastic.co/logstash/logstash:8.12.0
# container_name: cws-worker-logstash
# volumes:
# - logs-volume:/cws_logs:ro
Expand Down
2 changes: 1 addition & 1 deletion utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export CWS_VER='2.6.0-pre.1' # update this each CWS release
export CAMUNDA_VER='7.20.0'
export TOMCAT_VER='9.0.75'
export LOGSTASH_VER='8.8.0'
export LOGSTASH_VER='8.12.0'

# Prints the provided string, tagging with the script that called it
function print () {
Expand Down
Loading