Skip to content

Commit

Permalink
Merge pull request #203 from Sanketika-Obsrv/open-telemetry
Browse files Browse the repository at this point in the history
Open Telemetry Collector
  • Loading branch information
ravismula authored Nov 26, 2024
2 parents 65a66d1 + d0152e4 commit 8985b3e
Show file tree
Hide file tree
Showing 155 changed files with 10,181 additions and 1 deletion.
1 change: 1 addition & 0 deletions helmcharts/bootstrapper/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespaces:
- volume-autoscaler
- web-console
- config-api
- otel

global:
image:
Expand Down
9 changes: 9 additions & 0 deletions helmcharts/global-resource-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -679,3 +679,12 @@ hms:
requests:
cpu: 100m
memory: 1024Mi

opentelemetry-collector:
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 250m
memory: 512Mi
6 changes: 5 additions & 1 deletion helmcharts/global-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ defaults:
volume_autoscaler_namespace: &volume-autoscaler-namespace "volume-autoscaler"
hms_namespace: &hms_namespace "hms"
trino_namespace: &trino_namespace "trino"

opentelemetry-collector: &opentelemetry-collector "otel"

postgres:
pghost: &pghost "postgresql-hl.postgresql.svc.cluster.local"
obsrv_username: &psql-obsrv-user "obsrv"
Expand Down Expand Up @@ -204,6 +205,9 @@ druid: &druid
port: 8888
supervisorEndpoint: "indexer/v1/supervisor"

opentelemetry-collector:
namespace: *opentelemetry-collector

redis-denorm: &redis_denorm
namespace: *redis-namespace
host: redis-denorm-headless.redis.svc.cluster.local
Expand Down
12 changes: 12 additions & 0 deletions helmcharts/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ images: &images
repository: lakehouse-connector
tag: 1.1-RC

opentelemetry-collector: &opentelemetry-collector
repository: otel/opentelemetry-collector-contrib
tag: "latest"
digest: ""
# Public charts like bitnami etc
# Modyfying these charts involves many changes
# Hence we are keeping their original desgin
Expand Down Expand Up @@ -537,6 +541,14 @@ internal: &internal
image:
<<: *lakehouse-connector

opentelemetry-collector:
image:
<<: *opentelemetry-collector

opentelemetry-collector:
<<: *opentelemetry-collector
imagePullSecrets: *imagePullSecrets


## Sourcing internal as root element,
## should need arise
Expand Down
9 changes: 9 additions & 0 deletions helmcharts/kitchen/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ hudi)
cp -rf ../services/{hms,trino,lakehouse-connector} hudi/charts/
helm $cmd hudi ./hudi -n obsrv -f global-resource-values.yaml -f global-values.yaml -f images.yaml -f $cloud_file_name --debug
;;
otel)
rm -rf opentelemetry-collector
cp -rf ../obsrv opentelemetry-collector
cp -rf ../services/opentelemetry-collector opentelemetry-collector/charts/
helm $cmd opentelemetry-collector ./opentelemetry-collector -n obsrv -f global-resource-values.yaml -f global-values.yaml -f images.yaml -f $cloud_file_name --debug
;;

obsrvtools)
rm -rf obsrvtools
cp -rf ../obsrv obsrvtools
Expand Down Expand Up @@ -104,6 +111,7 @@ all)
bash $0 hudi
bash $0 obsrvtools
bash $0 additional
bash $0 otel
;;
reset)
helm uninstall additional -n obsrv
Expand All @@ -115,6 +123,7 @@ reset)
helm uninstall migrations -n obsrv
helm uninstall coredb -n obsrv
helm uninstall obsrv-bootstrap -n obsrv
helm uninstall opentelemetry-collector -n obsrv
;;
*)
if [ ! -d "../services/$1" ]; then
Expand Down
2 changes: 2 additions & 0 deletions helmcharts/services/flink/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ baseconfig: |
host = "{{ .Values.global.cassandra.host }}"
port = "{{ .Values.global.cassandra.port }}"
}
otel.collector.endpoint="http://opentelemetry-collector.otel.svc.cluster.local:4317"
Expand Down
27 changes: 27 additions & 0 deletions helmcharts/services/opentelemetry-collector/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/

# Ignore unittest
tests/
*/__snapshot__/*
12 changes: 12 additions & 0 deletions helmcharts/services/opentelemetry-collector/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Collector Chart Contributing Guide

All changes to the chart require a bump to the version in `chart.yaml`. See the [Contributing Guide](https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/CONTRIBUTING.md#versioning) for our versioning requirements.

Once the chart version is bumped, the examples must be regenerated. You can regenerate examples by running `make generate-examples CHARTS=opentelemetry-collector`.

## Bumping Default Collector Version

1. Increase the minor version of the chart by one and set the patch version to zero.
2. Update the chart's `appVersion` to match the new collector version. This version will be used as the image tag by default.
3. Review the corresponding release notes in [Collector Core](https://github.com/open-telemetry/opentelemetry-collector/releases), [Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases), and [Collector Releases](https://github.com/open-telemetry/opentelemetry-collector-releases/releases). If any changes affect the helm charts, adjust the helm chart accordingly.
4. Run `make generate-examples CHARTS=opentelemetry-collector`.
15 changes: 15 additions & 0 deletions helmcharts/services/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.109.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
sources:
- https://github.com/open-telemetry/opentelemetry-collector
- https://github.com/open-telemetry/opentelemetry-collector-contrib
maintainers:
- name: dmitryax
- name: jaronoff97
- name: TylerHelmuth
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.113.0
Loading

0 comments on commit 8985b3e

Please sign in to comment.