Merge pull request #172 from aliyun/prometheus

robberphex · web-flow · commit fffcc77905a9 · 2023-10-20T02:40:58.000-04:00
Prometheus
diff --git a/mse-simple-demo/A/build.sh b/mse-simple-demo/A/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-a
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/A/pom.xml b/mse-simple-demo/A/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <name>A</name>
diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-b
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/B/pom.xml b/mse-simple-demo/B/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <name>B</name>
@@ -35,6 +35,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.3.0</version>
+        </dependency>
 
         <!--  Dubbo -->
         <dependency>
diff --git a/mse-simple-demo/B/src/main/resources/application.properties b/mse-simple-demo/B/src/main/resources/application.properties
@@ -19,3 +19,6 @@ dubbo.protocol.port=48080
 dubbo.registry.check=false
 
 spring.profiles.active=druid
+
+management.endpoints.web.exposure.include=info,health,prometheus
+management.metrics.tags.application=spring-cloud-b
diff --git a/mse-simple-demo/C/build.sh b/mse-simple-demo/C/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-c
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/C/pom.xml b/mse-simple-demo/C/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>C</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <name>C</name>
diff --git a/mse-simple-demo/SpringCloudGateway/build.sh b/mse-simple-demo/SpringCloudGateway/build.sh
@@ -2,7 +2,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-gateway
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/SpringCloudGateway/pom.xml b/mse-simple-demo/SpringCloudGateway/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>SpringCloudGateway</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -27,12 +27,21 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>2.1.1.RELEASE</version>
         </dependency>
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
diff --git a/mse-simple-demo/SpringCloudGateway/src/main/resources/application.properties b/mse-simple-demo/SpringCloudGateway/src/main/resources/application.properties
@@ -32,4 +32,7 @@ spring.thymeleaf.mode = LEGACYHTML5
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.servlet.content-type=text/html
 spring.thymeleaf.suffix=.html
-spring.thymeleaf.cache=false
+spring.thymeleaf.cache=false
+
+management.endpoints.web.exposure.include=prometheus
+management.metrics.tags.application=spring-cloud-gateway
diff --git a/mse-simple-demo/ZuulGateway/build.sh b/mse-simple-demo/ZuulGateway/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-zuul
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/ZuulGateway/pom.xml b/mse-simple-demo/ZuulGateway/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>ZuulGateway</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -36,6 +36,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
diff --git a/mse-simple-demo/ZuulGateway/src/main/resources/application.properties b/mse-simple-demo/ZuulGateway/src/main/resources/application.properties
@@ -19,4 +19,7 @@ spring.thymeleaf.mode = LEGACYHTML5
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.servlet.content-type=text/html
 spring.thymeleaf.suffix=.html
-spring.thymeleaf.cache=false
+spring.thymeleaf.cache=false
+
+management.endpoints.web.exposure.include=prometheus
+management.metrics.tags.application=spring-cloud-a
diff --git a/mse-simple-demo/helm/mse-simple-demo/Chart.yaml b/mse-simple-demo/helm/mse-simple-demo/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mse-simple-demo
-version: "3.0.2"
-appVersion: "3.0.2"
+version: "3.0.3"
+appVersion: "3.0.3"
 home: https://mse.console.aliyun.com/
 keywords:
   - mse
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/PodMonitor.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/PodMonitor.yaml
@@ -0,0 +1,36 @@
+{{ if .Values.prometheus.enable }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: spring-cloud-b
+  namespace: {{ .Release.Namespace }}
+spec:
+  podMetricsEndpoints:
+    - interval: 30s
+      port: http-port
+      path: /actuator/prometheus
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: spring-cloud-b
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: spring-cloud-gateway
+  namespace: {{ .Release.Namespace }}
+spec:
+  podMetricsEndpoints:
+    - interval: 30s
+      port: http-port
+      path: /actuator/prometheus
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: spring-cloud-gateway
+{{ end }}
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-b-deployment.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-b-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: spring-cloud-b
   namespace: {{ .Release.Namespace }}
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: spring-cloud-b
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-gateway-deployment.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-gateway-deployment.yaml
@@ -48,7 +48,8 @@ spec:
               memory: {{ .Values.resources.limit.memory }}
             {{ end }}
           ports:
-            - containerPort: 20000
+            - name: http-port
+              containerPort: 20000
       hostAliases:
         {{ toYaml .Values.hostAliases | nindent 8 }}
       affinity:
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/zuul-gateway-deployment.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/zuul-gateway-deployment.yaml
@@ -48,7 +48,8 @@ spec:
               memory: {{ .Values.resources.limit.memory }}
             {{ end }}
           ports:
-            - containerPort: 20000
+            - name: http-port
+              containerPort: 20000
       hostAliases:
         {{ toYaml .Values.hostAliases | nindent 8 }}
       affinity:
diff --git a/mse-simple-demo/helm/mse-simple-demo/values.yaml b/mse-simple-demo/helm/mse-simple-demo/values.yaml
@@ -2,7 +2,7 @@
 registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
 
 images:
-  version: 3.0.2
+  version: 3.0.3
 
 mse:
   namespace: mse-demo
@@ -11,10 +11,12 @@ mse:
 # 是否启动zuul、springcloud网关
 gateway:
   zuul: false
-  springcloud: false
+  springcloud: true
   mse:
     ingress: false
 
+prometheus:
+  enable: false
 
 nacos:
   # Nacos地址
diff --git a/mse-simple-demo/mysql/build.sh b/mse-simple-demo/mysql/build.sh
@@ -2,7 +2,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=demo-mysql
-export version=3.0.2
+export version=3.0.3
 
 set -e
 
diff --git a/mse-simple-demo/pom.xml b/mse-simple-demo/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <all.project.version>3.0.2</all.project.version>
+        <all.project.version>3.0.3</all.project.version>
     </properties>
 
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>mse-simple-demo</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <modules>
         <module>A</module>
         <module>B</module>
