diff --git a/helm/core/templates/podmonitor.yaml b/helm/core/templates/podmonitor.yaml index 8b81f7fff..be31c2bc0 100644 --- a/helm/core/templates/podmonitor.yaml +++ b/helm/core/templates/podmonitor.yaml @@ -5,6 +5,9 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "gateway.labels" . | nindent 4}} + {{- with .Values.gateway.metrics.podMonitorSelector }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: {{- .Values.gateway.annotations | toYaml | nindent 4 }} spec: diff --git a/helm/core/values.yaml b/helm/core/values.yaml index 7e37d7246..b1fc6b9f6 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -528,6 +528,11 @@ gateway: metrics: # -- If true, create PodMonitor or VMPodScrape for gateway enabled: false + # -- Selector for PodMonitor + # When using monitoring.coreos.com/v1.PodMonitor, the selector must match + # the label "release: kube-prome" is the default for kube-prometheus-stack + podMonitorSelector: + release: kube-prome # -- provider group name for CustomResourceDefinition, can be monitoring.coreos.com or operator.victoriametrics.com provider: monitoring.coreos.com interval: "" diff --git a/helm/higress/README.md b/helm/higress/README.md index b383efce5..04ba9da86 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -104,6 +104,7 @@ The command removes all the Kubernetes components associated with the chart and | gateway.metrics.interval | string | `""` | | | gateway.metrics.metricRelabelConfigs | list | `[]` | for operator.victoriametrics.com/v1beta1.VMPodScrape | | gateway.metrics.metricRelabelings | list | `[]` | for monitoring.coreos.com/v1.PodMonitor | +| gateway.metrics.podMonitorSelector | object | `{"release":"kube-prome"}` | Selector for PodMonitor When using monitoring.coreos.com/v1.PodMonitor, the selector must match the label "release: kube-prome" is the default for kube-prometheus-stack | | gateway.metrics.provider | string | `"monitoring.coreos.com"` | provider group name for CustomResourceDefinition, can be monitoring.coreos.com or operator.victoriametrics.com | | gateway.metrics.rawSpec | object | `{}` | some more raw podMetricsEndpoints spec | | gateway.metrics.relabelConfigs | list | `[]` | | diff --git a/helm/higress/README.zh.md b/helm/higress/README.zh.md index e925cefa9..f6ae457c8 100644 --- a/helm/higress/README.zh.md +++ b/helm/higress/README.zh.md @@ -112,6 +112,7 @@ helm delete higress -n higress-system | gateway.metrics.rawSpec | object | `{}` | 额外的度量规范 | | gateway.metrics.relabelConfigs | list | `[]` | 重新标签配置 | | gateway.metrics.relabelings | list | `[]` | 重新标签项 | +| gateway.metrics.podMonitorSelector | object | `{"release":"kube-prometheus-stack"}` | PodMonitor 选择器,当使用 prometheus stack 的podmonitor自动发现时,选择器必须匹配标签 "release: kube-prome",这是 kube-prometheus-stack 的默认设置 | | gateway.metrics.scrapeTimeout | string | `""` | 抓取的超时时间 | | gateway.name | string | `"higress-gateway"` | 网关名称 | | gateway.networkGateway | string | `""` | 网络网关指定 |