Merge "Add missing packages for SAML2/Federation scenario"
diff --git a/docker/swarm/stack/monitoring/prometheus/init.yml b/docker/swarm/stack/monitoring/prometheus/init.yml
index 924c08c..b364259 100644
--- a/docker/swarm/stack/monitoring/prometheus/init.yml
+++ b/docker/swarm/stack/monitoring/prometheus/init.yml
@@ -9,6 +9,7 @@
prometheus_storage_heap_size: 3221225472
prometheus_storage_num_fingerprint_mutexes: 4096
prometheus_cors_origin: '.*'
+ prometheus_alert_resend_delay: "2m"
docker:
client:
stack:
@@ -43,6 +44,7 @@
PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
PROMETHEUS_EXTERNAL_URL: "${_param:prometheus_external_proto}://${_param:prometheus_external_url}:15010"
+ PROMETHEUS_ALERT_RESEND_DELAY: "${_param:prometheus_alert_resend_delay}"
# Backward compatibility for Prometheus 1.7
PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
diff --git a/docker/swarm/stack/monitoring/sf_notifier.yml b/docker/swarm/stack/monitoring/sf_notifier.yml
index ff32a0b..e2e5435 100644
--- a/docker/swarm/stack/monitoring/sf_notifier.yml
+++ b/docker/swarm/stack/monitoring/sf_notifier.yml
@@ -2,7 +2,7 @@
- system.prometheus.sf_notifier.container
parameters:
_param:
- sf_notifier_workers: 4
+ sf_notifier_workers: 8
sf_notifier_buffer_size: 32768
sf_notifier_alert_id_hash_func: sha256
docker:
diff --git a/jenkins/client/job/deploy/backupninja_backup.yml b/jenkins/client/job/deploy/backupninja_backup.yml
index 690ae0a..1089cfa 100644
--- a/jenkins/client/job/deploy/backupninja_backup.yml
+++ b/jenkins/client/job/deploy/backupninja_backup.yml
@@ -34,5 +34,5 @@
default: 'true'
trigger:
timer:
- enabled: true
+ enabled: false
spec: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"