Merge pull request #15 from OriolBonjoch/master

Removed notes, fixed footer gap and hide Twitter if not configured

Deploy/helm/game-api/templates/NOTES.txt

@@ -1,19 +1,6 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tlsEnabled }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+  http{{ if $.Values.ingress.tlsEnabled }}s{{ end }}://{{ . }}{{ $.Values.inf.ingress.game.path }}
 {{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "rpsls-game.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "rpsls-game.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "rpsls-game.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "rpsls-game.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
 {{- end }}

Deploy/helm/java-player/templates/configmap.yaml

@@ -11,5 +11,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  APPLICATION_INSIGHTS_IKEY:  {{ .Values.inf.appinsights.id }}
+  APPLICATION_INSIGHTS_IKEY: {{ .Values.inf.appinsights.id }}
+  APPLICATION_INSIGHTS_ENABLED: {{ if .Values.inf.appinsights.id }}'true'{{ else }}'false'{{ end }}
   PREDICTOR_URL: {{ .Values.inf.apiurls.predictor }}

Deploy/helm/web/templates/NOTES.txt

@@ -1,19 +1,9 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tlsEnabled }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+  http{{ if $.Values.ingress.tlsEnabled }}s{{ end }}://{{ . }}{{ $.Values.inf.ingress.web.path }}
+{{- if $.Values.uploaderEnabled }}
+  http{{ if $.Values.ingress.tlsEnabled }}s{{ end }}://{{ . }}{{ $.Values.inf.ingress.web.uploaderPath }}
+{{- end }}
 {{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "rpsls-web.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "rpsls-web.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "rpsls-web.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "rpsls-web.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
 {{- end }}

Deploy/powershell/gvalues.template

@@ -6,16 +6,6 @@ inf:
   googleanalytics:
     id: {{googleanalyticsid}}
   ingress:
-    dotnet:
-      path: /dotnet-player
-    node:
-      path: /node-player
-    python:
-      path: /python-player
-    php:
-      path: /php-player
-    java:
-      path: /java-player
     game:
       path: /game-manager
     web:

Deploy/powershell/gvalues.template.gh

@@ -6,16 +6,6 @@ inf:
   googleanalytics:
     id: {{googleanalyticsid}}
   ingress:
-    dotnet:
-      path: /dotnet-player
-    node:
-      path: /node-player
-    python:
-      path: /python-player
-    php:
-      path: /php-player
-    java:
-      path: /java-player
     game:
       path: /game-manager
     web:

Source/Services/RPSLS.DotNetPlayer.Api/RPSLS.DotNetPlayer.Api.csproj

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.8.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.4.10" />
   </ItemGroup>
 

Source/Services/RPSLS.DotNetPlayer.Api/Startup.cs

@@ -7,9 +7,6 @@
 using RPSLS.DotNetPlayer.Api.Settings;
 using RPSLS.DotNetPlayer.API.Services;
 using RPSLS.DotNetPlayer.API.Settings;
-using RPSLS.DotNetPlayer.API.Strategies;
-using System;
-using System.Net.Http;
 
 namespace RPSLS.DotNetPlayer.API
 {
@@ -27,6 +24,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.Configure<StrategySettings>(Configuration);
             services.Configure<PredictorSettings>(Configuration);
+            services.AddApplicationInsightsTelemetry();
             services.AddControllers();
             services.AddHealthChecks();
             services.AddHttpClient("Predictor");

Source/Services/RPSLS.JavaPlayer.Api/pom.xml

@@ -39,7 +39,12 @@
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>			
-		</dependencies>
+		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>applicationinsights-spring-boot-starter</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+	</dependencies>
 
 	<build>
 		<plugins>

Source/Services/RPSLS.JavaPlayer.Api/src/main/resources/application.properties

@@ -1,2 +1,4 @@
 rpsls.player.pick.strategy=${PICK_STRATEGY:random}
-rpsls.predictor.pick.url=${PREDICTOR_URL:}
+rpsls.predictor.pick.url=${PREDICTOR_URL:}
+azure.application-insights.instrumentation-key=${APPLICATION_INSIGHTS_IKEY:00000000-0000-0000-0000-000000000000}
+azure.application-insights.enabled=${APPLICATION_INSIGHTS_ENABLED:false}

Source/Services/RPSLS.ModelUploader.Web/Startup.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;

Source/Services/RPSLS.NodePlayer.Api/index.js

@@ -1,9 +1,17 @@
 const express = require('express');
 const cors = require('cors');
-require('dotenv').config();
+const appInsights = require("applicationinsights");
 
 const routes = require('./api/routes/index.route');
 
+require('dotenv').config();
+
+// Start application insights
+const applicationInsightsIK = process.env.APPLICATION_INSIGHTS_IKEY;
+if (applicationInsightsIK) {
+  appInsights.setup(applicationInsightsIK).start();
+}
+
 const app = express();
 
 // Application-Level Middleware