Skip to content

feat(shield,common,sysdig-deploy): add support for ca-mon and eu2 regions #2349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat(shield,common,sysdig-deploy): add support for ca-mon and eu2 regions #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8108950
feat(shield): add support for ca-mon and eu2 regions
AlbertoBarba Aug 12, 2025
33c1d0c
feat(common,sysdig-deploy): add support for ca-mon and eu2 regions
AlbertoBarba Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/common/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type: library
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.3.1
version: 1.4.0

maintainers:
- name: AlbertoBarba
Expand Down
20 changes: 20 additions & 0 deletions charts/common/templates/_regions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"monitorApiEndpoint" "eu1.app.sysdig.com"
"secureApiEndpoint" "eu1.app.sysdig.com"
"secureUi" "eu1.app.sysdig.com/secure")
"eu2" (dict "collectorEndpoint" "ingest.eu2.sysdig.com"
"monitorApiEndpoint" "app.eu2.sysdig.com"
"secureApiEndpoint" "app.eu2.sysdig.com"
"secureUi" "app.eu2.sysdig.com/secure")
"in1" (dict "collectorEndpoint" "ingest.in1.sysdig.com"
"monitorApiEndpoint" "app.in1.sysdig.com"
"secureApiEndpoint" "app.in1.sysdig.com"
Expand Down Expand Up @@ -39,6 +43,10 @@
"monitorApiEndpoint" "br-sao.monitoring.cloud.ibm.com"
"secureApiEndpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
"secureUi" "br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-monitor" (dict "collectorEndpoint" "ingest.ca-mon.monitoring.cloud.ibm.com"
"monitorApiEndpoint" "ca-mon.monitoring.cloud.ibm.com"
"secureApiEndpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
"secureUi" "ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-monitor" (dict "collectorEndpoint" "ingest.ca-tor.monitoring.cloud.ibm.com"
"monitorApiEndpoint" "ca-tor.monitoring.cloud.ibm.com"
"secureApiEndpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -75,6 +83,10 @@
"monitorApiEndpoint" "private.br-sao.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
"secureUi" "private.br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-private-monitor" (dict "collectorEndpoint" "ingest.private.ca-mon.monitoring.cloud.ibm.com"
"monitorApiEndpoint" "private.ca-mon.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
"secureUi" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-private-monitor" (dict "collectorEndpoint" "ingest.private.ca-tor.monitoring.cloud.ibm.com"
"monitorApiEndpoint" "private.ca-tor.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -111,6 +123,10 @@
"monitorApiEndpoint" "br-sao.monitoring.cloud.ibm.com"
"secureApiEndpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
"secureUi" "br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-secure" (dict "collectorEndpoint" "ingest.ca-mon.security-compliance-secure.cloud.ibm.com"
"monitorApiEndpoint" "ca-mon.monitoring.cloud.ibm.com"
"secureApiEndpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
"secureUi" "ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-secure" (dict "collectorEndpoint" "ingest.ca-tor.security-compliance-secure.cloud.ibm.com"
"monitorApiEndpoint" "ca-tor.monitoring.cloud.ibm.com"
"secureApiEndpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -147,6 +163,10 @@
"monitorApiEndpoint" "private.br-sao.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
"secureUi" "private.br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-private-secure" (dict "collectorEndpoint" "ingest.private.ca-mon.security-compliance-secure.cloud.ibm.com"
"monitorApiEndpoint" "private.ca-mon.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
"secureUi" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-private-secure" (dict "collectorEndpoint" "ingest.private.ca-tor.security-compliance-secure.cloud.ibm.com"
"monitorApiEndpoint" "private.ca-tor.monitoring.cloud.ibm.com"
"secureApiEndpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down
25 changes: 25 additions & 0 deletions charts/shield/templates/common/_regions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
"monitor_api_endpoint" "eu1.app.sysdig.com"
"secure_api_endpoint" "eu1.app.sysdig.com"
"secure_ui" "eu1.app.sysdig.com/secure")
"eu2" (dict "collector_endpoint" "ingest.eu2.sysdig.com"
"monitor_api_endpoint" "app.eu2.sysdig.com"
"secure_api_endpoint" "app.eu2.sysdig.com"
"secure_ui" "app.eu2.sysdig.com/secure")
"eu2-alt" (dict "collector_endpoint" "ingest-alt.eu2.sysdig.com"
"monitor_api_endpoint" "app.eu2.sysdig.com"
"secure_api_endpoint" "app.eu2.sysdig.com"
"secure_ui" "app.eu2.sysdig.com/secure")
"in1" (dict "collector_endpoint" "ingest.in1.sysdig.com"
"monitor_api_endpoint" "app.in1.sysdig.com"
"secure_api_endpoint" "app.in1.sysdig.com"
Expand Down Expand Up @@ -71,6 +79,10 @@
"monitor_api_endpoint" "br-sao.monitoring.cloud.ibm.com"
"secure_api_endpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
"secure_ui" "br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-monitor" (dict "collector_endpoint" "ingest.ca-mon.monitoring.cloud.ibm.com"
"monitor_api_endpoint" "ca-mon.monitoring.cloud.ibm.com"
"secure_api_endpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
"secure_ui" "ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-monitor" (dict "collector_endpoint" "ingest.ca-tor.monitoring.cloud.ibm.com"
"monitor_api_endpoint" "ca-tor.monitoring.cloud.ibm.com"
"secure_api_endpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -107,6 +119,10 @@
"monitor_api_endpoint" "private.br-sao.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
"secure_ui" "private.br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-private-monitor" (dict "collector_endpoint" "ingest.private.ca-mon.monitoring.cloud.ibm.com"
"monitor_api_endpoint" "private.ca-mon.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
"secure_ui" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-private-monitor" (dict "collector_endpoint" "ingest.private.ca-tor.monitoring.cloud.ibm.com"
"monitor_api_endpoint" "private.ca-tor.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -143,6 +159,10 @@
"monitor_api_endpoint" "br-sao.monitoring.cloud.ibm.com"
"secure_api_endpoint" "br-sao.security-compliance-secure.cloud.ibm.com"
"secure_ui" "br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-secure" (dict "collector_endpoint" "ingest.ca-mon.security-compliance-secure.cloud.ibm.com"
"monitor_api_endpoint" "ca-mon.monitoring.cloud.ibm.com"
"secure_api_endpoint" "ca-mon.security-compliance-secure.cloud.ibm.com"
"secure_ui" "ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-secure" (dict "collector_endpoint" "ingest.ca-tor.security-compliance-secure.cloud.ibm.com"
"monitor_api_endpoint" "ca-tor.monitoring.cloud.ibm.com"
"secure_api_endpoint" "ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -179,6 +199,10 @@
"monitor_api_endpoint" "private.br-sao.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.br-sao.security-compliance-secure.cloud.ibm.com"
"secure_ui" "private.br-sao.security-compliance-secure.cloud.ibm.com")
"ca-mon-private-secure" (dict "collector_endpoint" "ingest.private.ca-mon.security-compliance-secure.cloud.ibm.com"
"monitor_api_endpoint" "private.ca-mon.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.ca-mon.security-compliance-secure.cloud.ibm.com"
"secure_ui" "private.ca-mon.security-compliance-secure.cloud.ibm.com")
"ca-tor-private-secure" (dict "collector_endpoint" "ingest.private.ca-tor.security-compliance-secure.cloud.ibm.com"
"monitor_api_endpoint" "private.ca-tor.monitoring.cloud.ibm.com"
"secure_api_endpoint" "private.ca-tor.security-compliance-secure.cloud.ibm.com"
Expand Down Expand Up @@ -250,6 +274,7 @@
{{- $altRegions := list
"au1-alt"
"eu1-alt"
"eu2-alt"
"in1-alt"
"me2-alt"
"us1-alt"
Expand Down
91 changes: 87 additions & 4 deletions charts/shield/tests/common/regions_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,112 @@
suite: Common - Regions
templates:
- templates/host/configmap.yaml
- templates/cluster/configmap.yaml
- templates/host/configmap-windows.yaml
release:
name: release-name
namespace: shield-namespace
values:
- ../values/base.yaml
tests:
- it: Sanity check for regions
- it: Sanity check for regions (host)
set:
sysdig_endpoint:
region: "eu1"
template: host/configmap.yaml
asserts:
- matchRegex:
path: data["dragent.yaml"]
pattern: |
collector: ingest-eu1.app.sysdig.com
collector_port: 6443
- matchRegex:
path: data["dragent.yaml"]
pattern: |
sysdig_api_endpoint: eu1.app.sysdig.com

- it: API endpoint validation
- it: Sanity check for alternate regions (host)
set:
sysdig_endpoint:
region: "us1"
region: "eu1-alt"
template: host/configmap.yaml
asserts:
- matchRegex:
path: data["dragent.yaml"]
pattern: |
sysdig_api_endpoint: secure.sysdig.com
collector: ingest-alt-eu1.app.sysdig.com
collector_port: 443
- matchRegex:
path: data["dragent.yaml"]
pattern: |
sysdig_api_endpoint: eu1.app.sysdig.com

- it: Sanity check for regions (cluster)
set:
sysdig_endpoint:
region: "eu1"
api_url:
collector:
host:
port:
template: cluster/configmap.yaml
asserts:
- matchRegex:
path: data["cluster-shield.yaml"]
pattern: |
sysdig_endpoint:
region: eu1

- it: Sanity check for alternate regions (cluster)
set:
sysdig_endpoint:
region: "eu1-alt"
api_url:
collector:
host:
port:
template: cluster/configmap.yaml
asserts:
- matchRegex:
path: data["cluster-shield.yaml"]
pattern: |
sysdig_endpoint:
region: eu1-alt

- it: Sanity check for regions (host-windows)
set:
host_windows:
enabled: true
sysdig_endpoint:
region: "eu1"
api_url:
collector:
host:
port:
template: host/configmap-windows.yaml
asserts:
- matchRegex:
path: data["host-shield.yaml"]
pattern: |
sysdig_endpoint:
collector: {}
region: eu1

- it: Sanity check for alternate regions (host-windows)
set:
host_windows:
enabled: true
sysdig_endpoint:
region: "eu1-alt"
api_url:
collector:
host:
port:
template: host/configmap-windows.yaml
asserts:
- matchRegex:
path: data["host-shield.yaml"]
pattern: |
sysdig_endpoint:
collector: {}
region: eu1-alt
6 changes: 6 additions & 0 deletions charts/shield/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@
"br-sao-private-monitor",
"br-sao-private-secure",
"br-sao-secure",
"ca-mon-monitor",
"ca-mon-private-monitor",
"ca-mon-private-secure",
"ca-mon-secure",
"ca-tor-monitor",
"ca-tor-private-monitor",
"ca-tor-private-secure",
Expand All @@ -193,6 +197,8 @@
"eu-gb-secure",
"eu1",
"eu1-alt",
"eu2",
"eu2-alt",
"in1",
"in1-alt",
"jp-osa-monitor",
Expand Down
2 changes: 1 addition & 1 deletion charts/sysdig-deploy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- name: common
# repository: https://charts.sysdig.com
repository: file://../common
version: ~1.3.1
version: ~1.4.0
- name: node-analyzer
# repository: https://charts.sysdig.com
repository: file://../node-analyzer
Expand Down
Loading