community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1456 from charithag/add-emm-analytics

Browse Source 
Add emm analytics
merge-requests/1/head
Madhawa Perera 7 years ago committed by GitHub
parent e65536cf51 799b634a0d
commit ffbf27fb10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 136 additions and 7 deletions
Show Stats Download Patch File Download Diff File

5
modules/distribution/pom.xml
Unescape View File

@ -292,6 +292,11 @@
<output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml</output> <output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml</output>
<config>src/analytics/conf/datasource_config_change.xml</config> <config>src/analytics/conf/datasource_config_change.xml</config>
</transformation> </transformation>
<transformation>
<input>${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</input>
<output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</output>
<config>src/analytics/conf/cdm_config_change.xml</config>
</transformation>
</transformations> </transformations>
</configuration> </configuration>
</execution> </execution>

12
modules/distribution/src/analytics/conf/cdm_config_change.xml
Unescape View File

@ -0,0 +1,12 @@
<processor>
<!-- Remove current PushNotificationProviders config -->
<remove>
<name>//DeviceMgtConfiguration/PushNotificationConfiguration/PushNotificationProviders</name>
</remove>
<!-- Add modified Carbon db and UM db config -->
<add>
<inside>//DeviceMgtConfiguration/PushNotificationConfiguration</inside>
<file>src/analytics/conf/push_notification_config.xml</file>
</add>
</processor>

45
modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml
Unescape View File

@ -0,0 +1,45 @@
<!--
~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
<providers>
<provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
</providers>
<datasources>
<datasource>
<name>DM_DS</name>
<description>The datasource used for CDM</description>
<jndiConfig>
<name>jdbc/DM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:../../repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
</datasources>
</datasources-configuration>

16
modules/distribution/src/analytics/conf/output-adapter-change.xml
Unescape View File

@ -2,7 +2,21 @@
<!-- Add outpu event adapter config element --> <!-- Add outpu event adapter config element -->
<add> <add>
<after>/outputEventAdaptersConfig/adapterConfig[@type="websocket"]</after> <after>/outputEventAdaptersConfig/adapterConfig[@type="websocket"]</after>
<value><![CDATA[<adapterConfig type="oauth-mqtt"> <value><![CDATA[<adapterConfig type="oauth-http">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
</adapterConfig>
<adapterConfig type="oauth-mqtt">
<!-- Thread Pool Related Properties --> <!-- Thread Pool Related Properties -->
<property key="minThread">8</property> <property key="minThread">8</property>
<property key="maxThread">100</property> <property key="maxThread">100</property>

5
modules/distribution/src/analytics/conf/push_notification_config.xml
Unescape View File

@ -0,0 +1,5 @@
<config>
<PushNotificationProviders>
</PushNotificationProviders>
</config>

14
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -711,6 +711,13 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>
src/analytics/conf/datasources
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/datasources</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory> <directory>
src/analytics/conf/analytics/spark src/analytics/conf/analytics/spark
@ -1226,6 +1233,13 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>src/core/conf/etc/device-analytics-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/etc</outputDirectory>
<destName>device-analytics-config.xml</destName>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!-- Copying synapse-handlers.xml file --> <!-- Copying synapse-handlers.xml file -->
<file> <file>
<source>src/core/conf/synapse-handlers.xml</source> <source>src/core/conf/synapse-handlers.xml</source>

2
modules/distribution/src/core/conf/datasources/cdm-datasources.xml
Unescape View File

@ -29,7 +29,7 @@
</jndiConfig> </jndiConfig>
<definition type="RDBMS"> <definition type="RDBMS">
<configuration> <configuration>
<url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url> <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username> <username>wso2carbon</username>
<password>wso2carbon</password> <password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName> <driverClassName>org.h2.Driver</driverClassName>

36
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -94,6 +94,15 @@
<publishArtifacts>true</publishArtifacts> <publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.basics.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
</featureArtifactDef>
<!-- START - Analytics Features --> <!-- START - Analytics Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version}
@ -388,6 +397,12 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
@ -443,6 +458,18 @@
</destination> </destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<feature>
<id>org.wso2.carbon.device.mgt.basics.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.apache.axis2.transport.mail.feature.group</id>
<version>${axis2-transports.wso2.version}</version>
</feature>
<!-- START - Analytics Features --> <!-- START - Analytics Features -->
<feature> <feature>
<id>org.wso2.carbon.analytics.core.feature.group</id> <id>org.wso2.carbon.analytics.core.feature.group</id>
@ -826,13 +853,20 @@
<id>org.wso2.extension.siddhi.execution.json.feature.group</id> <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.extension.siddhi.devicegroup.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!--android sense analytics feature--> <!--android sense analytics feature-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- GPL Siddhi Extension Script for Geo Fencing --> <!-- GPL Siddhi Extension Script for Geo Fencing -->
<feature> <feature>
<id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id> <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>

2
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -1621,12 +1621,12 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- End of Geo Dashboard Feature -->
<!--MQTT Dashboard Feature-->
<feature> <feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id> <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
</features> </features>
<!--MQTT Dashboard Feature-->
</configuration> </configuration>
</execution> </execution>

Write Preview
Loading…
Cancel
Save