This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new c64fa70 bugfix: metricRelabelings default value (#593)
c64fa70 is described below
commit c64fa708c6ac6de0ba692b6192071a66166dbcc8
Author: Nick Venenga <[email protected]>
AuthorDate: Sun Oct 8 22:08:39 2023 -0400
bugfix: metricRelabelings default value (#593)
---
charts/apisix/README.md | 4 ++--
charts/apisix/values.yaml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 9f90d54..3b9b239 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -202,14 +202,14 @@ The command removes all the Kubernetes components
associated with the chart and
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `false` | |
| serviceAccount.name | string | `""` | |
-| serviceMonitor | object |
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":"15s","labels":{},"metricPrefix":"apisix_","metricRelabelings":{},"name":"","namespace":"","path":"/apisix/prometheus/metrics"}`
| Observability configuration. ref:
https://apisix.apache.org/docs/apisix/plugins/prometheus/ |
+| serviceMonitor | object |
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":"15s","labels":{},"metricPrefix":"apisix_","metricRelabelings":[],"name":"","namespace":"","path":"/apisix/prometheus/metrics"}`
| Observability configuration. ref:
https://apisix.apache.org/docs/apisix/plugins/prometheus/ |
| serviceMonitor.annotations | object | `{}` | @param
serviceMonitor.annotations ServiceMonitor annotations |
| serviceMonitor.containerPort | int | `9091` | container port where the
metrics are exposed |
| serviceMonitor.enabled | bool | `false` | Enable or disable Apache APISIX
serviceMonitor |
| serviceMonitor.interval | string | `"15s"` | interval at which metrics
should be scraped |
| serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels
ServiceMonitor extra labels |
| serviceMonitor.metricPrefix | string | `"apisix_"` | prefix of the metrics |
-| serviceMonitor.metricRelabelings | object | `{}` | @param
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples
before ingestion. ref:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
|
+| serviceMonitor.metricRelabelings | list | `[]` | @param
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples
before ingestion. ref:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
|
| serviceMonitor.name | string | `""` | name of the serviceMonitor, by
default, it is the same as the apisix fullname |
| serviceMonitor.namespace | string | `""` | namespace where the
serviceMonitor is deployed, by default, it is the same as the namespace of the
apisix |
| serviceMonitor.path | string | `"/apisix/prometheus/metrics"` | path of the
metrics endpoint |
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index ee22bb7..4d3f560 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -579,7 +579,7 @@ serviceMonitor:
annotations: {}
# -- @param serviceMonitor.metricRelabelings MetricRelabelConfigs to apply
to samples before ingestion.
# ref:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
- metricRelabelings: {}
+ metricRelabelings: []
# -- etcd configuration
# use the FQDN address or the IP of the etcd
