Merge pull request #122 from Cingulara/develop

Release Candidate 0.15
Cingulara · May 23, 2020 · 335a055 · 335a055
2 parents 3120e05 + 67d9fd0
commit 335a055
Show file tree

Hide file tree

Showing 11 changed files with 386 additions and 87 deletions.
diff --git a/deployments/chart/openrmf/Chart.yaml b/deployments/chart/openrmf/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: openrmf
-version: 1.3.0
+version: 1.4.0
 description: The OpenRMF web application to manage DoD STIGs, Nessus scans and NIST Risk Management Framework Compliance
 keywords:
   - RMF
@@ -13,5 +13,5 @@ maintainers:
   - name: David Gould
     email: [email protected]
 engine: gotpl 
-appVersion: 0.14.01
+appVersion: 0.15.01
 deprecated: false
diff --git a/deployments/chart/openrmf/values.yaml b/deployments/chart/openrmf/values.yaml
@@ -25,24 +25,24 @@ installType: minikube
 
 # versions of container to adjust
 # examples: 0.8, 0.8.1, latest
-auditImage: 0.14.01
-auditmsgImage: 0.14.01
-checklistmsgImage: 0.14.01
-complianceImage: 0.14.01
-compliancemsgImage: 0.14.01
-controlImage: 0.14.02
-controlmsgImage: 0.14.01
-readImage: 0.14.01
-saveImage: 0.14.01
-scoremsgImage: 0.14.01
-scoringImage: 0.14.01
-templateImage: 0.14.01
-templatemsgImage: 0.14.01
-uploadImage: 0.14.01
-systemmsgImage: 0.14.01
-webuiImage: 0.14.01
-reportImage: 0.14.01
-reportmsgImage: 0.14.02
+auditImage: 0.15.01
+auditmsgImage: 0.15.01
+checklistmsgImage: 0.15.01
+complianceImage: 0.15.01
+compliancemsgImage: 0.15.01
+controlImage: 0.15.01
+controlmsgImage: 0.15.01
+readImage: 0.15.01
+saveImage: 0.15.01
+scoremsgImage: 0.15.01
+scoringImage: 0.15.01
+templateImage: 0.15.01
+templatemsgImage: 0.15.01
+uploadImage: 0.15.01
+systemmsgImage: 0.15.01
+webuiImage: 0.15.02
+reportImage: 0.15.01
+reportmsgImage: 0.15.01
 mongoImage: 4.0.5
 natsImage: 2.1.2-linux
 

diff --git a/docs/whatsnew.md b/docs/whatsnew.md
@@ -1,19 +1,24 @@
 ---
-title: What's New in v0.14
+title: What's New in v0.15
 nav_order: 2
 ---
 
 # What's New with OpenRMF
 
 Please refer to the <a href="https://github.com/Cingulara?tab=projects" target="_blank">OpenRMF Projects listing on GitHub</a> for more information on feature updates and timeline.
 
-The latest working version is version 0.14. The recent updates on that are below:
+The latest working version is version 0.15 and is the last update before going to version 1.0 of OpenRMF Core. The recent updates on that are below:
+* Migrating the Web UI and all APIs behind NGINX for a single port 8080
+* Automatically updating the checklist score on the page when editing a vulnerability status
+* Various small bug fixes
+
+The recent updates on version 0.14 are below:
 * A new Report API for certain reports, using eventual consistency for behind the scenes reporting and faster data.
 * Better indexing across all databases.
 * Caching of certain data to quicken retrieving (reports, control listing, list of values, etc.).
 * A new NATS Client Metrics exporter and Grafana dashboard we created to track metrics to the consumer level.
 
-The latest working version is version 0.13. The recent updates on that are below:
+The recent updates for version 0.13 are below:
 * Showing the CCI title and NIST related controls for each Vulnerability in a Checklist
 * Export the Compliance listing to MS Excel
 * Updated /healthz checks for Kubernetes for database connectivity

diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
@@ -3,7 +3,7 @@ version : '3.2'
 services:
 ### 1 Web Front End Container
   openrmf-web:
-    image: cingulara/openrmf-web:0.14.01
+    image: cingulara/openrmf-web:0.15.02
     container_name: openrmf-web
     ports:
       - 8080:80
@@ -14,19 +14,21 @@ services:
       - openrmfapi-upload
       - openrmfapi-read
       - openrmfapi-compliance
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
     networks:
       - openrmf
 
 ### 9 API Containers
   openrmfapi-scoring:
-    image: cingulara/openrmf-api-scoring:0.14.01
+    image: cingulara/openrmf-api-scoring:0.15.01
     container_name: openrmf-scoring-api
     ports:
-      - 8090:8080
+      - 8090
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8090
       - MONGODBCONNECTION=mongodb://openrmfscore:openrmf1234!@scoredb/openrmfscore?authSource=openrmfscore
       - MONGODB=openrmfscore
       - JAEGER_AGENT_HOST=jaeger
@@ -41,14 +43,14 @@ services:
       - openrmf
 
   openrmfapi-save:
-    image: cingulara/openrmf-api-save:0.14.01
+    image: cingulara/openrmf-api-save:0.15.01
     container_name: openrmf-save-api
     ports:
-      - 8082:8080
+      - 8082
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8082
       - MONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf
       - MONGODB=openrmf
       - NATSSERVERURL=nats://natsserver:4222
@@ -66,14 +68,14 @@ services:
       - openrmf
 
   openrmfapi-template:
-    image: cingulara/openrmf-api-template:0.14.01
+    image: cingulara/openrmf-api-template:0.15.01
     container_name: openrmf-template-api
     ports:
-      - 8088:8080
+      - 8088
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8088
       - NATSSERVERURL=nats://natsserver:4222
       - MONGODBCONNECTION=mongodb://openrmftemplate:openrmf1234!@templatedb/openrmftemplate?authSource=openrmftemplate
       - MONGODB=openrmftemplate
@@ -89,14 +91,14 @@ services:
       - openrmf
 
   openrmfapi-upload:
-    image: cingulara/openrmf-api-upload:0.14.01
+    image: cingulara/openrmf-api-upload:0.15.01
     container_name: openrmf-upload-api
     ports:
-      - 8086:8080
+      - 8086
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8086
       - MONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf
       - MONGODB=openrmf
       - NATSSERVERURL=nats://natsserver:4222
@@ -114,14 +116,14 @@ services:
       - openrmf
 
   openrmfapi-read:
-    image: cingulara/openrmf-api-read:0.14.01
+    image: cingulara/openrmf-api-read:0.15.01
     container_name: openrmf-read-api
     ports:
-      - 8084:8080
+      - 8084
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8084
       - MONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf
       - MONGODB=openrmf
       - NATSSERVERURL=nats://natsserver:4222
@@ -137,14 +139,14 @@ services:
       - openrmf
 
   openrmfapi-compliance:
-    image: cingulara/openrmf-api-compliance:0.14.01
+    image: cingulara/openrmf-api-compliance:0.15.01
     container_name: openrmf-compliance-api
     ports:
-      - 8092:8080
+      - 8092
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8092
       - NATSSERVERURL=nats://natsserver:4222
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_AGENT_PORT=6831
@@ -156,14 +158,14 @@ services:
       - openrmf
 
   openrmfapi-controls:
-    image: cingulara/openrmf-api-controls:0.14.02
+    image: cingulara/openrmf-api-controls:0.15.01
     container_name: openrmf-controls-api
     ports:
-      - 8094:8080
+      - 8094
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8094
       - NATSSERVERURL=nats://natsserver:4222
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_AGENT_PORT=6831
@@ -175,14 +177,14 @@ services:
       - openrmf
 
   openrmfapi-audit:
-    image: cingulara/openrmf-api-audit:0.14.01
+    image: cingulara/openrmf-api-audit:0.15.01
     container_name: openrmf-audit-api
     ports:
-      - 8096:8080
+      - 8096
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8096
       - MONGODBCONNECTION=mongodb://openrmfaudit:openrmf1234!@auditdb/openrmfaudit?authSource=openrmfaudit
       - MONGODB=openrmfaudit
       - NATSSERVERURL=nats://natsserver:4222
@@ -198,14 +200,14 @@ services:
       - openrmf
 
   openrmfapi-report:
-    image: cingulara/openrmf-api-report:0.14.01
+    image: cingulara/openrmf-api-report:0.15.01
     container_name: openrmf-report-api
     ports:
-      - 8098:8080
+      - 8098
     env_file: .env
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://*:8080
+      - ASPNETCORE_URLS=http://*:8098
       - REPORTMONGODBCONNECTION=mongodb://openrmfreport:openrmf1234!@reportdb/openrmfreport?authSource=openrmfreport
       - REPORTMONGODB=openrmfreport
       - NATSSERVERURL=nats://natsserver:4222
@@ -222,7 +224,7 @@ services:
 
 ### 8 Messaging Containers
   openrmfmsg-score:
-    image: cingulara/openrmf-msg-score:0.14.01
+    image: cingulara/openrmf-msg-score:0.15.01
     container_name: openrmf-score-nats-message-client
     environment:
       - MONGODBCONNECTION=mongodb://openrmfscore:openrmf1234!@scoredb/openrmfscore?authSource=openrmfscore
@@ -241,7 +243,7 @@ services:
       - openrmf
 
   openrmfmsg-checklist:
-    image: cingulara/openrmf-msg-checklist:0.14.01
+    image: cingulara/openrmf-msg-checklist:0.15.01
     container_name: openrmf-checklist-nats-message-client
     environment:
       - MONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf
@@ -260,7 +262,7 @@ services:
       - openrmf
 
   openrmfmsg-compliance:
-    image: cingulara/openrmf-msg-compliance:0.14.01
+    image: cingulara/openrmf-msg-compliance:0.15.01
     container_name: openrmf-compliance-nats-message-client
     environment:
       - NATSSERVERURL=nats://natsserver:4222
@@ -276,7 +278,7 @@ services:
       - openrmf
 
   openrmfmsg-controls:
-    image: cingulara/openrmf-msg-controls:0.14.01
+    image: cingulara/openrmf-msg-controls:0.15.01
     container_name: openrmf-controls-nats-message-client
     environment:
       - NATSSERVERURL=nats://natsserver:4222
@@ -292,7 +294,7 @@ services:
       - openrmf
 
   openrmfmsg-template:
-    image: cingulara/openrmf-msg-template:0.14.01
+    image: cingulara/openrmf-msg-template:0.15.01
     container_name: openrmf-template-nats-message-client
     environment:
       - MONGODBCONNECTION=mongodb://openrmftemplate:openrmf1234!@templatedb/openrmftemplate?authSource=openrmftemplate
@@ -311,7 +313,7 @@ services:
       - openrmf
 
   openrmfmsg-system:
-    image: cingulara/openrmf-msg-system:0.14.01
+    image: cingulara/openrmf-msg-system:0.15.01
     container_name: openrmf-system-nats-message-client
     environment:
       - MONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf
@@ -330,7 +332,7 @@ services:
       - openrmf
 
   openrmfmsg-audit:
-    image: cingulara/openrmf-msg-audit:0.14.01
+    image: cingulara/openrmf-msg-audit:0.15.01
     container_name: openrmf-audit-nats-message-client
     environment:
       - MONGODBCONNECTION=mongodb://openrmfaudit:openrmf1234!@auditdb/openrmfaudit?authSource=openrmfaudit
@@ -349,7 +351,7 @@ services:
       - openrmf
 
   openrmfmsg-report:
-    image: cingulara/openrmf-msg-report:0.14.02
+    image: cingulara/openrmf-msg-report:0.15.01
     container_name: openrmf-report-nats-message-client
     environment:
       - SYSTEMMONGODBCONNECTION=mongodb://openrmf:openrmf1234!@checklistdb/openrmf?authSource=openrmf

diff --git a/scripts/edge/.env b/scripts/edge/.env
@@ -1,2 +1,2 @@
-JWT-AUTHORITY=http://192.168.11.29:9001/auth/realms/openrmf
+JWT-AUTHORITY=http://192.168.13.73:9001/auth/realms/openrmf
 JWT-CLIENT=openrmf