Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing blackbox_tls work #201

Merged
merged 1 commit into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions bosh/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,31 +173,6 @@ instance_groups:
regex: .*
target_label: __address__
replacement: localhost:9115
- job_name: blackbox_tls
metrics_path: /probe
params:
module:
- http
dns_sd_configs:
- names: ((blackbox_tls-targets))
type: A
port: 443
relabel_configs:
- source_labels: [__address__]
regex: (.*)
target_label: __param_target
replacement: https://$1/
- source_labels: [__param_target]
target_label: instance
regex: (.*)
- source_labels: []
regex: .*
target_label: __address__
replacement: localhost:9115
- source_labels: [__meta_dns_name]
target_label: __param_hostname
- source_labels: [__meta_dns_name]
target_label: vhost
- job_name: node
file_sd_configs:
- files:
Expand Down
24 changes: 0 additions & 24 deletions bosh/opsfiles/rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,30 +277,6 @@
summary: Probe failing for {{$labels.instance}} for 5m
description: Check health of {{$labels.instance}}

- type: replace
path: /instance_groups/name=prometheus/jobs/name=prometheus2/properties/prometheus/custom_rules?/-
value:
name: blackbox_tls
rules:
- alert: SSLCertExpiringSoon
expr: probe_ssl_earliest_cert_expiry{job="blackbox_tls"} - time() < 86400 * 25
for: 10m
labels:
service: blackbox_tls
severity: warning
annotations:
summary: SSL certificate for {{$labels.vhost}} is expiring within 25d
description: Renew SSL certificate for {{$labels.vhost}}
- alert: ProbeFailing
expr: probe_success{job="blackbox_tls"} < 1
for: 5m
labels:
service: blackbox_tls
severity: warning
annotations:
summary: Probe failing for {{$labels.vhost}} for 5m
description: Check health of {{$labels.vhost}}

# CF Core - non-customer stuff.
- type: replace
path: /instance_groups/name=prometheus/jobs/name=prometheus2/properties/prometheus/custom_rules?/-
Expand Down
7 changes: 1 addition & 6 deletions bosh/varsfiles/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,4 @@ blackbox-targets:
- https://pages-staging.cloud.gov
- https://pages.cloud.gov
- https://admin.pages-staging.cloud.gov
- https://admin.pages.cloud.gov
blackbox_tls-targets:
- prometheus.fr.cloud.gov
- logs-platform.fr.cloud.gov
- alertmanager.fr.cloud.gov
- grafana.fr.cloud.gov
- https://admin.pages.cloud.gov
5 changes: 0 additions & 5 deletions bosh/varsfiles/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,4 @@ blackbox-targets:
- https://logs.fr-stage.cloud.gov
- https://ci.fr-stage.cloud.gov
- https://dashboard.fr-stage.cloud.gov
blackbox_tls-targets:
- graphana.fr-stage.cloud.gov
- prometheus.fr-stage.cloud.gov
- alertmanager.fr-stage.cloud.gov
- logs-platform.fr-stage.cloud.gov
opsgenie-url: https://api.opsgenie.com