Dont run alloy client on monitor

This commit is contained in:
Micke Nordin 2024-10-17 10:31:04 +02:00
parent 7a299bcb56
commit 4e349a1223
Signed by: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 28 additions and 2 deletions

View file

@ -4,8 +4,6 @@
sunet::invent::client: sunet::invent::client:
export_endpoint: https://ni-frontend-test.sunet.se export_endpoint: https://ni-frontend-test.sunet.se
invent_retention_days: 1 invent_retention_days: 1
sunet::otel::alloy:
otel_receiver: monitor-test.streams.sunet.se
'^internal-dco-test-k8sc-[0-9].streams.sunet.se$': '^internal-dco-test-k8sc-[0-9].streams.sunet.se$':
sunet::microk8s::node: sunet::microk8s::node:
channel: 1.28/stable channel: 1.28/stable
@ -23,6 +21,8 @@
- se-fre-lb-1.sunet.se - se-fre-lb-1.sunet.se
- se-tug-lb-1.sunet.se - se-tug-lb-1.sunet.se
port: '443' port: '443'
sunet::otel::alloy:
otel_receiver: monitor-test.streams.sunet.se
'^internal-dco-test-k8sw-[0-9].streams.sunet.se$': '^internal-dco-test-k8sw-[0-9].streams.sunet.se$':
sunet::microk8s::node: sunet::microk8s::node:
channel: 1.28/stable channel: 1.28/stable
@ -33,6 +33,8 @@
- internal-dco-test-k8sw-1.streams.sunet.se - internal-dco-test-k8sw-1.streams.sunet.se
- internal-dco-test-k8sw-2.streams.sunet.se - internal-dco-test-k8sw-2.streams.sunet.se
- internal-dco-test-k8sw-3.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$': '^internal-dco-test-monitor-[0-9].streams.sunet.se$':
sunet::dockerhost2: sunet::dockerhost2:
sunet::naemon_monitor: sunet::naemon_monitor:
@ -67,3 +69,5 @@
sunet::satosa: sunet::satosa:
satosa_tag: 8.4.0 satosa_tag: 8.4.0
dehydrated_name: idp-proxy-test.streams.sunet.se dehydrated_name: idp-proxy-test.streams.sunet.se
sunet::otel::alloy:
otel_receiver: monitor-test.streams.sunet.se

View file

@ -48,6 +48,17 @@ satosa_proxy_conf:
saml2_backend: saml2_backend:
config: config:
sp_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 key_file: backend.key
cert_file: backend.crt cert_file: backend.crt
encryption_keypairs: encryption_keypairs:
@ -86,6 +97,17 @@ saml2_frontend:
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST: <name>/sso/post urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST: <name>/sso/post
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect: <name>/sso/redirect urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect: <name>/sso/redirect
idp_config: 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 key_file: frontend.key
cert_file: frontend.crt cert_file: frontend.crt
metadata: metadata: