fixes

Author: saturnism

examples-bootiful-gcp/guestbook-service/pom.xml

@@ -50,6 +50,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-gcp-starter-trace</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples-bootiful-gcp/guestbook-service/src/main/resources/application.yaml

@@ -20,3 +20,8 @@ spring:
   sleuth:
     sampler:
       probability: 1.0
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health,prometheus

examples-bootiful-gcp/helloworld-service/pom.xml

@@ -42,6 +42,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-gcp-starter-trace</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples-bootiful-gcp/helloworld-service/src/main/resources/application.properties

@@ -1,3 +1,4 @@
 greeting=Hello $name from $hostname with $version
 spring.application.name=helloworld-service
 spring.sleuth.sampler.probability=1.0
+management.endpoints.web.exposure.include=health,prometheus

examples-bootiful-gcp/helloworld-ui/pom.xml

@@ -41,6 +41,10 @@
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.lettuce</groupId>
+			<artifactId>lettuce-core</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -50,6 +54,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-gcp-starter-trace</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples-bootiful-gcp/helloworld-ui/src/main/java/com/example/guestbook/ApplicationConfig.java

@@ -34,53 +34,25 @@
  * Created by rayt on 5/1/17.
  */
 @Configuration
-@EnableRedisHttpSession
 public class ApplicationConfig {
-  @Value("#{systemEnvironment['HELLOWORLDSERVICE_PORT']}")
+  @Value("${helloworldservice.endpoint:http://localhost:8081}/hello")
   private String helloworldServiceEndpoint;
 
-  @Value("#{systemEnvironment['GUESTBOOKSERVICE_PORT']}")
+  @Value("${guestbookservice.endpoint:http://localhost:8082}/api/messages")
   private String guestbookServiceEndpoint;
 
-  @Value("#{systemEnvironment['REDIS_PORT']}")
-  private String redisEndpoint;
-
   @Bean
   RestTemplate restTemplate() {
     return new RestTemplate();
   }
 
   @Bean
   HelloworldService helloworldService(RestTemplate restTemplate) {
-    String endpoint = helloworldServiceEndpoint.trim().replace("tcp:", "http:") + "/hello";
-    return new HelloworldService(restTemplate, endpoint);
+    return new HelloworldService(restTemplate, helloworldServiceEndpoint);
   }
 
   @Bean
   GuestbookService guestbookService(RestTemplate restTemplate) {
-    String endpoint = guestbookServiceEndpoint.trim().replace("tcp:", "http:") + "/api/messages";
-    return new GuestbookService(restTemplate, endpoint);
-  }
-
-  @Bean
-  @Order(value = 0)
-  FilterRegistrationBean sessionRepositoryFilterRegistration(
-      SessionRepositoryFilter filter) {
-    FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(
-        new DelegatingFilterProxy(filter));
-    filterRegistrationBean.setUrlPatterns(Arrays.asList("/*"));
-
-    return filterRegistrationBean;
+    return new GuestbookService(restTemplate, guestbookServiceEndpoint);
   }
-
-  @Bean
-  JedisConnectionFactory jedisConnectionFactory() throws URISyntaxException {
-    URI uri = new URI(redisEndpoint);
-    JedisConnectionFactory factory = new JedisConnectionFactory();
-    factory.setHostName(uri.getHost());
-    factory.setPort(uri.getPort());
-
-    return factory;
-  }
-
 }

examples-bootiful-gcp/helloworld-ui/src/main/resources/application.properties

@@ -1,2 +1,4 @@
 spring.application.name=ui
 spring.sleuth.sampler.probability=1.0
+spring.session.store-type=redis
+management.endpoints.web.exposure.include=health,prometheus

examples-bootiful-gcp/kubernetes/guestbook-deployment.yaml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ###############################################################################
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: guestbook-service
@@ -35,13 +35,16 @@ spec:
         visualize: "true"
       annotations:
         visualizer/uses: mysql
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
+        promteheus.io/path: /actuator/prometheus
     spec:
       containers:
       - name: guestbook-service
-        image: saturnism/guestbook-service:latest
+        image: gcr.io/wise-coyote-827/bootiful-guestbook-service:latest
         readinessProbe:
           httpGet:
-            path: /health
+            path: /actuator/health
             port: 8080
         ports:
         - name: http

examples-bootiful-gcp/kubernetes/helloworld-deployment.yaml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ###############################################################################
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: helloworld-service
@@ -33,13 +33,17 @@ spec:
         version: "latest"
         serving: "true"
         visualize: "true"
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
+        promteheus.io/path: /actuator/prometheus
     spec:
       containers:
       - name: helloworld-service
-        image: saturnism/helloworld-service:latest
+        image: gcr.io/wise-coyote-827/bootiful-helloworld-service:latest
         readinessProbe:
           httpGet:
-            path: /health
+            path: /actuator/health
             port: 8080
         ports:
         - name: http

examples-bootiful-gcp/kubernetes/mysql-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql
@@ -7,6 +7,9 @@ metadata:
     visualize: "true"
 spec: 
   replicas: 1
+  selector:
+    matchLabels:
+      app: mysql
   template:
     metadata:
       labels: