Skip to content

Commit 66af7a2

Browse files
pstranak-swpstranak-sw
authored
Merge pull request #1084 from solarwinds/release_4_7_1
Release 4.7.1
2 parents 01ba7e2 + 0ac8805 commit 66af7a2

29 files changed

+586
-178
lines changed

‎deploy/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: swo-k8s-collector
3-
version: 4.7.0
4-
appVersion: 0.127.2
3+
version: 4.7.1
4+
appVersion: 0.127.4
55
description: SolarWinds Kubernetes Integration
66
keywords:
77
- monitoring

‎deploy/helm/events-collector-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ extensions:
5454
{{- end }}
5555
health_check:
5656
endpoint: 0.0.0.0:13133
57+
{{- if .Values.diagnostics.profiling.enabled }}
58+
pprof:
59+
endpoint: localhost:{{ .Values.diagnostics.profiling.port }}
60+
{{- end }}
5761

5862
connectors:
5963
{{- if and .Values.otel.manifests.enabled .Values.otel.manifests.keepalive_events.enabled }}
@@ -279,6 +283,7 @@ processors:
279283
- set(log.attributes["k8s.ingress.name"], log.body["metadata"]["name"]) where log.body["kind"] == "Ingress" or log.body["kind"] == "VirtualService"
280284
- set(log.attributes["sw.k8s.ingress.type"], log.body["kind"]) where log.body["kind"] == "Ingress" or log.body["kind"] == "VirtualService"
281285
- set(log.attributes["k8s.object.kind"], log.body["kind"]) where log.body["kind"] != nil
286+
- set(log.attributes["k8s.object.name"], log.body["metadata"]["name"]) where log.body["metadata"]["name"] != nil
282287

283288
# There are some attributes added by k8sobjects receiver, SWO do not need them so removing it
284289
- delete_key(log.attributes, "k8s.resource.name")
@@ -465,6 +470,9 @@ service:
465470
- file_storage/manifests
466471
{{- end}}
467472
- health_check
473+
{{- if .Values.diagnostics.profiling.enabled }}
474+
- pprof
475+
{{- end }}
468476
pipelines:
469477
{{- if .Values.otel.events.enabled }}
470478
logs:

‎deploy/helm/gateway-collector-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ extensions:
2727
{{- end }}
2828
health_check:
2929
endpoint: 0.0.0.0:13133
30+
{{- if .Values.diagnostics.profiling.enabled }}
31+
pprof:
32+
endpoint: localhost:{{ .Values.diagnostics.profiling.port }}
33+
{{- end }}
3034

3135
processors:
3236
batch:
@@ -200,6 +204,9 @@ service:
200204
- file_storage/sending_queue
201205
{{- end }}
202206
- health_check
207+
{{- if .Values.diagnostics.profiling.enabled }}
208+
- pprof
209+
{{- end }}
203210
pipelines:
204211
metrics:
205212
exporters:

‎deploy/helm/metrics-collector-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ extensions:
2626
{{- end }}
2727
health_check:
2828
endpoint: 0.0.0.0:13133
29+
{{- if .Values.diagnostics.profiling.enabled }}
30+
pprof:
31+
endpoint: localhost:{{ .Values.diagnostics.profiling.port }}
32+
{{- end }}
2933

3034
processors:
3135
k8sattributes:
@@ -1056,6 +1060,9 @@ service:
10561060
- file_storage/sending_queue
10571061
{{- end }}
10581062
- health_check
1063+
{{- if .Values.diagnostics.profiling.enabled }}
1064+
- pprof
1065+
{{- end }}
10591066
pipelines:
10601067
{{- if and (and .Values.otel.metrics.extra_scrape_metrics (or (not .Values.otel.metrics.autodiscovery.prometheusEndpoints.enabled) .Values.otel.metrics.force_extra_scrape_metrics)) .Values.otel.metrics.prometheus.url }}
10611068
metrics/prometheus-server:

‎deploy/helm/metrics-discovery-config.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ extensions:
2828
endpoint: 0.0.0.0:13133
2929
k8s_observer:
3030
auth_type: serviceAccount
31-
observe_pods: true
31+
observe_pods: true
32+
{{- if .Values.diagnostics.profiling.enabled }}
33+
pprof:
34+
endpoint: localhost:{{ .Values.diagnostics.profiling.port }}
35+
{{- end }}
3236

3337
processors:
3438
k8sattributes:
@@ -164,6 +168,9 @@ service:
164168
{{- end }}
165169
- health_check
166170
- k8s_observer
171+
{{- if .Values.diagnostics.profiling.enabled }}
172+
- pprof
173+
{{- end }}
167174
pipelines:
168175

169176
{{ include "common-discovery-config.pipelines" (tuple . "receiver_creator/discovery" "forward/metric-exporter") | indent 4 }}

‎deploy/helm/node-collector-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ extensions:
3535
observe_pods: true
3636
observe_nodes: true
3737
{{- end }}
38+
{{- if .Values.diagnostics.profiling.enabled }}
39+
pprof:
40+
endpoint: localhost:{{ .Values.diagnostics.profiling.port }}
41+
{{- end }}
3842

3943
processors:
4044
memory_limiter:
@@ -610,6 +614,9 @@ service:
610614
{{- if and .Values.otel.metrics.enabled (or (not .Values.aws_fargate.enabled) .Values.otel.metrics.autodiscovery.prometheusEndpoints.enabled) }}
611615
- k8s_observer
612616
{{- end}}
617+
{{- if .Values.diagnostics.profiling.enabled }}
618+
- pprof
619+
{{- end }}
613620
pipelines:
614621
{{- if and .Values.otel.logs.enabled (or .Values.otel.logs.container (and (not .isWindows) .Values.otel.logs.journal))}}
615622
{{- if .Values.otel.logs.container }}

‎deploy/helm/templates/NOTES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,8 @@ WARNING: Network observability using Beyla is experimental
151151
WARNING: Value `otel.metrics.otlp_endpoint` was deprecated and will be removed in a future release. Please use `otel.gateway.otlp_endpoint` instead.
152152
{{- println -}}
153153
{{- end -}}
154+
155+
{{- if .Values.diagnostics.profiling.enabled -}}
156+
WARNING: Collector profiling is enabled. Profiler endpoint is available on port {{ .Values.diagnostics.profiling.port }}.
157+
{{- println -}}
158+
{{- end -}}

‎deploy/helm/templates/_common-discovery-config.tpl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,57 +283,65 @@ solarwindsentity/istio-workload-workload:
283283
conditions: []
284284
context: "metric"
285285
attributes:
286+
action: "update"
286287
- type: KubernetesCommunicatesWith
287288
source_entity: KubernetesDeployment
288289
destination_entity: KubernetesStatefulSet
289290
conditions: []
290291
context: "metric"
291292
attributes:
293+
action: "update"
292294
- type: KubernetesCommunicatesWith
293295
source_entity: KubernetesDeployment
294296
destination_entity: KubernetesDaemonSet
295297
conditions: []
296298
context: "metric"
297299
attributes:
300+
action: "update"
298301
# source KubernetesStatefulSet
299302
- type: KubernetesCommunicatesWith
300303
source_entity: KubernetesStatefulSet
301304
destination_entity: KubernetesDeployment
302305
conditions: []
303306
context: "metric"
304307
attributes:
308+
action: "update"
305309
- type: KubernetesCommunicatesWith
306310
source_entity: KubernetesStatefulSet
307311
destination_entity: KubernetesStatefulSet
308312
conditions: []
309313
context: "metric"
310314
attributes:
315+
action: "update"
311316
- type: KubernetesCommunicatesWith
312317
source_entity: KubernetesStatefulSet
313318
destination_entity: KubernetesDaemonSet
314319
conditions: []
315320
context: "metric"
316321
attributes:
322+
action: "update"
317323
# source KubernetesDaemonSet
318324
- type: KubernetesCommunicatesWith
319325
source_entity: KubernetesDaemonSet
320326
destination_entity: KubernetesDeployment
321327
conditions: []
322328
context: "metric"
323329
attributes:
330+
action: "update"
324331
- type: KubernetesCommunicatesWith
325332
source_entity: KubernetesDaemonSet
326333
destination_entity: KubernetesStatefulSet
327334
conditions: []
328335
context: "metric"
329336
attributes:
337+
action: "update"
330338
- type: KubernetesCommunicatesWith
331339
source_entity: KubernetesDaemonSet
332340
destination_entity: KubernetesDaemonSet
333341
conditions: []
334342
context: "metric"
335343
attributes:
336-
344+
action: "update"
337345

338346
solarwindsentity/istio-workload-service:
339347
source_prefix: "source."
@@ -377,6 +385,7 @@ solarwindsentity/istio-workload-service:
377385
entities:
378386
- type: "PublicNetworkLocation"
379387
context: "metric"
388+
action: "update"
380389
relationships:
381390
# source KubernetesDeployment
382391
- type: KubernetesCommunicatesWith
@@ -385,38 +394,44 @@ solarwindsentity/istio-workload-service:
385394
conditions: []
386395
context: "metric"
387396
attributes:
397+
action: "update"
388398
- type: KubernetesCommunicatesWith
389399
source_entity: KubernetesDeployment
390400
destination_entity: PublicNetworkLocation
391401
conditions: []
392402
context: "metric"
393403
attributes:
404+
action: "update"
394405
# source KubernetesStatefulSet
395406
- type: KubernetesCommunicatesWith
396407
source_entity: KubernetesStatefulSet
397408
destination_entity: KubernetesService
398409
conditions: []
399410
context: "metric"
400411
attributes:
412+
action: "update"
401413
- type: KubernetesCommunicatesWith
402414
source_entity: KubernetesStatefulSet
403415
destination_entity: PublicNetworkLocation
404416
conditions: []
405417
context: "metric"
406418
attributes:
419+
action: "update"
407420
# source KubernetesDaemonSet
408421
- type: KubernetesCommunicatesWith
409422
source_entity: KubernetesDaemonSet
410423
destination_entity: KubernetesService
411424
conditions: []
412425
context: "metric"
413426
attributes:
427+
action: "update"
414428
- type: KubernetesCommunicatesWith
415429
source_entity: KubernetesDaemonSet
416430
destination_entity: PublicNetworkLocation
417431
conditions: []
418432
context: "metric"
419433
attributes:
434+
action: "update"
420435
{{- end }}
421436

422437
{{- define "common-discovery-config.pipelines" -}}

‎deploy/helm/templates/events-collector-statefulset.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,16 @@ spec:
125125
envFrom:
126126
- configMapRef:
127127
name: {{ include "common.fullname" (tuple . "-common-env") }}
128-
{{- if .Values.otel.events.telemetry.metrics.enabled }}
129128
ports:
129+
{{- if .Values.otel.events.telemetry.metrics.enabled }}
130130
- name: http
131131
containerPort: {{ (split ":" .Values.otel.events.telemetry.metrics.address)._1 }}
132132
protocol: TCP
133-
{{- end}}
133+
{{- end }}
134+
{{- if .Values.diagnostics.profiling.enabled }}
135+
- name: pprof
136+
containerPort: {{ .Values.diagnostics.profiling.port }}
137+
{{- end }}
134138
livenessProbe:
135139
httpGet:
136140
path: /

‎deploy/helm/templates/gateway/gateway-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ spec:
140140
containerPort: {{ (split ":" .Values.otel.gateway.telemetry.metrics.address)._1 }}
141141
protocol: TCP
142142
{{- end}}
143+
{{- if .Values.diagnostics.profiling.enabled }}
144+
- name: pprof
145+
containerPort: {{ .Values.diagnostics.profiling.port }}
146+
{{- end }}
143147
livenessProbe:
144148
httpGet:
145149
path: /

0 commit comments

Comments
 (0)