diff --git a/ansible/roles/prometheus/templates/prometheus.yml.j2 b/ansible/roles/prometheus/templates/prometheus.yml.j2 index 99d1298a61..a8cf08f253 100644 --- a/ansible/roles/prometheus/templates/prometheus.yml.j2 +++ b/ansible/roles/prometheus/templates/prometheus.yml.j2 @@ -178,17 +178,17 @@ scrape_configs: {% endfor %} relabel_configs: - source_labels: [__address__] - regex: (\w+):(\w+):(.+) + regex: ([^:]+):([^:]+):(.+) target_label: service replacement: ${1} - source_labels: [__address__] - regex: (\w+):(\w+):(.+) + regex: ([^:]+):([^:]+):(.+) target_label: __param_module replacement: ${2} - source_labels: [__param_module] target_label: module - source_labels: [__address__] - regex: (\w+):(\w+):(.+) + regex: ([^:]+):([^:]+):(.+) target_label: __param_target replacement: ${3} - source_labels: [__param_target] diff --git a/releasenotes/notes/fix-blackbox-regex-b16f3f86563de6db.yaml b/releasenotes/notes/fix-blackbox-regex-b16f3f86563de6db.yaml new file mode 100644 index 0000000000..7488f7333c --- /dev/null +++ b/releasenotes/notes/fix-blackbox-regex-b16f3f86563de6db.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes the regex used to match blackbox exporter targets in the + ``prometheus.yml.j2`` template to be less strict. Previously we were using + ``\w`` which did not allow for names with periods or hyphens. The service + and module labels can now contain all characters except for a colon.