From 03bfbb1c82d66f4e8f186bc91b871982affad2ac Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 28 Mar 2025 08:32:57 -0400 Subject: [PATCH 1/6] use doc link --- charts/ziti-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md index ee9ed6b80..4d45bf195 100644 --- a/charts/ziti-controller/README.md +++ b/charts/ziti-controller/README.md @@ -340,7 +340,7 @@ For more information, please check [here](https://openziti.io/docs/learn/core-co | prometheus.serviceMonitor.enabled | bool | `true` | If enabled, and prometheus service is enabled, ServiceMonitor resources for Prometheus Operator are created | | prometheus.serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | | prometheus.serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `metric_relabel_configs`) | +| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) | | prometheus.serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | prometheus.serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | prometheus.serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `relabel_configs`) | From 60e7751b8fa94361216ccae500c20b18fa4843c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 28 Mar 2025 12:33:13 +0000 Subject: [PATCH 2/6] helm-docs: automated action --- charts/ziti-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md index 4d45bf195..ee9ed6b80 100644 --- a/charts/ziti-controller/README.md +++ b/charts/ziti-controller/README.md @@ -340,7 +340,7 @@ For more information, please check [here](https://openziti.io/docs/learn/core-co | prometheus.serviceMonitor.enabled | bool | `true` | If enabled, and prometheus service is enabled, ServiceMonitor resources for Prometheus Operator are created | | prometheus.serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | | prometheus.serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) | +| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `metric_relabel_configs`) | | prometheus.serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | prometheus.serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | prometheus.serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `relabel_configs`) | From 133035825f7e7d0df1ae84033a99ecc017b8be40 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 28 Mar 2025 09:36:37 -0400 Subject: [PATCH 3/6] Update values.yaml --- charts/ziti-controller/values.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/ziti-controller/values.yaml b/charts/ziti-controller/values.yaml index c7791724a..38f3eb43d 100644 --- a/charts/ziti-controller/values.yaml +++ b/charts/ziti-controller/values.yaml @@ -199,10 +199,8 @@ prometheus: # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig # (defines `relabel_configs`) relabelings: [] - # -- ServiceMonitor relabel configs to apply to samples as the last - # step before ingestion - # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig - # (defines `metric_relabel_configs`) + # -- ServiceMonitor relabel configs to apply to samples as the last step before ingestion + # ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) metricRelabelings: [] # -- ServiceMonitor will add labels from the service to the Prometheus metric # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec From 09fd75479bdf85d6b41a2309d3ebaaa60ce1eecf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 28 Mar 2025 13:36:58 +0000 Subject: [PATCH 4/6] helm-docs: automated action --- charts/ziti-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md index ee9ed6b80..1f8853cfd 100644 --- a/charts/ziti-controller/README.md +++ b/charts/ziti-controller/README.md @@ -340,7 +340,7 @@ For more information, please check [here](https://openziti.io/docs/learn/core-co | prometheus.serviceMonitor.enabled | bool | `true` | If enabled, and prometheus service is enabled, ServiceMonitor resources for Prometheus Operator are created | | prometheus.serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | | prometheus.serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `metric_relabel_configs`) | +| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) | | prometheus.serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | prometheus.serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | prometheus.serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `relabel_configs`) | From 1bbe42898d5f31c3d84ee28ce19e7b67a213e797 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 28 Mar 2025 10:03:49 -0400 Subject: [PATCH 5/6] fix links to prometheus docs --- charts/ziti-controller/values.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/charts/ziti-controller/values.yaml b/charts/ziti-controller/values.yaml index 38f3eb43d..580ec178d 100644 --- a/charts/ziti-controller/values.yaml +++ b/charts/ziti-controller/values.yaml @@ -196,14 +196,11 @@ prometheus: # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) scrapeTimeout: null # -- ServiceMonitor relabel configs to apply to samples before scraping - # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig - # (defines `relabel_configs`) + # (defines `relabel_configs`; [reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) relabelings: [] - # -- ServiceMonitor relabel configs to apply to samples as the last step before ingestion - # ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) + # -- ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) metricRelabelings: [] - # -- ServiceMonitor will add labels from the service to the Prometheus metric - # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec + # -- ServiceMonitor will add labels from the service to the Prometheus metric ([reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) targetLabels: [] # -- ServiceMonitor will use http by default, but you can pick https as well scheme: https From d4e51478cddc679d4ab5efccddc3cf638d35eee8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 28 Mar 2025 14:04:05 +0000 Subject: [PATCH 6/6] helm-docs: automated action --- charts/ziti-controller/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md index 1f8853cfd..047106a7f 100644 --- a/charts/ziti-controller/README.md +++ b/charts/ziti-controller/README.md @@ -340,13 +340,13 @@ For more information, please check [here](https://openziti.io/docs/learn/core-co | prometheus.serviceMonitor.enabled | bool | `true` | If enabled, and prometheus service is enabled, ServiceMonitor resources for Prometheus Operator are created | | prometheus.serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | | prometheus.serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([see `metric_relabel_configs`](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)) | +| prometheus.serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples as the last step before ingestion ([reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) | | prometheus.serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | prometheus.serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | -| prometheus.serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig (defines `relabel_configs`) | +| prometheus.serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping (defines `relabel_configs`; [reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) | | prometheus.serviceMonitor.scheme | string | `"https"` | ServiceMonitor will use http by default, but you can pick https as well | | prometheus.serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| prometheus.serviceMonitor.targetLabels | list | `[]` | ServiceMonitor will add labels from the service to the Prometheus metric https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec | +| prometheus.serviceMonitor.targetLabels | list | `[]` | ServiceMonitor will add labels from the service to the Prometheus metric ([reference](https://prometheus.io/docs/prometheus/latest/configuration/configuration)) | | prometheus.serviceMonitor.tlsConfig | object | `{"insecureSkipVerify":true}` | ServiceMonitor will use these tlsConfig settings to make the health check requests | | prometheus.serviceMonitor.tlsConfig.insecureSkipVerify | bool | `true` | set TLS skip verify, because the SAN will not match with the pod IP | | resources | object | `{}` | deployment container resources |