From 4e349a12235a5c21bd926fea041eb7af0f5fcf6d Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Thu, 17 Oct 2024 10:31:04 +0200 Subject: [PATCH] Dont run alloy client on monitor --- global/overlay/etc/puppet/cosmos-rules.yaml | 8 +++++-- .../overlay/etc/hiera/data/local.yaml | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 85f36b7..d753812 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -4,8 +4,6 @@ sunet::invent::client: export_endpoint: https://ni-frontend-test.sunet.se invent_retention_days: 1 - sunet::otel::alloy: - otel_receiver: monitor-test.streams.sunet.se '^internal-dco-test-k8sc-[0-9].streams.sunet.se$': sunet::microk8s::node: channel: 1.28/stable @@ -23,6 +21,8 @@ - se-fre-lb-1.sunet.se - se-tug-lb-1.sunet.se port: '443' + sunet::otel::alloy: + otel_receiver: monitor-test.streams.sunet.se '^internal-dco-test-k8sw-[0-9].streams.sunet.se$': sunet::microk8s::node: channel: 1.28/stable @@ -33,6 +33,8 @@ - internal-dco-test-k8sw-1.streams.sunet.se - internal-dco-test-k8sw-2.streams.sunet.se - internal-dco-test-k8sw-3.streams.sunet.se + sunet::otel::alloy: + otel_receiver: monitor-test.streams.sunet.se '^internal-dco-test-monitor-[0-9].streams.sunet.se$': sunet::dockerhost2: sunet::naemon_monitor: @@ -67,3 +69,5 @@ sunet::satosa: satosa_tag: 8.4.0 dehydrated_name: idp-proxy-test.streams.sunet.se + sunet::otel::alloy: + otel_receiver: monitor-test.streams.sunet.se diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml index 2b14e10..c348928 100644 --- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml +++ b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml @@ -48,6 +48,17 @@ satosa_proxy_conf: saml2_backend: config: sp_config: + organization: + display_name: SUNET Streams + name: SUNET Streams + url: https://sunet.se + contact_person: + - contact_type: technical + email_address: noc@sunet.se + given_name: Technical + - contact_type: support + email_address: noc@sunet.se + given_name: Support key_file: backend.key cert_file: backend.crt encryption_keypairs: @@ -86,6 +97,17 @@ saml2_frontend: urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST: /sso/post urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect: /sso/redirect idp_config: + organization: + display_name: SWAMID + name: SWAMID + url: https://sunet.se + contact_person: + - contact_type: technical + email_address: noc@sunet.se + given_name: Technical + - contact_type: support + email_address: noc@sunet.se + given_name: Support key_file: frontend.key cert_file: frontend.crt metadata: