Skip to content

Commit

Permalink
fix: restore blackbox alerting rules and rabbitmq alert size
Browse files Browse the repository at this point in the history
restores blackbox alerting rules and rabbitmq alert size from
cb440e2

which appears inadvertently removed in
3dfc4af

Also, it puts back the textfile collector stuff in values.yaml for Prometheus,
inadvertently removed in the same commit, and also added by the2hill like
the stuff from cb440, but in
3d2f500

JIRA:OSPC-689
  • Loading branch information
awfabian-rs committed Oct 29, 2024
1 parent 856c7db commit 667b592
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
26 changes: 26 additions & 0 deletions base-kustomize/prometheus/alerting_rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,32 @@ additionalPrometheusRulesMap:
annotations:
summary: MySQL restarted (instance {{ $labels.instance }})
description: "MySQL has just been restarted, less than one minute ago on {{ $labels.instance }}.\n VALUE = {{ $value }}\n LABELS = {{ $labels }}"
blackbox-alerts:
groups:
- name: Blackbox Alerts
rules:
- alert: TLS certificate expiring
expr: (probe_ssl_earliest_cert_expiry - time())/86400 < 60
labels:
severity: warning
annotations:
summary: "SSL certificate will expire soon on (instance {{ $labels.instance }})"
description: "SSL certificate expires within 60 days\n VALUE = {{ $value }}\n LABELS: {{ $labels }}"
- alert: TLS certificate expiring
expr: (probe_ssl_earliest_cert_expiry - time())/86400 < 30
labels:
severity: critical
annotations:
summary: "SSL certificate will expire soon on (instance {{ $labels.instance }})"
description: "SSL certificate expires within 30 days\n VALUE = {{ $value }}\n LABELS: {{ $labels }}"
- alert: Service Down
expr: probe_success == 0
for: 2m
labels:
severity: critical
annotations:
summary: "Service probe has failed for more than two minutes on (instance {{ $labels.instance }})"
description: "Service probe has failed for more than two minutes \n LABELS: {{ $labels }}"
volume-alerts:
groups:
- name: Volume Alerts
Expand Down
7 changes: 7 additions & 0 deletions base-kustomize/prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2016,9 +2016,16 @@ prometheus-node-exporter:
##
jobLabel: node-exporter
releaseLabel: true
extraHostVolumeMounts:
- name: text-file-collector
hostPath: /opt/node_exporter/textfile_collector
mountPath: /var/lib/node_exporter/textfile_collector
readOnly: true
mountPropagation: HostToContainer
extraArgs:
- --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/)
- --collector.filesystem.fs-types-exclude=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$
- --collector.textfile.directory=/var/lib/node_exporter/textfile_collector
service:
portName: http-metrics
prometheus:
Expand Down

0 comments on commit 667b592

Please sign in to comment.