Update analytics components

wso2 · Aug 28, 2018 · 178adbf · 178adbf
1 parent 6621178
commit 178adbf
Show file tree

Hide file tree

Showing 8 changed files with 628 additions and 399 deletions.
diff --git a/modules/distribution/carbon-home/conf/dashboard/deployment.yaml b/modules/distribution/carbon-home/conf/dashboard/deployment.yaml
@@ -365,6 +365,59 @@ wso2.datasources:
         connectionTestQuery: SELECT 1
         validationTimeout: 30000
         isAutoCommit: false
+
+  - name: IS_ANALYTICS_DB
+    description: "The data source used for WSO2 IS Analytics statistics"
+    jndiConfig:
+      name: jdbc/IS_ANALYTICS_DB
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE'
+        username: wso2carbon
+        password: wso2carbon
+        driverClassName: org.h2.Driver
+        maxPoolSize: 50
+        idleTimeout: 60000
+        validationTimeout: 30000
+        isAutoCommit: false
+
+
+  - name: EI_ANALYTICS
+    description: "The datasource used for EI Analytics dashboard feature"
+    jndiConfig:
+      name: jdbc/EI_ANALYTICS
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/EI_ANALYTICS;AUTO_SERVER=TRUE'
+        username: wso2carbon
+        password: wso2carbon
+        driverClassName: org.h2.Driver
+        maxPoolSize: 50
+        idleTimeout: 60000
+        connectionTestQuery: SELECT 1
+        validationTimeout: 30000
+        isAutoCommit: false
+
+  #Data source for APIM Analytics
+  - name: APIM_ANALYTICS_DB
+    description: Datasource used for APIM Analytics
+    jndiConfig:
+      name: jdbc/APIM_ANALYTICS_DB
+    definition:
+      type: RDBMS
+      configuration:
+        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/../tmpStatDB/WSO2AM_STATS_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

diff --git a/modules/distribution/carbon-home/conf/worker/deployment.yaml b/modules/distribution/carbon-home/conf/worker/deployment.yaml
@@ -41,11 +41,11 @@ wso2.transport.http:
     -
       id: "default"
       host: "0.0.0.0"
-      port: 9090
+      port: 9091
     -
       id: "msf4j-https"
       host: "0.0.0.0"
-      port: 9443
+      port: 9444
       scheme: https
       keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks"
       keyStorePassword: wso2carbon
@@ -399,6 +399,55 @@ wso2.datasources:
           validationTimeout: 30000
           isAutoCommit: false
 
+    - name: EI_ANALYTICS
+      description: "The datasource used for EI Analytics dashboard feature"
+      jndiConfig:
+        name: jdbc/EI_ANALYTICS
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/EI_ANALYTICS;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          validationTimeout: 30000
+          isAutoCommit: false
+
+
+    - name: IS_ANALYTICS_DB
+      description: "The data source used for WSO2 IS Analytics statistics"
+      jndiConfig:
+        name: jdbc/IS_ANALYTICS_DB
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          validationTimeout: 30000
+          isAutoCommit: false
+
+    - name: GEO_LOCATION_DATA
+      description: "The data source used for geo location database"
+      jndiConfig:
+        name: jdbc/GEO_LOCATION_DATA
+      definition:
+        type: RDBMS
+        configuration:
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE'
+          username: wso2carbon
+          password: wso2carbon
+          driverClassName: org.h2.Driver
+          maxPoolSize: 50
+          idleTimeout: 60000
+          validationTimeout: 30000
+          isAutoCommit: false
+
     - name: APIM_ANALYTICS_DB
       description: "The datasource used for APIM statistics aggregated data."
       jndiConfig:
@@ -433,6 +482,29 @@ wso2.datasources:
           validationTimeout: 30000
           isAutoCommit: false
 
+siddhi:
+  extensions:
+    -
+      extension:
+        name: 'findCountryFromIP'
+        namespace: 'geo'
+        properties:
+          geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver
+          isCacheEnabled: true
+          cacheSize: 10000
+          isPersistInDatabase: true
+          datasource: GEO_LOCATION_DATA
+    -
+      extension:
+        name: 'findCityFromIP'
+        namespace: 'geo'
+        properties:
+          geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver
+          isCacheEnabled: true
+          cacheSize: 10000
+          isPersistInDatabase: true
+          datasource: GEO_LOCATION_DATA
+
   # Cluster Configuration
 cluster.config:
   enabled: false