From 7e9047ce270416bd97efb1523b54baf9bf1a0ad0 Mon Sep 17 00:00:00 2001 From: Michael Haehnel Date: Thu, 15 Jun 2023 13:04:07 +0200 Subject: [PATCH] DEV-1100 Pull elastic docker images from stage harbor --- group_vars/all/elastic.yml | 4 ++++ group_vars/stage_demompmx/plain.yml | 3 --- group_vars/stage_prodnso/plain.yml | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/group_vars/all/elastic.yml b/group_vars/all/elastic.yml index 2c968bf..ea692ff 100644 --- a/group_vars/all/elastic.yml +++ b/group_vars/all/elastic.yml @@ -1,2 +1,6 @@ --- elastic_cluster_settings_max_shards: 1000 + +# We use a proxy due to blocked ip addresses by elastic +filebeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/filebeat" +metricbeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/metricbeat" diff --git a/group_vars/stage_demompmx/plain.yml b/group_vars/stage_demompmx/plain.yml index 25872d8..fcd4892 100644 --- a/group_vars/stage_demompmx/plain.yml +++ b/group_vars/stage_demompmx/plain.yml @@ -22,9 +22,6 @@ shared_service_hostname_harbor: "{{ shared_service_kube_hostname_harbor }}" shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}" -filebeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/filebeat" -metricbeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/metricbeat" - connect_jwt_enabled: true connect_jwt_secret: "06aa5b66a2e241b7af934035df79e8a8" iam_jwt_enabled: true diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index 019ba6f..f94eabf 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/group_vars/stage_prodnso/plain.yml @@ -12,9 +12,6 @@ shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain_env }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain_env }}" shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain_env }}" -filebeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/filebeat" -metricbeat_image_name: "{{ shared_service_hostname_harbor }}/docker.elastic.co/beats/metricbeat" - connect_jwt_enabled: true connect_jwt_secret: "908ae14462d049d3be84964ef379c7c6" iam_jwt_enabled: true @@ -53,3 +50,6 @@ alertmanager_admin_password_htpasswd: "{{ alertmanager_admin_password_htpasswd_v netgo_msteams_hook_cd: "{{ netgo_msteams_hook_cd_vault }}" netgo_msteams_hook_alerting: "{{ netgo_msteams_hook_alerting_vault }}" + +custom_stage_plattform_users: + - hp.wissenbach