[krakend, resource-manager, uniconfig, workflow-manager] (#418)

Signed-off-by: JumasJM <[email protected]>
FRINXio · Sep 4, 2024 · 464357d · 464357d
1 parent 76f4e26
commit 464357d
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 62 deletions.
diff --git a/charts/krakend/Chart.yaml b/charts/krakend/Chart.yaml
@@ -3,7 +3,7 @@ name: krakend
 description: FRINX KrakenD API Gateway for FRINX-machine
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 5.0.0
+version: 5.0.1
 appVersion: "6.1.1"
 dependencies:
   - condition: nginx.enabled
@@ -22,12 +22,7 @@ annotations:
       image: nginx:1.27-alpine
   artifacthub.io/changes: |
     - kind: changed
-      description: Nginx as a separate pod
+      description: Monitoring to metrics configuration
       links:
         - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/417
-    - kind: added
-      description: Add rate limits for services
-      links:
-        - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/417
+          url: https://github.com/FRINXio/helm-charts/pull/418
diff --git a/charts/krakend/README.md b/charts/krakend/README.md
@@ -2,7 +2,7 @@
 
 FRINX KrakenD API Gateway for FRINX-machine
 
-![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)
+![Version: 5.0.1](https://img.shields.io/badge/Version-5.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)
 
 ## Get Repo Info
 
@@ -59,7 +59,7 @@ helm uninstall [RELEASE_NAME]
 | ingress.hosts | list | `[{"host":"chart-example.local","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}]` | [Ingress Host](https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource) |
 | ingress.labels | object | `{}` | Additional labels for the Ingress resource |
 | ingress.tls | list | `[]` |  |
-| monitoring | object | `{"enabled":false,"port":9091,"targetPort":9091}` | Monitoring configuration |
+| metrics | object | `{"enabled":false,"metricsPath":"/metrics","metricsPort":"metrics"}` | Metrics configuration |
 | nameOverride | string | `""` | String to partially override app name |
 | nginx.enabled | bool | `false` |  |
 | nginx.existingServerBlockConfigmap | existingServerBlockConfigmap ConfigMap with custom server block to be added to NGINX configuration | `"krakend-nginx-config"` | [https://artifacthub.io/packages/helm/bitnami/nginx?modal=values&path=existingServerBlockConfigmap] |
@@ -85,6 +85,8 @@ helm uninstall [RELEASE_NAME]
 | rbac | object | `{"ADMIN_ACCESS_ROLE":"network-admin","INVENTORY_ADMIN_GROUP":"network-admin","UNICONFIG_CONTROLLER_ADMIN_GROUP":"network-admin","UNISTORE_BEARER_NODE":"bearer","UNISTORE_BEARER_ROLE":"","UNISTORE_CONTROLLER_ADMIN_GROUP":"network-admin","UNISTORE_NETWORK_NODE":"network","UNISTORE_NETWORK_ROLE":"","UNISTORE_OTHER_PERMITTED_ROLES":"","UNISTORE_SERVICE_NODE":"service","UNISTORE_SERVICE_ROLE":"","X_AUTH_USER_GROUP":"network-admin"}` | RBAC configuration |
 | replicaCount | int | `1` | Number of replicas of the deployment. |
 | resources | object | `{}` | [KrakenD Container resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) |
+| service.metricsPort | int | `9091` | Metrics port |
+| service.metricsTargetPort | int | `9091` | Metrics target port |
 | service.nodePort | int | `30000` | Node port for HTTP |
 | service.port | int | `8080` | KrakenD HTTP |
 | service.targetPort | int | `8080` | Target port for HTTP |

diff --git a/charts/krakend/templates/deployment.yaml b/charts/krakend/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: WS_PORT
               value: {{ .Values.service.wsTargetPort | quote }}
             - name: PROMETHEUS_PORT
-              value: {{ .Values.monitoring.targetPort | quote }}
+              value: {{ .Values.service.metricsTargetPort | quote }}
             # KRAKEND TEMPLATING
             - name: FC_ENABLE
               value: "1"
@@ -187,8 +187,8 @@ spec:
             - name: websocket
               containerPort: {{ .Values.service.wsTargetPort }}
               protocol: TCP
-            - name: monitoring
-              containerPort: {{ .Values.monitoring.targetPort }}
+            - name: metrics
+              containerPort: {{ .Values.service.metricsTargetPort }}
               protocol: TCP
           livenessProbe:
             httpGet:

diff --git a/charts/krakend/templates/service.yaml b/charts/krakend/templates/service.yaml
@@ -21,8 +21,8 @@ spec:
       {{- end }}
       protocol: TCP
       name: ws
-    - port: {{ .Values.monitoring.port }}
-      targetPort: {{ .Values.monitoring.targetPort }}
+    - port: {{ .Values.service.metricsPort }}
+      targetPort: metrics
       protocol: TCP
       name: metrics
   selector:

diff --git a/charts/krakend/templates/servicemonitor.yaml b/charts/krakend/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: {{ include "krakend.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-    - port: metrics
-      path: /metrics
+    - port: {{ .Values.metrics.metricsPort }}
+      path: {{ .Values.metrics.metricsPath }}
       interval: 30s
 {{- end }}
diff --git a/charts/krakend/values.yaml b/charts/krakend/values.yaml
@@ -61,6 +61,10 @@ service:
   nodePort: 30000
   # -- Node port for Websocket
   wsNodePort: 30001
+  # -- Metrics port
+  metricsPort: 9091
+  # -- Metrics target port
+  metricsTargetPort: 9091
 
 # Configure the [Ingress resource](https://kubernetes.io/docs/concepts/services-networking/ingress/)
 ingress:
@@ -308,11 +312,11 @@ debug:
 # -- Additional KrakenD environment variables
 extraEnv: []
 
-# -- Monitoring configuration
-monitoring:
+# -- Metrics configuration
+metrics:
   enabled: false
-  port: 9091
-  targetPort: 9091
+  metricsPort: metrics
+  metricsPath: /metrics
 
 nginx:
   enabled: false

diff --git a/charts/resource-manager/Chart.yaml b/charts/resource-manager/Chart.yaml
@@ -3,7 +3,7 @@ name: resource-manager
 description: A Helm chart for Kubernetes deploying of the Frinx Resource-Manager
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 2.3.0
+version: 2.3.1
 appVersion: "6.1.0"
 maintainers:
   - name: FRINX
@@ -16,13 +16,8 @@ dependencies:
     version: 14.x.x
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Add metrics port for accessing metrics
+    - kind: changed
+      description: Monitoring to metrics configuration
       links:
         - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/397
-    - kind: added
-      description: Add servicemonitor and monitoring configuration
-      links:
-        - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/397
+          url: https://github.com/FRINXio/helm-charts/pull/418
diff --git a/charts/resource-manager/README.md b/charts/resource-manager/README.md
@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes deploying of the Frinx Resource-Manager
 
-![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.0](https://img.shields.io/badge/AppVersion-6.1.0-informational?style=flat-square)
+![Version: 2.3.1](https://img.shields.io/badge/Version-2.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.0](https://img.shields.io/badge/AppVersion-6.1.0-informational?style=flat-square)
 
 ## Get Repo Info
 
@@ -66,7 +66,7 @@ helm uninstall [RELEASE_NAME]
 | ingress.hosts | list | `[{"host":"chart-example.local","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}]` | [Ingress Host](https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource) |
 | ingress.labels | object | `{}` | Additional labels for the Ingress resource |
 | ingress.tls | list | `[]` | [Ingress TLS resource](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) |
-| monitoring | object | `{"enabled":false,"metricsPath":"/metrics","metricsPort":"metrics"}` | Monitoring configuration |
+| metrics | object | `{"enabled":false,"metricsPath":"/metrics","metricsPort":"metrics"}` | Metrics configuration |
 | nameOverride | string | `""` | String to partially override app name |
 | nodeSelector | object | `{}` | [Node labels for pod assignment](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) |
 | podAnnotations | object | `{}` | Pod annotations |

diff --git a/charts/resource-manager/templates/servicemonitor.yaml b/charts/resource-manager/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: {{ include "resource-manager.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-    - port: {{ .Values.monitoring.metricsPort }}
-      path: {{ .Values.monitoring.metricsPath }}
+    - port: {{ .Values.metrics.metricsPort }}
+      path: {{ .Values.metrics.metricsPath }}
       interval: 30s
 {{- end }}
diff --git a/charts/resource-manager/values.yaml b/charts/resource-manager/values.yaml
@@ -160,8 +160,8 @@ rbac:
 # -- Additional application environment variables
 extraEnv: []
 
-# -- Monitoring configuration
-monitoring:
+# -- Metrics configuration
+metrics:
   enabled: false
   metricsPort: metrics
   metricsPath: /metrics
diff --git a/charts/uniconfig/Chart.yaml b/charts/uniconfig/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: uniconfig
-version: 8.2.0
+version: 8.2.1
 appVersion: "6.1.1"
 description: A Helm chart for UniConfig Kubernetes deployment
 type: application
@@ -21,8 +21,8 @@ maintainers:
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Add possibility to configure extra objects via helm chart [container, volume, extraConfigmapMounts]
+    - kind: changed
+      description: Monitoring to metrics configuration
       links:
         - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/416
+          url: https://github.com/FRINXio/helm-charts/pull/418
diff --git a/charts/uniconfig/README.md b/charts/uniconfig/README.md
@@ -2,7 +2,7 @@
 
 A Helm chart for UniConfig Kubernetes deployment
 
-![Version: 8.2.0](https://img.shields.io/badge/Version-8.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)
+![Version: 8.2.1](https://img.shields.io/badge/Version-8.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)
 
 ## Get Repo Info
 
@@ -78,8 +78,8 @@ helm uninstall [RELEASE_NAME]
 | java | object | `{"max_mem":"10G"}` | Java max memory for Uniconfig container |
 | kafka | object | `{"fullnameOverride":"kafka","listeners":{"client":{"protocol":"PLAINTEXT"}}}` | [Kafka subchart: "https://artifacthub.io/packages/helm/bitnami/kafka"] |
 | livenessProbe | object | `{"failureThreshold":10,"timeoutSeconds":35}` | Liveness probe |
+| metrics | object | `{"enabled":false,"path":"/actuator/prometheus","port":"http"}` | Metrics configuration |
 | mibsConfigs | object | `{}` | Global configuration of mibs |
-| monitoring | object | `{"enabled":false,"path":"/actuator/prometheus","port":"http"}` | Monitoring configuration |
 | nameOverride | string | `""` | String to partially override app name |
 | nodeSelector | object | `{}` | [Node labels for pod assignment](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) |
 | podAnnotations | object | `{}` | Pod annotations |

diff --git a/charts/uniconfig/templates/servicemonitor.yaml b/charts/uniconfig/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: {{ include "uniconfig.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-    - port: {{ .Values.monitoring.port }}
-      path: {{ .Values.monitoring.path }}
+    - port: {{ .Values.metrics.port }}
+      path: {{ .Values.metrics.path }}
       interval: 30s
 {{- end }}
diff --git a/charts/uniconfig/values.yaml b/charts/uniconfig/values.yaml
@@ -308,8 +308,8 @@ extraEnv:
   NOTIFICATIONS_KAFKA_KAFKASERVERS_0_BROKERLISTENINGPORT: 9092
   SPRING_KAFKA_BOOTSTRAPSERVERS: http://kafka:9092
 
-# -- Monitoring configuration
-monitoring:
+# -- Metrics configuration
+metrics:
   enabled: false
   port: http
   path: /actuator/prometheus

diff --git a/charts/workflow-manager/Chart.yaml b/charts/workflow-manager/Chart.yaml
@@ -3,7 +3,7 @@ name: workflow-manager
 description: A Helm chart for Kubernetes deploying conductor-server and schellar
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 3.2.0
+version: 3.2.1
 appVersion: "6.1.0"
 maintainers:
   - name: FRINX
@@ -21,8 +21,8 @@ annotations:
     - name: schellar
       image: frinx/schellar:6.1.0
   artifacthub.io/changes: |
-    - kind: added
-      description: Added servicemonitors and monitoring configuration
+    - kind: changed
+      description: Monitoring to metrics configuration
       links:
         - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/397
+          url: https://github.com/FRINXio/helm-charts/pull/418
diff --git a/charts/workflow-manager/README.md b/charts/workflow-manager/README.md
@@ -68,7 +68,7 @@ helm uninstall [RELEASE_NAME]
 | ingress.schellarHosts[0].paths[0].path | string | `"/"` |  |
 | ingress.schellarHosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` | [Ingress TLS resource](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) |
-| monitoring | object | `{"conductorPath":"/actuator/prometheus","conductorPort":"http-conductor","enabled":false,"schellarPath":"/metrics","schellarPort":"http-schellar"}` | Monitoring configuration |
+| metrics | object | `{"conductorPath":"/actuator/prometheus","conductorPort":"http-conductor","enabled":false,"schellarPath":"/metrics","schellarPort":"http-schellar"}` | Metrics configuration |
 | nameOverride | string | `""` | String to partially override app name |
 | nodeSelector | object | `{}` | [Node labels for pod assignment](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) |
 | podAnnotations | object | `{}` | Pod annotations |

diff --git a/charts/workflow-manager/templates/conductor-servicemonitor.yaml b/charts/workflow-manager/templates/conductor-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: {{ include "workflow-manager.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-    - port: {{ .Values.monitoring.conductorPort }}
-      path: {{ .Values.monitoring.conductorPath }}
+    - port: {{ .Values.metrics.conductorPort }}
+      path: {{ .Values.metrics.conductorPath }}
       interval: 30s
 {{- end }}
diff --git a/charts/workflow-manager/templates/schellar-servicemonitor.yaml b/charts/workflow-manager/templates/schellar-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: {{ include "workflow-manager.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-    - port: {{ .Values.monitoring.schellarPort }}
-      path: {{ .Values.monitoring.schellarPath }}
+    - port: {{ .Values.metrics.schellarPort }}
+      path: {{ .Values.metrics.schellarPath }}
       interval: 30s
 {{- end }}
diff --git a/charts/workflow-manager/values.yaml b/charts/workflow-manager/values.yaml
@@ -242,8 +242,8 @@ postgresql:
       labels:
         prometheus: conductor-db
 
-# -- Monitoring configuration
-monitoring:
+# -- Metrics configuration
+metrics:
   enabled: false
   conductorPort: http-conductor
   conductorPath: /actuator/prometheus