From e77532c66601101ef64d8c8a145ba11af28819b4 Mon Sep 17 00:00:00 2001 From: Build Machine Date: Thu, 8 Feb 2024 06:25:01 -0500 Subject: [PATCH] Release v4.0.0 Commit 3da0b13abf6f3c39fbd25e43d3d0ce66c1eac49c Deploy Commit #0eb00d8 --- README.md | 13 ++++--------- docker-compose.https.yml | 8 ++++---- docker-compose.yml | 2 +- production-marathon/marathon.json.b | 2 +- .../production-smoke-testing/README.md | 4 ++-- production-swarm/docker-stack.yml | 2 +- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index eeb7c6a5..fdc0b9fe 100644 --- a/README.md +++ b/README.md @@ -250,11 +250,11 @@ The `docker-compose.https.yml` override file should be used to activate a HTTPS ##### Create the Keystore First of all, you need to generate a keystore file. For more information on generating keystores see these [instructions](https://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html). -A default keystore can be generated using the following command. Specify `changeit` when asked for both the keystore and key passwords. +A default keystore can be generated using the following command. Specify `changeit` when asked for the keystore password. keytool -genkey -alias tomcat -keystore .keystore -keyalg RSA -If you generate a keystore with custom passwords instead, then make sure to provide environment variables `CAF_AUDIT_SERVICE_KEYSTORE_PASS` and `CAF_AUDIT_SERVICE_KEY_PASS` (see override options below). +If you generate a keystore with a custom password instead, then make sure to provide environment variable `CAF_AUDIT_SERVICE_KEYSTORE_PASS` (see override options below). ##### Deploy the Keystore The generated keystore file then needs placed in a folder called `keystore` in audit-service-deploy. Name it `.keystore` or else provide your own custom path by setting `CAF_AUDIT_SERVICE_KEYSTORE` (e.g. `./mykeystore/ks.p12`). @@ -286,17 +286,12 @@ Additional external parameters can be set and used within the `docker-compose.ht CAF_AUDIT_SERVICE_KEYSTORE_ALIAS tomcat - If you generated your own keystore with a custom keystore alias, use this environment variable to update the Audit Web Service's keystore configuration in the server.xml. The default is "tomcat". + If you generated your own keystore with a custom keystore alias, use this environment variable to update the Audit Web Service's keystore configuration. CAF_AUDIT_SERVICE_KEYSTORE_PASS changeit - If you generated your own keystore with a custom keystore password, use this environment variable to update the Audit Web Service's keystore configuration in the server.xml. The default is "changeit". - - - CAF_AUDIT_SERVICE_KEY_PASS - changeit - If you generated your own keystore with a custom key password, use this environment variable to update the Audit Web Service's keystore configuration in the server.xml. The default is "changeit". + If you generated your own keystore with a custom keystore password, use this environment variable to update the Audit Web Service's keystore configuration. diff --git a/docker-compose.https.yml b/docker-compose.https.yml index 4283ffa7..fedde9de 100644 --- a/docker-compose.https.yml +++ b/docker-compose.https.yml @@ -2,10 +2,10 @@ version: '3' services: auditService: environment: - SSL_TOMCAT_CA_CERT_LOCATION: /keystore/tomcat.keystore - SSL_TOMCAT_CA_CERT_KEYSTORE_PASS: ${CAF_AUDIT_SERVICE_KEYSTORE_PASS:-changeit} - SSL_TOMCAT_CA_CERT_KEY_PASS: ${CAF_AUDIT_SERVICE_KEY_PASS:-changeit} - SSL_TOMCAT_CA_CERT_KEYSTORE_ALIAS: ${CAF_AUDIT_SERVICE_KEYSTORE_ALIAS:-tomcat} + SSL_KEYSTORE_PATH: /keystore + SSL_KEYSTORE: tomcat.keystore + SSL_KEYSTORE_PASSWORD: ${CAF_AUDIT_SERVICE_KEYSTORE_PASS:-changeit} + SSL_CERT_ALIAS: ${CAF_AUDIT_SERVICE_KEYSTORE_ALIAS:-tomcat} volumes: - ${CAF_AUDIT_SERVICE_KEYSTORE:-./keystore/.keystore}:/keystore/tomcat.keystore ports: diff --git a/docker-compose.yml b/docker-compose.yml index dd7ff25a..7ca484cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -103,7 +103,7 @@ services: - elasticsearch1 - elasticsearch2 - elasticsearch3 - image: cafaudit/prereleases:audit-service-3.11.1-1033 + image: cafaudit/prereleases:audit-service-4.0.0-1115 ports: - "${CAF_AUDIT_SERVICE_PORT:-25080}:8080" environment: diff --git a/production-marathon/marathon.json.b b/production-marathon/marathon.json.b index bf249bcb..4eae9fd7 100644 --- a/production-marathon/marathon.json.b +++ b/production-marathon/marathon.json.b @@ -7,7 +7,7 @@ "instances": 1, "container": { "docker": { - "image": "cafaudit/prereleases:audit-service-3.11.1-1033", + "image": "cafaudit/prereleases:audit-service-4.0.0-1115", "network": "BRIDGE", "portMappings": [{ "containerPort": 8080, diff --git a/production-marathon/production-smoke-testing/README.md b/production-marathon/production-smoke-testing/README.md index 8087aaf6..400090fa 100644 --- a/production-marathon/production-smoke-testing/README.md +++ b/production-marathon/production-smoke-testing/README.md @@ -17,7 +17,7 @@ Further information on the CAF Audit Monkey can be found [here](https://github.c From your Docker host command-line, run the Audit Monkey sending [2] Audit Events, for Tenant Id [directtestid], [direct] to Elasticsearch in [Standard] mode using [1] thread. Replace the `ES_HOSTNAME` and `ES_PORT` environment variables with the details of the Elasticsearch deployed for smoke testing purposes: ``` -docker run -e ES_HOSTNAME= -e ES_PORT= -e CAF_AUDIT_TENANT_ID=directtestid -e CAF_AUDIT_MODE=direct -e CAF_AUDIT_MONKEY_MODE=standard -e CAF_AUDIT_MONKEY_NUM_OF_EVENTS=2 -e CAF_AUDIT_MONKEY_NUM_OF_THREADS=1 cafaudit/prereleases:audit-monkey-3.11.1-1033 +docker run -e ES_HOSTNAME= -e ES_PORT= -e CAF_AUDIT_TENANT_ID=directtestid -e CAF_AUDIT_MODE=direct -e CAF_AUDIT_MONKEY_MODE=standard -e CAF_AUDIT_MONKEY_NUM_OF_EVENTS=2 -e CAF_AUDIT_MONKEY_NUM_OF_THREADS=1 cafaudit/prereleases:audit-monkey-4.0.0-1115 ``` #### Verification of Direct to Elasticsearch Audit Events @@ -33,7 +33,7 @@ curl --request GET --url 'http://: -e WS_PORT= -e CAF_AUDIT_MONKEY_MODE=standard -e CAF_AUDIT_MONKEY_NUM_OF_EVENTS=2 -e CAF_AUDIT_MONKEY_NUM_OF_THREADS=1 cafaudit/prereleases:audit-monkey-3.11.1-1033 +docker run -e CAF_AUDIT_TENANT_ID=wstestid -e CAF_AUDIT_MODE=webservice -e WS_HOSTNAME= -e WS_PORT= -e CAF_AUDIT_MONKEY_MODE=standard -e CAF_AUDIT_MONKEY_NUM_OF_EVENTS=2 -e CAF_AUDIT_MONKEY_NUM_OF_THREADS=1 cafaudit/prereleases:audit-monkey-4.0.0-1115 ``` #### Verification of Audit Events diff --git a/production-swarm/docker-stack.yml b/production-swarm/docker-stack.yml index c804fe84..5b6390bf 100644 --- a/production-swarm/docker-stack.yml +++ b/production-swarm/docker-stack.yml @@ -11,7 +11,7 @@ services: CAF_ELASTIC_PORT_VALUE: "${CAF_ELASTIC_PORT_VALUE}" CAF_ELASTIC_USERNAME: "${CAF_ELASTIC_USERNAME}" CAF_ELASTIC_PASSWORD: "${CAF_ELASTIC_PASSWORD}" - image: cafaudit/prereleases:audit-service-3.11.1-1033 + image: cafaudit/prereleases:audit-service-4.0.0-1115 deploy: mode: replicated replicas: 2