Add comment and pretty

Author: cevheri

api-gateway/pom.xml

@@ -54,6 +54,16 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>io.micrometer</groupId>-->
+<!--			<artifactId>micrometer-registry-prometheus</artifactId>-->
+<!--			<version>1.5.5</version>-->
+<!--		</dependency>-->
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 
 	</dependencies>
 	<dependencyManagement>

api-gateway/src/main/java/com/cevher/ms/cloud/gateway/APIGatewayApplication.java

@@ -9,7 +9,8 @@
 @EnableEurekaClient
 @EnableHystrix
 public class APIGatewayApplication {
-
+	// We used @EnableEurekaServer and @EnableHystrix
+	// See application.yml and bootstrap.yml
 	public static void main(String[] args) {
 		SpringApplication.run(APIGatewayApplication.class, args);
 	}

api-gateway/src/main/java/com/cevher/ms/cloud/gateway/FallBackController.java renamed to api-gateway/src/main/java/com/cevher/ms/cloud/gateway/FallBackResource.java

@@ -3,18 +3,34 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * We use FallBack URL for Circuit Breaker
+ */
 @RestController
-public class FallBackController {
+public class FallBackResource {
 
+    /**
+     * For User Microservices CircuitBreaker
+     * @return FallBack Message
+     */
     @GetMapping("/userServiceFallBack")
     public String userServiceFallBack(){
         return "FallBack User Controller!.. User Service is taking longer then Expected.";
     }
 
+    /**
+     * For Department Microservices CircuitBreaker
+     * @return FallBack Message
+     */
     @GetMapping("/departmentServiceFallBack")
     public String departmentServiceFallBack(){
         return "FallBack Department Controller!.. Department Service is taking longer then Expected.";
     }
+
+    /**
+     * For Task Microservices CircuitBreaker
+     * @return FallBack Message
+     */
     @GetMapping("/taskServiceFallBack")
     public String taskServiceFallBack(){
         return "FallBack Task Controller!.. Task Service is taking longer then Expected.";

api-gateway/src/main/resources/application.properties

@@ -44,9 +44,15 @@ hystrix:
             timeoutInMiliseconds: 4000
 
 management:
+  metrics:
+    tags:
+      application: MonitoringMicroservices
   endpoints:
+    health:
+      show-detail: always
     web:
       exposure:
-        include: hystrix.stream
+        include: hystrix.stream, prometheus
+
 
 

api-gateway/src/main/resources/application.yml

@@ -0,0 +1,18 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: 'prometheus'
+    scrape_interval: 5s
+
+    static_configs:
+      - targets: [ 'localhost:9090' ]
+
+  - job_name: 'spring-actuator'
+    metrics_path: '/actuator/prometheus'
+    scrape_interval: 5s
+    static_configs:
+      - targets: [ '192.168.0.9:8080' ]
+    # docker pull prom/prometheus
+    # docker run -d -p 9090:9090 -v <PATH_TO_prometheus.yml_FILE>:/etc/prometheus/prometheus.yml prom/prometheus
+    # docker run -d -p 3000:3000 grafana/grafana

api-gateway/src/main/resources/prometheus.yml

@@ -9,9 +9,9 @@
 @EnableEurekaClient
 @EnableConfigServer
 public class ConfigServerApplication {
-
+	// We used @EnableEurekaClient and @EnableConfigServer
+	// See application.yml
 	public static void main(String[] args) {
 		SpringApplication.run(ConfigServerApplication.class, args);
 	}
-
 }

config-server/src/main/java/com/cevher/ms/config/ConfigServerApplication.java

@@ -7,7 +7,6 @@
 @SpringBootApplication
 @EnableEurekaClient
 public class DepartmentServiceApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(DepartmentServiceApplication.class, args);
 	}