From b96507a77da860685cacede2b9b77b311bcd4ef7 Mon Sep 17 00:00:00 2001
From: Yohan Avishke <yaediriweera@gmail.com>
Date: Wed, 26 Feb 2020 15:42:52 +0530
Subject: [PATCH 1/2] Add IOS agent's bundle id to iot-server.sh

---
 modules/distribution/src/core/bin/iot-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/src/core/bin/iot-server.sh
index 03c1f31a..b464f195 100755
--- a/modules/distribution/src/core/bin/iot-server.sh
+++ b/modules/distribution/src/core/bin/iot-server.sh
@@ -337,6 +337,7 @@ do
     -Diot.apimstore.https.port="9443" \
     -Dmqtt.broker.https.port="9446" \
     -Denable-api-scopes-sharing="true" \
+    -Dagent-bundle="org.wso2.carbon.emm.mdmagent" \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
 done

From dfe3b9019ddcef1baaf7cf3239ff08c74fb19b78 Mon Sep 17 00:00:00 2001
From: Charitha Goonetilleke <charitha@entgra.io>
Date: Tue, 3 Mar 2020 03:41:35 +0000
Subject: [PATCH 2/2] Add Health Check API

---
 modules/p2-profile/iot-core-profile/pom.xml | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 8ea7959e..5b32a874 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -184,6 +184,9 @@
 								<featureArtifactDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
 								</featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:io.entgra.health.check.api.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- End of Device Management Plugin Features -->
 
                                 <!-- IoT Device Management Features -->
@@ -974,10 +977,14 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
-									<version>${carbon.device.mgt.plugin.version}</version>
-								</feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>io.entgra.health.check.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -1975,6 +1982,10 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
+                                <feature>
+                                    <id>io.entgra.health.check.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -2586,6 +2597,10 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
+                                <feature>
+                                    <id>io.entgra.health.check.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <feature>