diff --git a/Machines/Dockerfile b/Machines/Dockerfile index 35741f3..56e5156 100644 --- a/Machines/Dockerfile +++ b/Machines/Dockerfile @@ -1,4 +1,4 @@ -FROM softwareag/webmethods-microservicesruntime:10.11.0.0 +FROM softwareag/webmethods-microservicesruntime:10.11.0.2 MAINTAINER SoftwareAG USER root diff --git a/Products/src/APIGW/productsWebService-archive.zip b/Products/src/APIGW/productsWebService-archive.zip new file mode 100644 index 0000000..4f5a2f0 Binary files /dev/null and b/Products/src/APIGW/productsWebService-archive.zip differ diff --git a/ServiceMonitor/Dockerfile b/ServiceMonitor/Dockerfile index 5b387c1..79dfb97 100644 --- a/ServiceMonitor/Dockerfile +++ b/ServiceMonitor/Dockerfile @@ -1,4 +1,4 @@ -FROM softwareag/webmethods-microservicesruntime:10.11.0.0 +FROM softwareag/webmethods-microservicesruntime:10.11.0.2 MAINTAINER SoftwareAG @@ -7,5 +7,6 @@ USER root COPY ${PACKAGE} /opt/softwareag/IntegrationServer/packages/${PACKAGE} RUN chown 1724:1724 -R /opt/softwareag/IntegrationServer/packages/* +RUN chown 1724:1724 /opt/softwareag/IntegrationServer/config/licenseKey.xml USER 1724 diff --git a/ServiceMonitor/Dockerfile.bak b/ServiceMonitor/Dockerfile.bak new file mode 100644 index 0000000..b454b8a --- /dev/null +++ b/ServiceMonitor/Dockerfile.bak @@ -0,0 +1,12 @@ +FROM softwareag/webmethods-microservicesruntime:10.11.0.0 + +MAINTAINER SoftwareAG + +USER root + +COPY ${PACKAGE} /opt/softwareag/IntegrationServer/packages/${PACKAGE} +COPY ISLicense.xml /opt/softwareag/IntegrationServer/config/licenseKey.xml + +RUN chown 1724:1724 -R /opt/softwareag/IntegrationServer/packages/* + +USER 1724 diff --git a/ServiceMonitor/Jenkinsfile b/ServiceMonitor/Jenkinsfile index 5829387..a35e0b7 100644 --- a/ServiceMonitor/Jenkinsfile +++ b/ServiceMonitor/Jenkinsfile @@ -35,6 +35,8 @@ spec: - /bin/cat tty: true volumeMounts: + - name: tmp-dir + mountPath: /wm-installer - name: docker-sock mountPath: /var/run/docker.sock - name: jenkins-docker-cfg @@ -42,6 +44,9 @@ spec: securityContext: privileged: true volumes: + - name: tmp-dir + hostPath: + path: "/tmp/license" - name: docker-sock hostPath: path: "/var/run/docker.sock" diff --git a/ServiceMonitor/Jenkinsfile.bak b/ServiceMonitor/Jenkinsfile.bak index 612d2ce..4feb7ef 100644 --- a/ServiceMonitor/Jenkinsfile.bak +++ b/ServiceMonitor/Jenkinsfile.bak @@ -68,7 +68,7 @@ spec: NAMESPACE = "api-first-workshop" REGISTRY_INGRESS = "https://${params.REGISTRY}" CONTAINER = "service-monitor-api" - CONTAINER_TAG = "1.0" + CONTAINER_TAG = "1.0.${env.BUILD_NUMBER}" } stages { @@ -84,6 +84,7 @@ spec: build/test/reports' sh 'chmod -R go+w build/test' sh 'cd build/container; \ + cp /wm-installer/ISLicense.xml . ; \ cp -r ${WORKSPACE}/${PACKAGE}/Dockerfile .; \ cp -r ${WORKSPACE}/${PACKAGE}/src/IS/${PACKAGE} .;' } diff --git a/ServiceMonitor/deployment/api-DC.yml b/ServiceMonitor/deployment/api-DC.yml index a7b0f1a..aca4dee 100644 --- a/ServiceMonitor/deployment/api-DC.yml +++ b/ServiceMonitor/deployment/api-DC.yml @@ -50,6 +50,9 @@ spec: volumeMounts: - name: config-volume mountPath: /opt/swagmsr/config +# - name: license-file +# mountPath: /opt/softwareag/IntegrationServer/config/licenseKey.xml +# subPath: ISLicense.xml env: - name: "SAG_IS_CONFIG_PROPERTIES" value: "/opt/swagmsr/config/application.properties" @@ -71,4 +74,7 @@ spec: - name: config-volume configMap: name: application-properties-is - replicas: 1 \ No newline at end of file +# - name: license-file +# configMap: +# name: msr-license + replicas: 1 diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf index 55db415..9b07d53 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/node.ndf @@ -6,19 +6,34 @@ servicemonitor.apis:MachineIncidentAPI ServiceMonitor false + https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger + https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger + false + + + + + + 2.0 - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io /gateway/MachineIncident/1.0 http + + application/json + + + application/json + 1.0 - Create incidents when machines are broken + Create Incident when machine is broken MachineIncident @@ -31,9 +46,6 @@ - file://C:\Users\mihe\Downloads\MachineIncident_swagger.json - file:/C:/Users/mihe/Downloads/MachineIncident_swagger.json - false body @@ -53,9 +65,11 @@ true + + - - machineId + + componentStatusDescriptor BODY STRING @@ -65,9 +79,11 @@ true + + - - componentStatusDescription + + machineId BODY STRING @@ -77,6 +93,8 @@ true + + status @@ -89,21 +107,17 @@ true + + - - - - - - POST - servicemonitor.apis.MachineIncidentAPI_.connectors:fl38b55caf88995d476c5cb6 + servicemonitor.apis.MachineIncidentAPI_.connectors:incident_POST_1 application/json @@ -113,7 +127,7 @@ BODY REFERENCE - true + false false servicemonitor.apis.MachineIncidentAPI_.docTypes:body @@ -145,7 +159,7 @@ /incident_POST - servicemonitor.apis.MachineIncidentAPI_.connectors:fl38b55caf88995d476c5cb6 + servicemonitor.apis.MachineIncidentAPI_.connectors:incident_POST_1 diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger index a4c4894..7ad2de1 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI/swagger @@ -1,31 +1,35 @@ --- swagger: "2.0" info: - description: "Create incidents when machines are broken\n" + description: "Create Incident when machine is broken" version: "1.0" title: "MachineIncident" -host: "beneluxint.gateway.webmethodscloud.com" +host: "sagdemo.apigw-aw-us.webmethods.io" basePath: "/gateway/MachineIncident/1.0" schemes: - "http" +consumes: +- "application/json" +produces: +- "application/json" security: - apiKey: [] paths: /incident: post: - operationId: "fl38b55caf88995d476c5cb6" + operationId: "incident_POST_1" consumes: - "application/json" parameters: - in: "body" name: "body" - required: true + required: false schema: $ref: "#/definitions/body" responses: - 200: + "200": description: "OK" - 401: + "401": description: "Access Denied" securityDefinitions: apiKey: @@ -37,15 +41,15 @@ definitions: type: "object" required: - "component" - - "componentStatusDescription" + - "componentStatusDescriptor" - "machineId" - "status" properties: component: type: "string" - machineId: + componentStatusDescriptor: type: "string" - componentStatusDescription: + machineId: type: "string" status: type: "string" diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml similarity index 88% rename from ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml rename to ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml index 413ed7b..55b2950 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml @@ -47,7 +47,7 @@ - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io @@ -61,6 +61,15 @@ + + + + + application/json + + + + @@ -94,7 +103,7 @@ - + diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml.bak b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml.bak similarity index 88% rename from ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml.bak rename to ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml.bak index 413ed7b..55b2950 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/flow.xml.bak +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/flow.xml.bak @@ -47,7 +47,7 @@ - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io @@ -61,6 +61,15 @@ + + + + + application/json + + + + @@ -94,7 +103,7 @@ - + diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/node.ndf similarity index 87% rename from ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/node.ndf rename to ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/node.ndf index 962f6e3..235b187 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/fl38b55caf88995d476c5cb6/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/connectors/incident_POST_1/node.ndf @@ -22,6 +22,7 @@ body recref 0 + true true false false @@ -51,6 +52,7 @@ 0 APIKEY + NONE true false @@ -63,6 +65,7 @@ apiKey string 0 + true true false false @@ -91,7 +94,7 @@ field unknown - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io false host @@ -118,6 +121,23 @@ false false + + field + unknown + + application/json + + false + produces + string + 0 + + application/json + + true + false + false + true @@ -168,6 +188,7 @@ no 0 0 + servicemonitor.apis:MachineIncidentAPI none none 0 @@ -180,6 +201,7 @@ true + TRACE HEAD DELETE POST @@ -189,7 +211,7 @@ PATCH 0 - file://C:\Users\mihe\Downloads\MachineIncident_swagger.json + https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger true false diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/docTypes/body/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/docTypes/body/node.ndf index cdb765c..869f2d4 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/docTypes/body/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/apis/MachineIncidentAPI_/docTypes/body/node.ndf @@ -11,7 +11,7 @@ record 0 - file://C:\Users\mihe\Downloads\MachineIncident_swagger.json + https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger true @@ -36,7 +36,7 @@ field unknown false - machineId + componentStatusDescriptor string 0 @@ -50,7 +50,7 @@ field unknown false - componentStatusDescription + machineId string 0 @@ -78,7 +78,7 @@ - file://C:\Users\mihe\Downloads\MachineIncident_swagger.json + https://sagdemo.apigw-aw-us.webmethods.io/rest/apigateway/apis/dd0c3a7c-ff02-4f51-9f3f-f2e9bdd8d3b6?format=swagger false diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml index cd596c7..12cc9f8 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml @@ -5,7 +5,7 @@ - + @@ -31,6 +31,7 @@ body recref 0 + true true false false @@ -60,6 +61,7 @@ 0 APIKEY + NONE true false @@ -72,6 +74,7 @@ apiKey string 0 + true true false false @@ -100,7 +103,7 @@ field unknown - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io false host @@ -127,6 +130,23 @@ false false + + field + unknown + + application/json + + false + produces + string + 0 + + application/json + + true + false + false + true @@ -173,36 +193,25 @@ - - - - + - - - - + - APIKEY + fd61332d-c60c-44af-a375-43ad0ff93b5f field unknown - - APIKEY - false - type + apiKey string 0 - - APIKEY - + true true false false @@ -211,18 +220,25 @@ - + - 403e8511-3ea0-4557-89be-e94163299912 + APIKEY field unknown + + APIKEY + false - apiKey + type string 0 + + APIKEY + NONE + true false false @@ -230,120 +246,16 @@ + + + + + + - + - - - - - - - - - record - unknown - false - debugLogInput - record - 0 - true - false - false - - - field - unknown - false - message - string - 0 - true - true - false - false - - - field - unknown - false - function - string - 0 - true - true - false - false - - - field - unknown - false - level - string - 0 - true - - Fatal - Error - Warn - Info - Debug - Trace - Off - - true - false - false - - - true - - - - - - - - record - unknown - false - record - 0 - true - false - false - - - true - - - - - - - - - - - Test Debug statement - - field - unknown - false - message - string - 0 - true - true - false - false - - - - - diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml.bak b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml.bak index ef81acb..3d34520 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml.bak +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/services/machinestatus/invokeMachineIncidentAPI/flow.xml.bak @@ -1,10 +1,11 @@ + - + @@ -30,6 +31,7 @@ body recref 0 + true true false false @@ -59,6 +61,7 @@ 0 APIKEY + NONE true false @@ -71,6 +74,7 @@ apiKey string 0 + true true false false @@ -99,7 +103,7 @@ field unknown - beneluxint.gateway.webmethodscloud.com + sagdemo.apigw-aw-us.webmethods.io false host @@ -126,6 +130,23 @@ false false + + field + unknown + + application/json + + false + produces + string + 0 + + application/json + + true + false + false + true @@ -172,36 +193,25 @@ - - - - - - - + - + - APIKEY + fd61332d-c60c-44af-a375-43ad0ff93b5f field unknown - - APIKEY - false - type + apiKey string 0 - - APIKEY - + true true false false @@ -210,18 +220,25 @@ - + - 403e8511-3ea0-4557-89be-e94163299912 + APIKEY field unknown + + APIKEY + false - apiKey + type string 0 + + APIKEY + NONE + true false false @@ -229,6 +246,12 @@ + + + + + + diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/node.ndf index 6d8d54b..11e8ee1 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/node.ndf @@ -6,7 +6,7 @@ servicemonitor.websocket:MachineStatusStream ServiceMonitor false - ws://machine-status-api.193-26-203-31.nip.io/machine/status + ws://wsapi.daeipresal56817.eur.ad.sag/websocket/MachineStatusStream/1.0 Client servicemonitor.websocket.MachineStatusStream:onConnect diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onBinary/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onBinary/node.ndf index 1a2414a..78f3e33 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onBinary/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onBinary/node.ndf @@ -28,6 +28,7 @@ true + TRACE HEAD DELETE POST diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onClose/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onClose/node.ndf index 45e6769..db6bca0 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onClose/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onClose/node.ndf @@ -28,6 +28,7 @@ true + TRACE HEAD DELETE POST diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onConnect/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onConnect/node.ndf index 58575f1..a1630a5 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onConnect/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onConnect/node.ndf @@ -28,6 +28,7 @@ true + TRACE HEAD DELETE POST diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onError/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onError/node.ndf index b97c79d..13ca49d 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onError/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onError/node.ndf @@ -28,6 +28,7 @@ true + TRACE HEAD DELETE POST diff --git a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onText/node.ndf b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onText/node.ndf index 402177b..5c2c721 100644 --- a/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onText/node.ndf +++ b/ServiceMonitor/src/IS/ServiceMonitor/ns/servicemonitor/websocket/MachineStatusStream/onText/node.ndf @@ -35,11 +35,12 @@ 5 60 1 - + 300 false + TRACE HEAD DELETE POST diff --git a/src/wmIO/getAccountById.zip b/src/wmIO/getAccountById.zip new file mode 100644 index 0000000..2a907c5 Binary files /dev/null and b/src/wmIO/getAccountById.zip differ diff --git a/src/wmIO/getAllAccounts.zip b/src/wmIO/getAllAccounts.zip new file mode 100644 index 0000000..36483bf Binary files /dev/null and b/src/wmIO/getAllAccounts.zip differ