Add appInsights related settings. (#55)

Fix merge related issue.
microsoft · Apr 7, 2019 · a5757d2 · a5757d2
1 parent d1c13e2
commit a5757d2
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 5 deletions.
diff --git a/deployment/az_cmd_createInventoryEventHubs_southeastasia.sh b/deployment/az_cmd_createInventoryEventHubs_southeastasia.sh
@@ -5,11 +5,11 @@ echo "Using ""$INVENTORY_HUB_APP_NAME"" as a prefix for the names of the resourc
 
 # EventHub in "southeastasia"
 az group create --name "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --location "southeastasia"
-az group deployment create --name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia-td1" --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --template-file createInventoryEventHub.json --parameters namespace_name="$INVENTORY_HUB_APP_NAME""-eventhub-k-southeastasia" region_name="southeastasia"
+az group deployment create --name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia-td1" --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --template-file createInventoryEventHub.json --parameters namespace_name="$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia" region_name="southeastasia"
 
 # list authorization rule keys and connection strings
-az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-k-southeastasia" --eventhub-name "eventhub-for-notifications" --name "intakeEvents"
-az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-k-southeastasia" --eventhub-name "eventhub-for-notifications" --name "dispatchEvents"
-az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-k-southeastasia" --eventhub-name "eventhub-for-transactions" --name "intakeEvents"
-az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-k-southeastasia" --eventhub-name "eventhub-for-transactions" --name "dispatchEvents"
+az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia" --eventhub-name "eventhub-for-notifications" --name "intakeEvents"
+az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia" --eventhub-name "eventhub-for-notifications" --name "dispatchEvents"
+az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia" --eventhub-name "eventhub-for-transactions" --name "intakeEvents"
+az eventhubs eventhub authorization-rule keys list --resource-group "$INVENTORY_HUB_APP_NAME""-southeastasia-dev" --namespace-name "$INVENTORY_HUB_APP_NAME""-eventhub-southeastasia" --eventhub-name "eventhub-for-transactions" --name "dispatchEvents"
 
diff --git a/function-apps/Append-Transaction/pom.xml b/function-apps/Append-Transaction/pom.xml
@@ -61,6 +61,11 @@
             <artifactId>azure-eventhubs</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-function-adapter-azure</artifactId>
+            <version>2.0.0.BUILD-SNAPSHOT</version>
+        </dependency>
 
         <!-- Test -->
         <dependency>
@@ -99,6 +104,17 @@
                     <artifactId>azure-functions-maven-plugin</artifactId>
                     <version>1.3.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <mainClass>org.inventory.hub.FunctionApplication</mainClass>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -132,6 +148,10 @@
                     <appName>${functionAppName}</appName>
                     <region>${functionAppRegion}</region>
                     <appSettings>
+                        <property>
+                            <name>APPINSIGHTS_INSTRUMENTATIONKEY</name>
+                            <value>${APPINSIGHTS_INSTRUMENTATIONKEY}</value>
+                        </property>
                         <property>
                             <name>FUNCTIONS_EXTENSION_VERSION</name>
                             <value>~2</value>
@@ -234,4 +254,23 @@
             </plugin>
         </plugins>
     </build>
+
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/function-apps/Notify-Inventory/pom.xml b/function-apps/Notify-Inventory/pom.xml
@@ -132,6 +132,10 @@
                     <appName>${functionAppName}</appName>
                     <region>${functionAppRegion}</region>
                     <appSettings>
+                        <property>
+                            <name>APPINSIGHTS_INSTRUMENTATIONKEY</name>
+                            <value>${APPINSIGHTS_INSTRUMENTATIONKEY}</value>
+                        </property>
                         <property>
                             <name>FUNCTIONS_EXTENSION_VERSION</name>
                             <value>~2</value>

diff --git a/function-apps/Point-Of-Transaction/pom.xml b/function-apps/Point-Of-Transaction/pom.xml
@@ -137,6 +137,10 @@
                     <appName>${functionAppName}</appName>
                     <region>${functionAppRegion}</region>
                     <appSettings>
+                        <property>
+                            <name>APPINSIGHTS_INSTRUMENTATIONKEY</name>
+                            <value>${APPINSIGHTS_INSTRUMENTATIONKEY}</value>
+                        </property>
                         <property>
                             <name>FUNCTIONS_EXTENSION_VERSION</name>
                             <value>~2</value>

diff --git a/function-apps/Update-Product-Inventory/pom.xml b/function-apps/Update-Product-Inventory/pom.xml
@@ -137,6 +137,10 @@
                     <appName>${functionAppName}</appName>
                     <region>${functionAppRegion}</region>
                     <appSettings>
+                        <property>
+                            <name>APPINSIGHTS_INSTRUMENTATIONKEY</name>
+                            <value>${APPINSIGHTS_INSTRUMENTATIONKEY}</value>
+                        </property>
                         <property>
                             <name>FUNCTIONS_EXTENSION_VERSION</name>
                             <value>~2</value>