diff --git a/monitoring/Chart.yaml b/monitoring/Chart.yaml index c64b6ed..b9a7c26 100644 --- a/monitoring/Chart.yaml +++ b/monitoring/Chart.yaml @@ -3,7 +3,7 @@ name: monitoring description: Deploy helper for probes and scrapeconfig of prometheus-operator icon: https://prometheus.io/assets/favicons/android-chrome-192x192.png type: application -version: 0.1.3 +version: 0.2.0 maintainers: - name: WrenIX url: https://wrenix.eu diff --git a/monitoring/README.adoc b/monitoring/README.adoc index b847e9c..8747c51 100644 --- a/monitoring/README.adoc +++ b/monitoring/README.adoc @@ -2,7 +2,7 @@ = monitoring -image::https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square[Version: 0.1.3] +image::https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square[Version: 0.2.0] image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application] == Maintainers @@ -48,14 +48,24 @@ helm uninstall monitoring-release | prober | list -| `[{"name":"local","spec":{"path":"/probe","url":"prometheus-blackbox-exporter:9115"}}]` +| `[{"ipv4":true,"ipv6":true,"name":"local","spec":{"path":"/probe","url":"prometheus-blackbox-exporter:9115"}}]` | prober for each the following probes are created (multiside probes) | prober[0] | object -| `{"name":"local","spec":{"path":"/probe","url":"prometheus-blackbox-exporter:9115"}}` +| `{"ipv4":true,"ipv6":true,"name":"local","spec":{"path":"/probe","url":"prometheus-blackbox-exporter:9115"}}` | name of prober +| prober[0].ipv4 +| bool +| `true` +| use this prober for ipv4 probes (default: true) + +| prober[0].ipv6 +| bool +| `true` +| use this prober for ipv6 probes (default: true) + | prober[0].spec | object | `{"path":"/probe","url":"prometheus-blackbox-exporter:9115"}` @@ -74,12 +84,12 @@ helm uninstall monitoring-release | probes[0].ipv4 | bool | `true` -| setup one for ipv4 (see module and his suffix) +| setup one for ipv4 (see module and his suffix - default: true) | probes[0].ipv6 | bool | `true` -| setup one for ipv6 (see module and his suffix) +| setup one for ipv6 (see module and his suffix - default: true) | probes[0].name | string @@ -94,12 +104,12 @@ helm uninstall monitoring-release | probes[1].ipv4 | bool | `true` -| setup one for ipv4 (see module and his suffix) +| setup one for ipv4 (see module and his suffix - default: true) | probes[1].ipv6 | bool | `false` -| setup one for ipv6 (see module and his suffix) +| setup one for ipv6 (see module and his suffix - default: true) | probes[1].module | string diff --git a/monitoring/templates/probe.yaml b/monitoring/templates/probe.yaml index fa46046..6ac90bd 100644 --- a/monitoring/templates/probe.yaml +++ b/monitoring/templates/probe.yaml @@ -3,7 +3,15 @@ {{- range $groupName, $group := $probe.groups }} {{- $proto := "ipv4" }} {{- range $proto := (list "ipv4" "ipv6") }} -{{- if (get $probe $proto) }} +{{- if and + (or + (not (hasKey $probe $proto)) + (get $probe $proto) + ) + (or + (not (hasKey $prober $proto)) + (get $prober $proto) + ) }} --- apiVersion: monitoring.coreos.com/v1 kind: Probe diff --git a/monitoring/values.yaml b/monitoring/values.yaml index 0c8893f..00bb24e 100644 --- a/monitoring/values.yaml +++ b/monitoring/values.yaml @@ -45,6 +45,10 @@ scrapes: prober: # -- name of prober - name: "local" + # -- use this prober for ipv4 probes (default: true) + ipv4: true + # -- use this prober for ipv6 probes (default: true) + ipv6: true # -- spec of prober (like url, path, scheme ...) spec: url: "prometheus-blackbox-exporter:9115" @@ -55,9 +59,9 @@ probes: - module: http_2xx # -- name of probe name: http - # -- setup one for ipv4 (see module and his suffix) + # -- setup one for ipv4 (see module and his suffix - default: true) ipv4: true - # -- setup one for ipv6 (see module and his suffix) + # -- setup one for ipv6 (see module and his suffix - default: true) ipv6: true # -- groups with targets groups: @@ -71,9 +75,9 @@ probes: - module: http_2xx # -- name of probe name: http-ipv4 - # -- setup one for ipv4 (see module and his suffix) + # -- setup one for ipv4 (see module and his suffix - default: true) ipv4: true - # -- setup one for ipv6 (see module and his suffix) + # -- setup one for ipv6 (see module and his suffix - default: true) ipv6: false # -- groups with targets groups: