From 7984eee6611fd207991befe4c62959ab816879ca Mon Sep 17 00:00:00 2001 From: David Garvey Date: Wed, 15 Jan 2025 17:30:03 +0100 Subject: [PATCH] yaml formatting --- .../healthcheck-blackbox/docker-compose.yml | 2 +- .../provisioning/dashboards/provider.yaml | 1 + .../provisioning/datasources/prometheus.yaml | 1 + .../volumes/prometheus/blackbox.yaml | 3 ++- .../volumes/prometheus/prometheus.yaml | 17 +++++++++-------- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/deployments/healthcheck-blackbox/docker-compose.yml b/deployments/healthcheck-blackbox/docker-compose.yml index e04ade46..bc9b14a0 100755 --- a/deployments/healthcheck-blackbox/docker-compose.yml +++ b/deployments/healthcheck-blackbox/docker-compose.yml @@ -34,7 +34,7 @@ services: command: - "--config.file=/etc/blackbox_exporter/config.yml" networks: - - tyk + - tyk volumes: grafana-data: diff --git a/deployments/healthcheck-blackbox/volumes/grafana/provisioning/dashboards/provider.yaml b/deployments/healthcheck-blackbox/volumes/grafana/provisioning/dashboards/provider.yaml index 10a36ac7..493bb11b 100644 --- a/deployments/healthcheck-blackbox/volumes/grafana/provisioning/dashboards/provider.yaml +++ b/deployments/healthcheck-blackbox/volumes/grafana/provisioning/dashboards/provider.yaml @@ -1,3 +1,4 @@ +--- apiVersion: 1 providers: diff --git a/deployments/healthcheck-blackbox/volumes/grafana/provisioning/datasources/prometheus.yaml b/deployments/healthcheck-blackbox/volumes/grafana/provisioning/datasources/prometheus.yaml index dd8da401..78125951 100644 --- a/deployments/healthcheck-blackbox/volumes/grafana/provisioning/datasources/prometheus.yaml +++ b/deployments/healthcheck-blackbox/volumes/grafana/provisioning/datasources/prometheus.yaml @@ -1,3 +1,4 @@ +--- apiVersion: 1 datasources: diff --git a/deployments/healthcheck-blackbox/volumes/prometheus/blackbox.yaml b/deployments/healthcheck-blackbox/volumes/prometheus/blackbox.yaml index f16cf251..afb7eeed 100644 --- a/deployments/healthcheck-blackbox/volumes/prometheus/blackbox.yaml +++ b/deployments/healthcheck-blackbox/volumes/prometheus/blackbox.yaml @@ -1,3 +1,4 @@ +--- modules: http_200_json_status: prober: http @@ -10,7 +11,7 @@ modules: fail_if_body_not_matches_regexp: - '"status"\s*:\s*"(ok|pass)"' # Accept "ok" or "pass", so can be used across Gateway, Dashboard and MDCB tls_config: - insecure_skip_verify: true # Disables certificate validation for self-signed cert used by Tyk Gateway 2 + insecure_skip_verify: true # Disables certificate validation for self-signed cert used by Tyk Gateway 2 http_200: prober: http timeout: 5s diff --git a/deployments/healthcheck-blackbox/volumes/prometheus/prometheus.yaml b/deployments/healthcheck-blackbox/volumes/prometheus/prometheus.yaml index b232d8e9..6e43d812 100644 --- a/deployments/healthcheck-blackbox/volumes/prometheus/prometheus.yaml +++ b/deployments/healthcheck-blackbox/volumes/prometheus/prometheus.yaml @@ -1,3 +1,4 @@ +--- global: scrape_interval: 15s evaluation_interval: 15s @@ -6,17 +7,17 @@ rule_files: - /etc/prometheus/alert.rules scrape_configs: - - job_name: 'tyk_component_status' + - job_name: "tyk_component_status" metrics_path: /probe params: module: [http_200_json_status] static_configs: - targets: - - http://tyk-gateway:8080/hello - - https://tyk-gateway-2:8080/hello - - http://tyk-worker-gateway:8080/hello - - http://tyk-dashboard:3000/hello - - http://tyk-mdcb:8181/readiness + - http://tyk-gateway:8080/hello + - https://tyk-gateway-2:8080/hello + - http://tyk-worker-gateway:8080/hello + - http://tyk-dashboard:3000/hello + - http://tyk-mdcb:8181/readiness relabel_configs: - source_labels: [__address__] target_label: __param_target @@ -24,13 +25,13 @@ scrape_configs: target_label: instance - target_label: __address__ replacement: blackbox-exporter:9115 - - job_name: 'api_status' + - job_name: "api_status" metrics_path: /probe params: module: [http_200] static_configs: - targets: - - http://tyk-gateway:8080/basic-open-api/get + - http://tyk-gateway:8080/basic-open-api/get relabel_configs: - source_labels: [__address__] target_label: __param_target