Release v4.0.0 Commit 3da0b13 Deploy Commit #0eb00d8

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
   <tr>
     <td>CAF_AUDIT_SERVICE_KEYSTORE_ALIAS</td>
     <td>tomcat</td>
-    <td>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 <code>server.xml</code>. The default is "tomcat".</td>
+    <td>If you generated your own keystore with a custom keystore alias, use this environment variable to update the Audit Web Service's keystore configuration.</td>
   </tr>
   <tr>
     <td>CAF_AUDIT_SERVICE_KEYSTORE_PASS</td>
     <td>changeit</td>
-    <td>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 <code>server.xml</code>. The default is "changeit".</td>
-  </tr>
-  <tr>
-    <td>CAF_AUDIT_SERVICE_KEY_PASS</td>
-    <td>changeit</td>
-    <td>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 <code>server.xml</code>. The default is "changeit".</td>
+    <td>If you generated your own keystore with a custom keystore password, use this environment variable to update the Audit Web Service's keystore configuration.</td>
   </tr>
 </table>
 

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:

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:

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,

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=<Elasticsearch_Node> -e ES_PORT=<Elasticsearch_Node_Transport_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=<Elasticsearch_Node> -e ES_PORT=<Elasticsearch_Node_Transport_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://<Elasticsearch_Node>:<Elasticsearch_Node_HTTP_P
 From your Docker host command-line, run the Audit Monkey sending [2] Audit Events, for Tenant Id [wstestid], through the [Audit Web Service] in [Standard] mode using [1] thread. Replace the `WS_HOSTNAME` and `WS_PORT` environment variables with the details of the CAF Audit Web Service deployed for smoke testing purposes:
 
 ```
-docker run -e CAF_AUDIT_TENANT_ID=wstestid -e CAF_AUDIT_MODE=webservice -e WS_HOSTNAME=<CAF_Audit_Web_Service_Host> -e WS_PORT=<CAF_Audit_Web_Service_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=<CAF_Audit_Web_Service_Host> -e WS_PORT=<CAF_Audit_Web_Service_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
 

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