From 71074ae0415a18ee4d15569b7bedf5550a7b0510 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com>
Date: Mon, 8 Jan 2024 18:37:49 +0800
Subject: [PATCH] feat: support openim prom enbels

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
---
 charts/openim-admin/Chart.yaml                    |  2 +-
 charts/openim-admin/values.yaml                   | 15 +++++++++++++++
 charts/openim-chat/Chart.yaml                     |  2 +-
 charts/openim-chat/charts/admin-rpc/values.yaml   |  1 +
 charts/openim-chat/charts/chat-api/values.yaml    |  1 +
 charts/openim-chat/values.yaml                    |  1 +
 charts/openim-server/Chart.yaml                   |  2 +-
 .../charts/openim-msggateway-proxy/values.yaml    | 15 +++++++++++++++
 .../charts/openim-msggateway/values.yaml          | 15 +++++++++++++++
 .../charts/openim-msgtransfer/values.yaml         | 15 +++++++++++++++
 .../openim-server/charts/openim-push/values.yaml  | 15 +++++++++++++++
 .../charts/openim-rpc-auth/values.yaml            | 15 +++++++++++++++
 .../charts/openim-rpc-conversation/values.yaml    | 15 +++++++++++++++
 .../charts/openim-rpc-friend/values.yaml          | 15 +++++++++++++++
 .../charts/openim-rpc-group/values.yaml           | 15 +++++++++++++++
 .../charts/openim-rpc-msg/values.yaml             | 15 +++++++++++++++
 .../charts/openim-rpc-third/values.yaml           | 15 +++++++++++++++
 .../charts/openim-rpc-user/values.yaml            | 14 ++++++++++++++
 charts/openim-server/values.yaml                  | 15 +++++++++++++++
 charts/openim-web/Chart.yaml                      |  2 +-
 docs/version.md                                   |  2 +-
 21 files changed, 202 insertions(+), 5 deletions(-)

diff --git a/charts/openim-admin/Chart.yaml b/charts/openim-admin/Chart.yaml
index 14081e4..4d53501 100644
--- a/charts/openim-admin/Chart.yaml
+++ b/charts/openim-admin/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/openim-admin/values.yaml b/charts/openim-admin/values.yaml
index 0fd0188..53cf57b 100644
--- a/charts/openim-admin/values.yaml
+++ b/charts/openim-admin/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-chat/Chart.yaml b/charts/openim-chat/Chart.yaml
index ee9ed55..95c8188 100644
--- a/charts/openim-chat/Chart.yaml
+++ b/charts/openim-chat/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/openim-chat/charts/admin-rpc/values.yaml b/charts/openim-chat/charts/admin-rpc/values.yaml
index c4a4ae9..0a07859 100644
--- a/charts/openim-chat/charts/admin-rpc/values.yaml
+++ b/charts/openim-chat/charts/admin-rpc/values.yaml
@@ -75,6 +75,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-chat/charts/chat-api/values.yaml b/charts/openim-chat/charts/chat-api/values.yaml
index d3d8e28..3c83c20 100644
--- a/charts/openim-chat/charts/chat-api/values.yaml
+++ b/charts/openim-chat/charts/chat-api/values.yaml
@@ -75,6 +75,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-chat/values.yaml b/charts/openim-chat/values.yaml
index 8e21e40..b3b99c5 100644
--- a/charts/openim-chat/values.yaml
+++ b/charts/openim-chat/values.yaml
@@ -75,6 +75,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/Chart.yaml b/charts/openim-server/Chart.yaml
index 0d4651b..ffd381b 100644
--- a/charts/openim-server/Chart.yaml
+++ b/charts/openim-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/openim-server/charts/openim-msggateway-proxy/values.yaml b/charts/openim-server/charts/openim-msggateway-proxy/values.yaml
index 0b856ca..4902861 100644
--- a/charts/openim-server/charts/openim-msggateway-proxy/values.yaml
+++ b/charts/openim-server/charts/openim-msggateway-proxy/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-msggateway/values.yaml b/charts/openim-server/charts/openim-msggateway/values.yaml
index d82c674..f65b291 100644
--- a/charts/openim-server/charts/openim-msggateway/values.yaml
+++ b/charts/openim-server/charts/openim-msggateway/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-msgtransfer/values.yaml b/charts/openim-server/charts/openim-msgtransfer/values.yaml
index 3ec24b2..83db173 100644
--- a/charts/openim-server/charts/openim-msgtransfer/values.yaml
+++ b/charts/openim-server/charts/openim-msgtransfer/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-push/values.yaml b/charts/openim-server/charts/openim-push/values.yaml
index dd6f0fa..83b184b 100644
--- a/charts/openim-server/charts/openim-push/values.yaml
+++ b/charts/openim-server/charts/openim-push/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-auth/values.yaml b/charts/openim-server/charts/openim-rpc-auth/values.yaml
index a6db671..76209ae 100644
--- a/charts/openim-server/charts/openim-rpc-auth/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-auth/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-conversation/values.yaml b/charts/openim-server/charts/openim-rpc-conversation/values.yaml
index 1b3e1e3..0532d14 100644
--- a/charts/openim-server/charts/openim-rpc-conversation/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-conversation/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-friend/values.yaml b/charts/openim-server/charts/openim-rpc-friend/values.yaml
index 041665a..2522e1b 100644
--- a/charts/openim-server/charts/openim-rpc-friend/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-friend/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-group/values.yaml b/charts/openim-server/charts/openim-rpc-group/values.yaml
index ec36e25..9a0260f 100644
--- a/charts/openim-server/charts/openim-rpc-group/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-group/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-msg/values.yaml b/charts/openim-server/charts/openim-rpc-msg/values.yaml
index 22cfd61..5a41ce2 100644
--- a/charts/openim-server/charts/openim-rpc-msg/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-msg/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-third/values.yaml b/charts/openim-server/charts/openim-rpc-third/values.yaml
index 8a92566..52015a0 100644
--- a/charts/openim-server/charts/openim-rpc-third/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-third/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-server/charts/openim-rpc-user/values.yaml b/charts/openim-server/charts/openim-rpc-user/values.yaml
index d137f0a..a24bc28 100644
--- a/charts/openim-server/charts/openim-rpc-user/values.yaml
+++ b/charts/openim-server/charts/openim-rpc-user/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
diff --git a/charts/openim-server/values.yaml b/charts/openim-server/values.yaml
index e41fb6e..6135f1c 100644
--- a/charts/openim-server/values.yaml
+++ b/charts/openim-server/values.yaml
@@ -68,6 +68,20 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+global:
+  monitor:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    jobLabel: ""
+    interval: ""
+    scrapeTimeout: ""
+    proxyUrl: ""
+    selectorOverride: {}
+    honorLabels: false
+    metricRelabelings: []
+    relabelings: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -75,6 +89,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/charts/openim-web/Chart.yaml b/charts/openim-web/Chart.yaml
index d4dd6ad..aec9124 100644
--- a/charts/openim-web/Chart.yaml
+++ b/charts/openim-web/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/docs/version.md b/docs/version.md
index b6aa150..7123f26 100644
--- a/docs/version.md
+++ b/docs/version.md
@@ -9,7 +9,7 @@ Unlike traditional software version control that often relies on branch concepts
 - **Chart.yaml File**: Each chart contains a `Chart.yaml` file in its directory. This file is pivotal for managing the version of each individual chart. It holds the `version` key, which gets updated with every new release.
 
 ```yaml
-version: 0.1.15
+version: 0.1.16
 ```
 
 - **Automated CICD**: Developers don't need to worry about managing branches, tags, or releases manually. These aspects are handled automatically through Continuous Integration and Continuous Deployment (CICD) systems. When a new chart version is pushed to the repository, the CICD pipeline is triggered.