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.

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

feat: upgrading chart dependencies #412

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## OpenTelemtry-Integration

### v0.0.73 / 2024-05-28
- [FEAT] Bump Helm chart dependencies.
- [FEAT] Allowing loadBalancing presets dns configs (timout and resolver interval).

### v0.0.72 / 2024-05-16
- [FEAT] Bump Collector to 0.100.0
- [FEAT] Add container CPU throttling metrics
Expand Down
10 changes: 5 additions & 5 deletions otel-integration/k8s-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: otel-integration
description: OpenTelemetry Integration
version: 0.0.72
version: 0.0.73
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
Expand All @@ -11,22 +11,22 @@ keywords:
dependencies:
- name: opentelemetry-collector
alias: opentelemetry-agent
version: "0.84.0"
version: "0.84.1"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent.enabled
- name: opentelemetry-collector
alias: opentelemetry-agent-windows
version: "0.84.0"
version: "0.84.1"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent-windows.enabled
- name: opentelemetry-collector
alias: opentelemetry-cluster-collector
version: "0.84.0"
version: "0.84.1"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-cluster-collector.enabled
- name: opentelemetry-collector
alias: opentelemetry-gateway
version: "0.84.0"
version: "0.84.1"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-gateway.enabled
sources:
Expand Down
2 changes: 2 additions & 0 deletions otel-integration/k8s-helm/tail-sampling-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ opentelemetry-agent:
enabled: true
routingKey: "traceID"
hostname: coralogix-opentelemetry-gateway
# dnsResolverInterval: 20s
# dnsResolverTimeout: 5s

config:
service:
Expand Down
87 changes: 44 additions & 43 deletions otel-integration/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ global:
defaultSubsystemName: "integration"
logLevel: "warn"
collectionInterval: "30s"
version: "0.0.72"
version: "0.0.73"

extensions:
kubernetesDashboard:
Expand Down Expand Up @@ -122,20 +122,22 @@ opentelemetry-agent:
enabled: false
collectionInterval: "{{.Values.global.collectionInterval}}"
metricsExpiration: 5m
histogramBuckets: [1ms, 4ms, 10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s]
histogramBuckets:
[1ms, 4ms, 10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s]
extraDimensions:
- name: http.method
- name: cgx.transaction
- name: cgx.transaction.root
# Configures the collector to export span metrics with different histogram bucket options
# for different applications. Applications are selected and routed to different pipelines
# using OTTL. For more information see https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/routingconnector
# Make sure to not use with spanMetrics preset, which applies single spanmetrics connector to tracing pipeline.
# Configures the collector to export span metrics with different histogram bucket options
# for different applications. Applications are selected and routed to different pipelines
# using OTTL. For more information see https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/routingconnector
# Make sure to not use with spanMetrics preset, which applies single spanmetrics connector to tracing pipeline.
spanMetricsMulti:
enabled: false
collectionInterval: "{{.Values.global.collectionInterval}}"
metricsExpiration: 5m
defaultHistogramBuckets: [1ms, 4ms, 10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s]
defaultHistogramBuckets:
[1ms, 4ms, 10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s]
configs: []
# - selector: route() where attributes["service.name"] == "one"
# histogramBuckets: [1s, 2s]
Expand Down Expand Up @@ -176,11 +178,11 @@ opentelemetry-agent:
prometheus:
config:
scrape_configs:
- job_name: opentelemetry-collector
scrape_interval: 30s
static_configs:
- targets:
- ${MY_POD_IP}:8888
- job_name: opentelemetry-collector
scrape_interval: 30s
static_configs:
- targets:
- ${MY_POD_IP}:8888
processors:
batch:
send_batch_size: 1024
Expand Down Expand Up @@ -254,9 +256,9 @@ opentelemetry-agent:
metrics:
address: ${MY_POD_IP}:8888
extensions:
- zpages
- pprof
- health_check
- zpages
- pprof
- health_check
pipelines:
metrics:
exporters:
Expand Down Expand Up @@ -362,9 +364,9 @@ opentelemetry-cluster-collector:
metrics:
enabled: false
instances:
- username: ""
password: ""
port: 3306
- username: ""
password: ""
port: 3306
extraLogs:
enabled: false
volumeMountName: ""
Expand Down Expand Up @@ -449,22 +451,22 @@ opentelemetry-cluster-collector:
- keep_keys(body["object"]["regarding"], ["kind", "name", "namespace"])
metricstransform/k8s-dashboard:
transforms:
- include: k8s.pod.phase
match_type: strict
action: insert
new_name: kube_pod_status_qos_class
- include: k8s.pod.status_reason
match_type: strict
action: insert
new_name: kube_pod_status_reason
- include: k8s.node.allocatable_cpu
match_type: strict
action: insert
new_name: kube_node_info
- include: k8s.container.ready
match_type: strict
action: insert
new_name: k8s.container.status.last_terminated_reason
- include: k8s.pod.phase
match_type: strict
action: insert
new_name: kube_pod_status_qos_class
- include: k8s.pod.status_reason
match_type: strict
action: insert
new_name: kube_pod_status_reason
- include: k8s.node.allocatable_cpu
match_type: strict
action: insert
new_name: kube_node_info
- include: k8s.container.ready
match_type: strict
action: insert
new_name: k8s.container.status.last_terminated_reason

transform/k8s-dashboard:
error_mode: ignore
Expand Down Expand Up @@ -553,9 +555,9 @@ opentelemetry-cluster-collector:
metrics:
address: ${MY_POD_IP}:8888
extensions:
- zpages
- pprof
- health_check
- zpages
- pprof
- health_check
pipelines:
logs:
exporters:
Expand Down Expand Up @@ -672,11 +674,11 @@ opentelemetry-gateway:
prometheus:
config:
scrape_configs:
- job_name: opentelemetry-collector
scrape_interval: 30s
static_configs:
- targets:
- ${MY_POD_IP}:8888
- job_name: opentelemetry-collector
scrape_interval: 30s
static_configs:
- targets:
- ${MY_POD_IP}:8888
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -714,7 +716,6 @@ opentelemetry-gateway:
receivers:
- otlp


tolerations:
- operator: Exists
ports:
Expand Down
Loading