Skip to content
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

Jump to bottom

Update the Kubernetes Proxy monitor for OpenShift clusters #810

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Update the Kubernetes Proxy monitor for OpenShift clusters #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- Adopt new control-plane node toleration [#814](https://github.com/signalfx/splunk-otel-collector-chart/pull/814)

### Changed

- Update the Kubernetes Proxy monitor for OpenShift clusters to start using secure ports 9101 or 29101 with authentication [#810](https://github.com/signalfx/splunk-otel-collector-chart/pull/810)

## [0.78.0] - 2023-06-07

This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.78.1](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.78.1).
Expand Down
7 changes: 5 additions & 2 deletions examples/distribution-openshift/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,12 @@ data:
config:
extraDimensions:
metric_source: kubernetes-proxy
port: 29101
skipVerify: true
type: kubernetes-proxy
rule: type == "pod" && labels["app"] == "sdn"
useHTTPS: true
useServiceAccount: true
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
rule: type == "port" && pod.labels["app"] == "sdn" && (port == 9101 || port
== 29101)
smartagent/kubernetes-scheduler:
config:
extraDimensions:
Expand Down
2 changes: 1 addition & 1 deletion examples/distribution-openshift/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 5015b9567107e9b822bc7f80d80f9a90ecc1e37288493008310feaf2c5077723
checksum/config: 9308e59c21f2728caccbf91037441f223382a6ccb0ca2c8078abd4a70cd55c78
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
8 changes: 5 additions & 3 deletions helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ receivers:

# Receivers for collecting k8s control plane metrics.
# Distributions besides Kubernetes and Openshift are not supported.
# Verified with Kubernetes v1.22 and Openshift v4.9.
# Verified with Kubernetes v1.22 and Openshift v4.10.59.
{{- if or (eq .Values.distribution "openshift") (eq .Values.distribution "") }}
# Below, the TLS certificate verification is often skipped because the k8s default certificate is self signed and
# will fail the verification.
Expand Down Expand Up @@ -173,7 +173,7 @@ receivers:
{{- if .Values.agent.controlPlaneMetrics.proxy.enabled }}
smartagent/kubernetes-proxy:
{{- if eq .Values.distribution "openshift" }}
rule: type == "pod" && labels["app"] == "sdn"
rule: type == "port" && pod.labels["app"] == "sdn" && (port == 9101 || port == 29101)
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
{{- else }}
rule: type == "pod" && labels["k8s-app"] == "kube-proxy"
{{- end }}
Expand All @@ -182,7 +182,9 @@ receivers:
metric_source: kubernetes-proxy
type: kubernetes-proxy
{{- if eq .Values.distribution "openshift" }}
port: 29101
skipVerify: true
useHTTPS: true
useServiceAccount: true
{{- else }}
port: 10249
{{- end }}
Expand Down