Merge pull request #43 from VimukthiPerera/master

Merge 4.2.x branch to master branch

docker-compose/editor-worker-dashboard/README.md

@@ -6,11 +6,10 @@ Runs a pre configured Stream Processor setup with Stream Processor editor, worke
 
  * Install [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [Docker](https://www.docker.com/get-docker) and [Docker Compose](https://docs.docker.com/compose/install/#install-compose)
    in order to run the steps provided in following Quick start guide. <br><br>
-  * In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription) 
-   from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 Stream Processor. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
+  * In order to run this Docker Compose setup, you will need an active subscription from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 Stream Processor. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
  * If you wish to run the Docker Compose configuration using Docker images built locally, build the Stream Processor editor, worker and 
    dashboard images using [SP Dockerfiles](../../dockerfiles/README.md) and remove the `docker.wso2.com/` prefix 
-   from the `image` name In the `docker-compose.yml`. For example, change the line `image: docker.wso2.com/wso2sp-manager:4.1.0` <br> to `image: wso2sp-manager:4.1.0`. <br><br>
+   from the `image` name In the `docker-compose.yml`. For example, change the line `image: docker.wso2.com/wso2sp-manager:4.2.0` <br> to `image: wso2sp-manager:4.2.0`. <br><br>
 
 ## How to deploy
 
@@ -28,7 +27,7 @@ Runs a pre configured Stream Processor setup with Stream Processor editor, worke
       Instead, extract the zip file and directly browse to `docker-sp-<released-version-here>docker-compose/editor-worker-dashboard` folder. 
      
      > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
-      i.e. for example: git checkout tags/v4.1.0.1 and continue below steps.
+      i.e. for example: git checkout tags/v4.2.0.1 and continue below steps.
 
   3. Execute the following Docker Compose command to start the deployment.
      ```
@@ -37,7 +36,7 @@ Runs a pre configured Stream Processor setup with Stream Processor editor, worke
 
   4. Access management console via a web browser.
      ```
-     For Status dashboard - https://localhost:9390/monitoring
-     For Editor - https://localhost:9743/editor
+     For Status dashboard - https://localhost:9643/monitoring
+     For Editor - http://localhost:9390/editor
      ```
 

docker-compose/editor-worker-dashboard/dashboard/deployment.yaml

@@ -315,6 +315,56 @@ wso2.datasources:
         connectionTestQuery: SELECT 1
         validationTimeout: 30000
         isAutoCommit: false
+  - name: HTTP_ANALYTICS_DB
+    description: The datasource used for HTTP Analytics dashboard
+    jndiConfig:
+      name: jdbc/HTTP_ANALYTICS_DB
+      useJndiReference: false
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
+        username: wso2carbon
+        password: wso2carbon
+        driverClassName: org.h2.Driver
+        maxPoolSize: 50
+        idleTimeout: 60000
+        connectionTestQuery: SELECT 1
+        validationTimeout: 30000
+        isAutoCommit: false
+  - name: Twitter_Analytics
+    description: The datasource used for Twitter Analytics dashboard
+    jndiConfig:
+      name: jdbc/Twitter_Analytics
+      useJndiReference: false
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
+        username: wso2carbon
+        password: wso2carbon
+        driverClassName: org.h2.Driver
+        maxPoolSize: 50
+        idleTimeout: 60000
+        connectionTestQuery: SELECT 1
+        validationTimeout: 30000
+        isAutoCommit: false
+  - name: Activity_Explorer_DB
+    description: "The datasource used for activity explorer to store span information."
+    jndiConfig:
+      name: jdbc/Activity_Explorer_DB
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/ACTIVITY_EXPLORER_DB;AUTO_SERVER=TRUE'
+        username: wso2carbon
+        password: wso2carbon
+        driverClassName: org.h2.Driver
+        maxPoolSize: 50
+        idleTimeout: 60000
+        connectionTestQuery: SELECT 1
+        validationTimeout: 30000
+        isAutoCommit: false
 
 wso2.business.rules.manager:
   datasource: BUSINESS_RULES_DB
@@ -328,6 +378,10 @@ wso2.business.rules.manager:
        - stock-exchange-input
        - stock-exchange-output
        - identifying-continuous-production-decrease
+       - popular-tweets-analysis
+       - http-analytics-processing
+       - activity-explorer-app-template
+       - activity-explorer-source-template
   # credentials for worker nodes
   username: admin
   password: admin

docker-compose/editor-worker-dashboard/docker-compose.yml

@@ -15,17 +15,18 @@ services:
       timeout: 60s
       retries: 5
   editor:
-    image: docker.wso2.com/wso2sp-editor:4.1.0
+    image: docker.wso2.com/wso2sp-editor:4.2.0
     container_name: wso2sp-editor
     ports:
       - "9743:9743"
+      - "9390:9390"
     healthcheck:
       test: ["CMD", "nc", "-z","localhost", "9743"]
       interval: 10s
       timeout: 120s
       retries: 5
   worker:
-    image: docker.wso2.com/wso2sp-worker:4.1.0
+    image: docker.wso2.com/wso2sp-worker:4.2.0
     container_name: wso2sp-worker
     ports:
       - "9090:9090"
@@ -35,14 +36,14 @@ services:
       timeout: 120s
       retries: 5
     volumes:
-       - ./worker:/home/wso2carbon/volumes/conf/worker
+       - ./worker:/home/wso2carbon/wso2-server-volume/conf/worker
     depends_on:
           mysql:
             condition: service_healthy
     links:
       - mysql
   dashboard:
-    image: docker.wso2.com/wso2sp-dashboard:4.1.0
+    image: docker.wso2.com/wso2sp-dashboard:4.2.0
     container_name: wso2sp-dashboard
     ports:
       - "9643:9643"
@@ -55,4 +56,4 @@ services:
       worker:
         condition: service_healthy
     volumes:
-      - ./dashboard:/home/wso2carbon/volumes/conf/dashboard
+      - ./dashboard:/home/wso2carbon/wso2-server-volume/conf/dashboard

docker-compose/editor-worker-dashboard/worker/deployment.yaml

@@ -347,6 +347,57 @@ wso2.datasources:
           validationTimeout: 30000
           isAutoCommit: false
 
+    - name: HTTP_ANALYTICS_DB
+      description: The datasource used for HTTP Analytics dashboard
+      jndiConfig:
+        name: jdbc/HTTP_ANALYTICS_DB
+        useJndiReference: false
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          connectionTestQuery: SELECT 1
+          validationTimeout: 30000
+          isAutoCommit: false
+    - name: Twitter_Analytics
+      description: The datasource used for Twitter Analytics dashboard
+      jndiConfig:
+        name: jdbc/Twitter_Analytics
+        useJndiReference: false
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          connectionTestQuery: SELECT 1
+          validationTimeout: 30000
+          isAutoCommit: false
+
+    - name: Activity_Explorer_DB
+      description: "The datasource used for activity explorer to store span information."
+      jndiConfig:
+        name: jdbc/Activity_Explorer_DB
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/ACTIVITY_EXPLORER_DB;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          connectionTestQuery: SELECT 1
+          validationTimeout: 30000
+          isAutoCommit: false
 
   # Cluster Configuration
 cluster.config:

docker-compose/sp-distributed/README.md

@@ -6,11 +6,11 @@
 
  * Install [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [Docker](https://www.docker.com/get-docker) and [Docker Compose](https://docs.docker.com/compose/install/#install-compose)
    in order to run the steps provided in following Quick start guide. <br><br>
-  * In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription) 
+  * In order to run this Docker Compose setup, you will need an active [Free Trial Subscription](https://wso2.com/free-trial-subscription)
    from WSO2 since the referring Docker images hosted at docker.wso2.com contains the latest updates and fixes for WSO2 Stream Processor. You can sign up for a Free Trial Subscription [here](https://wso2.com/free-trial-subscription). <br><br>
- * If you wish to run the Docker Compose configuration using Docker images built locally, build the Stream Processor manager and worker 
-   images using [SP Dockerfiles](../../dockerfiles/README.md) and remove the `docker.wso2.com/` prefix 
-   from the `image` name In the `docker-compose.yml`. For example, change the line `image: docker.wso2.com/wso2sp-manager:4.1.0` <br> to `image: wso2sp-manager:4.1.0`. <br><br>
+ * If you wish to run the Docker Compose configuration using Docker images built locally, build the Stream Processor manager and worker
+   images using [SP Dockerfiles](../../dockerfiles/README.md) and remove the `docker.wso2.com/` prefix
+   from the `image` name In the `docker-compose.yml`. For example, change the line `image: docker.wso2.com/wso2sp-manager:4.2.0` <br> to `image: wso2sp-manager:4.2.0`. <br><br>
 
 ## How to deploy
 
@@ -24,26 +24,24 @@
      ```
      cd [docker-sp]/docker-compose/sp-distributed
      ```
-     > If you are to try out an already released zip of this repo, please ignore this 2nd step also. 
-      Instead, extract the zip file and directly browse to `docker-sp-<released-version-here>docker-compose/sp-distributed` folder. 
-     
-     > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
-      i.e. for example: git checkout tags/v4.1.0.1 and continue below steps.
+     > If you are to try out an already released zip of this repo, please ignore this 2nd step also.
+      Instead, extract the zip file and directly browse to `docker-sp-<released-version-here>docker-compose/sp-distributed` folder.
+
+     > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag,
+      i.e. for example: git checkout tags/v4.2.0.1 and continue below steps.
 
   3. Execute the following Docker Compose command to start the deployment.
      ```
      docker-compose up
      ```
   4. Siddhi applications should be deployed to the manager cluster using following method.
-  
-  Sending a "POST" request to http://<host>:<port>/siddhi-apps, with the Siddhi App attached as a file in the request as shown in the example below. 
-  Refer [Stream Processor REST API Guide](https://docs.wso2.com/display/SP410/Stream+Processor+REST+API+Guide) for more information on using WSO2 Strean Processor APIs.
-  
+
+  Sending a "POST" request to http://<host>:<port>/siddhi-apps, with the Siddhi App attached as a file in the request as shown in the example below.
+  Refer [Stream Processor REST API Guide](https://docs.wso2.com/display/SP420/Stream+Processor+REST+API+Guide) for more information on using WSO2 Strean Processor APIs.
+
   Manager nodes are deployed under,
        ```
-       Manager 1 - https://localhost:9190/
-       Manager 2 - https://localhost:9191/
+       Manager 1 - https://localhost:9543/
+       Manager 2 - https://localhost:9544/
        ```
- > Refer [Stream Processor Fully Distributed Deployment](https://docs.wso2.com/display/SP410/Fully+Distributed+Deployment)   
-     
-
+ > Refer [Stream Processor Fully Distributed Deployment](https://docs.wso2.com/display/SP420/Fully+Distributed+Deployment)   

docker-compose/sp-distributed/docker-compose.yml

@@ -42,6 +42,7 @@ services:
       MYSQL_ROOT_PASSWORD: root
     volumes:
       - ./mysql/scripts:/docker-entrypoint-initdb.d
+    command: --max-connections=10000
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-uroot", "-proot"]
       interval: 30s
@@ -51,17 +52,17 @@ services:
       kafka:
         condition: service_healthy
   manager1:
-    image: docker.wso2.com/wso2sp-manager:4.1.0
+    image: docker.wso2.com/wso2sp-manager:4.2.0
     container_name: wso2sp-manager-1
     ports:
-      - "9190:9190"
+      - "9543:9543"
     healthcheck:
-      test: ["CMD", "nc", "-z","localhost", "9190"]
+      test: ["CMD", "nc", "-z","localhost", "9543"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-      - ./manager:/home/wso2carbon/volumes/conf/manager
+      - ./manager:/home/wso2carbon/wso2-server-volume/conf/manager
     depends_on:
       mysql:
         condition: service_healthy
@@ -71,17 +72,17 @@ services:
     links:
       - mysql
   manager2:
-    image: docker.wso2.com/wso2sp-manager:4.1.0
+    image: docker.wso2.com/wso2sp-manager:4.2.0
     container_name: wso2sp-manager-2
     ports:
-      - "9191:9190"
+      - "9544:9543"
     healthcheck:
-      test: ["CMD", "nc", "-z","localhost", "9191"]
+      test: ["CMD", "nc", "-z","localhost", "9543"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-      - ./manager:/home/wso2carbon/volumes/conf/manager
+      - ./manager:/home/wso2carbon/wso2-server-volume/conf/manager
     depends_on:
       manager1:
         condition: service_healthy
@@ -91,17 +92,17 @@ services:
     links:
       - manager1
   worker1:
-    image: docker.wso2.com/wso2sp-worker:4.1.0
+    image: docker.wso2.com/wso2sp-worker:4.2.0
     container_name: wso2sp-worker-1
     ports:
-      - "9001:9090"
+      - "9001:9443"
     healthcheck:
-      test: ["CMD", "nc", "-z","localhost", "9090"]
+      test: ["CMD", "nc", "-z","localhost", "9001"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-       - ./worker:/home/wso2carbon/volumes/conf/worker
+       - ./worker:/home/wso2carbon/wso2-server-volume/conf/worker
     depends_on:
       manager1:
         condition: service_healthy
@@ -112,17 +113,17 @@ services:
     links:
       - manager1
   worker2:
-    image: docker.wso2.com/wso2sp-worker:4.1.0
+    image: docker.wso2.com/wso2sp-worker:4.2.0
     container_name: wso2sp-worker-2
     ports:
-      - "9002:9090"
+      - "9002:9443"
     healthcheck:
       test: ["CMD", "nc", "-z","localhost", "9002"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-       - ./worker:/home/wso2carbon/volumes/conf/worker
+       - ./worker:/home/wso2carbon/wso2-server-volume/conf/worker
     depends_on:
       manager1:
         condition: service_healthy
@@ -133,17 +134,17 @@ services:
     links:
       - manager1
   worker3:
-    image: docker.wso2.com/wso2sp-worker:4.1.0
+    image: docker.wso2.com/wso2sp-worker:4.2.0
     container_name: wso2sp-worker-3
     ports:
-      - "9003:9090"
+      - "9003:9443"
     healthcheck:
       test: ["CMD", "nc", "-z","localhost", "9003"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-       - ./worker:/home/wso2carbon/volumes/conf/worker
+       - ./worker:/home/wso2carbon/wso2-server-volume/conf/worker
     depends_on:
       manager1:
         condition: service_healthy
@@ -154,17 +155,17 @@ services:
     links:
       - manager1
   worker4:
-    image: docker.wso2.com/wso2sp-worker:4.1.0
+    image: docker.wso2.com/wso2sp-worker:4.2.0
     container_name: wso2sp-worker-4
     ports:
-      - "9004:9090"
+      - "9004:9443"
     healthcheck:
       test: ["CMD", "nc", "-z","localhost", "9004"]
       interval: 10s
       timeout: 120s
       retries: 5
     volumes:
-       - ./worker:/home/wso2carbon/volumes/conf/worker
+       - ./worker:/home/wso2carbon/wso2-server-volume/conf/worker
     depends_on:
       manager1:
         condition: service_healthy