Page MenuHomePhorge
Files F124739858

D5882.1778955819.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D5882.1778955819.diff
View Options

diff --git a/helm/templates/alertmanager-configmap.yaml b/helm/templates/alertmanager-configmap.yaml
--- a/helm/templates/alertmanager-configmap.yaml
+++ b/helm/templates/alertmanager-configmap.yaml
@@ -6,10 +6,12 @@
data:
alertmanager.yaml: |
global:
- smtp_smarthost: 'postfix:587'
+ smtp_smarthost: 'external-smtp:25'
smtp_from: 'alertmanager@{{ .Values.domainName }}'
smtp_auth_username: '{{ .Values.serviceAccounts.monitoring1.username }}'
smtp_auth_password: '{{ .Values.serviceAccounts.monitoring1.password }}'
+ smtp_tls_config:
+ insecure_skip_verify: true
route:
receiver: 'operations-team'
diff --git a/helm/templates/cert-issuer.yaml b/helm/templates/cert-issuer.yaml
--- a/helm/templates/cert-issuer.yaml
+++ b/helm/templates/cert-issuer.yaml
@@ -12,5 +12,6 @@
solvers:
- http01:
ingress:
+ ingressClassName: haproxy
class: haproxy
{{- end }}
diff --git a/helm/templates/prometheus-configmap.yaml b/helm/templates/prometheus-configmap.yaml
--- a/helm/templates/prometheus-configmap.yaml
+++ b/helm/templates/prometheus-configmap.yaml
@@ -210,10 +210,10 @@
- target_label: __address__
replacement: localhost:9104
{{- end }}
- - job_name: blackbox-tcp-tls
+ - job_name: blackbox-tcp
honor_timestamps: true
params:
- module: [tcp_tls]
+ module: [tcp]
metrics_path: /probe
scheme: http
follow_redirects: true
@@ -229,7 +229,7 @@
replacement: localhost:9115
static_configs:
- targets:
- - {{ .Values.imap.host }}:993
+ - {{ .Values.imap.host }}:143
- job_name: blackbox-lmtp
honor_timestamps: true
params:
@@ -396,12 +396,12 @@
query_response:
- expect: "^220 ([^ ]+) ESMTP (.+)$"
- send: "EHLO prober\r"
- - expect: "^250-STARTTLS"
+ - expect: "^250[- ]STARTTLS"
- send: "STARTTLS\r"
- expect: "^220"
- starttls: true
- send: "EHLO prober\r"
- - expect: "^250-AUTH"
+ - expect: "^250[- ]AUTH"
- send: "QUIT\r"
tls_config:
server_name: "{{ template "kolab.websiteDomain" . }}"
@@ -472,7 +472,7 @@
- alert: IMAPReplicaOutOfSync
annotations:
summary: The IMAP replica is not in sync with the primary.
- expr: abs(cyrus_usage_mailboxes{instance=~"imap:.*"} - ignoring (instance) cyrus_usage_mailboxes{instance=~"imap-replica:.*"}) == 0
+ expr: abs(cyrus_usage_mailboxes{instance=~"imap:.*"} - ignoring (instance) cyrus_usage_mailboxes{instance=~"imap-replica:.*"}) != 0
for: 1m
labels:
severity: critical
diff --git a/helm/templates/proxy-configmap.yaml b/helm/templates/proxy-configmap.yaml
--- a/helm/templates/proxy-configmap.yaml
+++ b/helm/templates/proxy-configmap.yaml
@@ -54,11 +54,11 @@
map $dav_backend $backend_url {
{{- if .Values.proxy.forceRoundcubeBackend }}
- default http://roundcube/;
- alternative http://roundcube/;
+ default http://roundcube.{{ .Release.Namespace }}.svc.cluster.local/;
+ alternative http://roundcube.{{ .Release.Namespace }}.svc.cluster.local/;
{{- else }}
- default http://{{ .Values.imap.host }}/dav/;
- alternative http://roundcube/dav/;
+ default http://{{ .Values.imap.host }}.{{ .Release.Namespace }}.svc.cluster.local;
+ alternative http://roundcube.{{ .Release.Namespace }}.svc.cluster.local;
{{- end }}
}
@@ -357,7 +357,7 @@
auth_request_set $dav_backend $upstream_http_davbackend;
# We can't dynamically set the proxy target with vanilla nginx. We can only select between a list of predefined options via map.
- proxy_pass $backend_url;
+ proxy_pass $backend_url$request_uri;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

File Metadata

Mime Type
text/plain
Expires
Sat, May 16, 6:23 PM (5 d, 2 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18927777
Default Alt Text
D5882.1778955819.diff (4 KB)

Event Timeline