diff --git a/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml b/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml index 7871d34..27c50b8 100644 --- a/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml @@ -11,8 +11,9 @@ spec: name: flux-system git: commit: - authorEmail: ops@bstein.dev - authorName: flux-bot + author: + email: ops@bstein.dev + name: flux-bot messageTemplate: "chore(pegasus): update image to {{range .Updated.Images}}{{.}}{{end}}" update: strategy: Setters diff --git a/hosts/playbooks/site.yaml b/hosts/playbooks/site.yaml index eb06cc0..04781f5 100644 --- a/hosts/playbooks/site.yaml +++ b/hosts/playbooks/site.yaml @@ -26,4 +26,4 @@ gather_facts: true roles: - common - - tethys_validator + - tethys_canary diff --git a/hosts/roles/tethys_canary/tasks/main.yaml b/hosts/roles/tethys_canary/tasks/main.yaml index 65abd13..cd9e0cf 100644 --- a/hosts/roles/tethys_canary/tasks/main.yaml +++ b/hosts/roles/tethys_canary/tasks/main.yaml @@ -1,4 +1,4 @@ -# hosts/roles/tethys_validator/tasks/main.yaml +# hosts/roles/tethys_canary/tasks/main.yaml --- - name: Placeholder for SUI validator container runtime setup ansible.builtin.debug: diff --git a/infrastructure/sources/cert-manager/letsencrypt.yaml b/infrastructure/sources/cert-manager/letsencrypt.yaml index 73f1210..13590f3 100644 --- a/infrastructure/sources/cert-manager/letsencrypt.yaml +++ b/infrastructure/sources/cert-manager/letsencrypt.yaml @@ -4,7 +4,7 @@ metadata: name: letsencrypt spec: acme: - email: you@bstein.dev + email: brad.stein@gmail.com server: https://acme-v02.api.letsencrypt.org/directory privateKeySecretRef: name: letsencrypt-account-key diff --git a/services/monitoring/helmrelease.yaml b/services/monitoring/helmrelease.yaml index c8d68e1..a50b847 100644 --- a/services/monitoring/helmrelease.yaml +++ b/services/monitoring/helmrelease.yaml @@ -154,17 +154,20 @@ spec: target_label: __address__ # --- Annotated Pods (generic autodiscovery) --- - - job_name: "kubernetes-pods" - kubernetes_sd_configs: [{ role: pod }] - relabel_configs: - - action: keep - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] - regex: "true" - - action: replace - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] - target_label: __metrics_path__ - - action: replace - regex: (.+):(?:\d+);(\d+) + - job_name: "kubernetes-pods" + kubernetes_sd_configs: [{ role: pod }] + relabel_configs: + - action: keep + source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] + regex: "true" + - action: drop + source_labels: [__meta_kubernetes_pod_container_port_name] + regex: ".*health.*" + - action: replace + source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] + target_label: __metrics_path__ + - action: replace + regex: (.+):(?:\d+);(\d+) replacement: $1:$2 source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] target_label: __address__ @@ -184,17 +187,20 @@ spec: metrics_path: /metrics # --- cert-manager (pods expose on 9402) --- - - job_name: "cert-manager" - kubernetes_sd_configs: [{ role: pod }] - relabel_configs: - - action: keep - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_app_kubernetes_io_name] - regex: cert-manager;cert-manager - - action: replace - source_labels: [__address__] - regex: "(.+):\\d+" - replacement: "$1:9402" - target_label: __address__ + - job_name: "cert-manager" + kubernetes_sd_configs: [{ role: pod }] + relabel_configs: + - action: keep + source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_app_kubernetes_io_name] + regex: cert-manager;cert-manager + - action: drop + source_labels: [__meta_kubernetes_pod_container_port_name] + regex: ".*health.*" + - action: replace + source_labels: [__address__] + regex: "(.+):\\d+" + replacement: "$1:9402" + target_label: __address__ # --- Flux controllers (default :8080/metrics) --- - job_name: "flux" @@ -203,4 +209,3 @@ spec: - action: keep source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_app_kubernetes_io_part_of] regex: flux-system;flux -