Skip to content

feat: add hubble and dns proxy #38

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

Open
matmerr wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: add hubble and dns proxy #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
daa18e1
add hubble and dns proxy
matmerr May 14, 2025
b5bebdf
only in dns proxy config
matmerr May 14, 2025
618398a
port quotes
matmerr May 14, 2025
fad9c13
remove or
matmerr May 14, 2025
0fe3532
add missing var
matmerr May 14, 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
24 changes: 22 additions & 2 deletions clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT false}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT "prometheus"}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL "30s"}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE false}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST "(.*)"}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT 9965}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL "30s"}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST "(.*)"}}

{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}

{{if or $PROMETHEUS_SCRAPE_CILIUM_AGENT $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}

apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
Expand All @@ -13,8 +19,22 @@ metadata:
namespace: monitoring
spec:
podMetricsEndpoints:
{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
- interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL }}
port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}
port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}"
metricRelabelings:
- sourceLabels: [__name__]
regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST }}
action: keep
{{end}}
{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
- interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL }}
port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT }}"
metricRelabelings:
- sourceLabels: [__name__]
regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST }}
action: keep
{{end}}
jobLabel: k8s-app
selector:
matchLabels:
Expand Down
31 changes: 31 additions & 0 deletions ...ader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumStandaloneDNSProxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT 9961}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL "30s"}}
{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST "(.*)"}}

{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY}}

apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
labels:
k8s-app: acns-security-agent
name: cilium-standalone-dns-proxy
namespace: monitoring
spec:
podMetricsEndpoints:
{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY }}
- interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL }}
port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT }}"
metricRelabelings:
- sourceLabels: [__name__]
regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST }}
action: keep
{{end}}
jobLabel: k8s-app
selector:
matchLabels:
k8s-app: acns-security-agent
namespaceSelector:
matchNames:
- kube-system
{{end}}