Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b8a3fea
Bump collector version to 0.80.0 (#815)
TylerHelmuth Jun 21, 2023
e64cf3f
[opentelemetry-collector] recombine cri multi-line logs (#818)
povilasv Jun 27, 2023
5498e1b
[demo] Bump OTel Collector chart version (#821)
gouthamve Jun 27, 2023
26c0c6e
Feat/extra env from (#820)
paologallinaharbur Jun 28, 2023
8087515
bump operator (#823)
TylerHelmuth Jun 29, 2023
2361f16
bump collector (#830)
TylerHelmuth Jul 5, 2023
ae7c259
JAC: fix checksum config in statefulset template (#827)
jorgeancal Jul 6, 2023
c81b634
Adds short usage instructions to UPGRADING.md (#826)
nrekretep Jul 7, 2023
a339856
Bump operator (#832)
TylerHelmuth Jul 12, 2023
17e9fc0
Fix typo in README.md (#831)
jankatins Jul 20, 2023
f01b277
Add new helm command to README.md, fix typos (#836)
MA3CIN Jul 26, 2023
16984c6
Add externalTrafficPolicy value for service type LoadBalancer (#838)
ahurtaud Jul 31, 2023
0a6efaf
[collector] Respect pipeline order when enabling kubernetesAttributes…
JDemler Jul 31, 2023
e87a274
[collector] Allow disabling service even for deployment and statefuls…
TylerHelmuth Jul 31, 2023
3c5e341
bump collector to 0.82.0 (#847)
TylerHelmuth Aug 1, 2023
cf53841
charts/opentelemetry-collector: recommended CPU limit pushes just ove…
kevinburkesegment Aug 9, 2023
3cb40c3
Upgrade operator to v0.82.0 (#854)
swiatekm Aug 10, 2023
a01d2f4
feat: add ci for coralogix opentelemetry collector helm chart (#3)
povilasv Jun 22, 2023
16df801
fix: release issue (#5)
povilasv Jun 23, 2023
5133e02
fix: codeowners (#6)
povilasv Jun 23, 2023
5310425
feat: allow extra file log operators (#7)
povilasv Jun 26, 2023
f1c31a8
feat: recombine cri logs based on log tags (#9)
povilasv Jun 26, 2023
16e87ee
CRD generation with template (#4)
matej-g Jun 27, 2023
5e5620a
Fixes after introducing CRD generation (#10)
matej-g Jun 30, 2023
39c6a1f
[collector] provide support for windows (#11)
povilasv Jun 30, 2023
1bb03c9
Add MySQL metrics and logs presets (#14)
matej-g Jul 10, 2023
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
13 changes: 4 additions & 9 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

#####################################################
#
# List of approvers for OpenTelemetry Helm
Expand All @@ -7,14 +7,9 @@
#
# Learn about membership in OpenTelemetry community:
# https://github.com/open-telemetry/community/blob/main/community-membership.md
#
#
# Learn about CODEOWNERS file format:
#
# Learn about CODEOWNERS file format:
# https://help.github.com/en/articles/about-code-owners
#

* @open-telemetry/helm-approvers

charts/opentelemetry-collector/ @open-telemetry/helm-approvers @dmitryax @TylerHelmuth @povilasv
charts/opentelemetry-operator/ @open-telemetry/helm-approvers @Allex1
charts/opentelemetry-demo/ @open-telemetry/helm-approvers @puckpuck
* @povilasv @oded-dd @matej-g @nicolastakashi
2 changes: 1 addition & 1 deletion .github/workflows/collector-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test Collector Chart

on:
pull_request:
paths:
paths:
- 'charts/opentelemetry-collector/**'
branches:
- main
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/demo-test.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/operator-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
LOCAL_TARGET_ALLOCATOR_IMG="local\/opentelemetry-operator-targetallocator:e2e"
PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:0.1.0"

sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/00-install.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/*.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-features/00-install.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/prometheus-config-validation/*.yaml

Expand Down
56 changes: 26 additions & 30 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@
name: Release Charts

name: Coralogix-OpenTelemetry-Collector-Helm-Chart
on:
push:
branches:
- main
branches: main
paths:
- 'charts/opentelemetry-collector/**'

env:
CHART_VERSION: $(yq eval '.version' charts/opentelemetry-collector/Chart.yaml)
CHART_NAME: opentelemetry-collector
ARTIFACTORY_URL: https://cgx.jfrog.io/artifactory/
ARTIFACTORY_USERNAME: integrations-actions

jobs:
release:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Configure Git
-
name: Checkout
uses: actions/checkout@v2.4.0
-
name: Setup Helm Repo
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

- name: Install Helm
uses: azure/setup-helm@v3.5
cd charts/opentelemetry-collector
helm package .
-
name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@v2.1.0
with:
version: v3.9.0

- name: Add dependent repositories
version: 2.12.1
-
name: use-jfrog-cli
run: |
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
helm repo add prometheus https://prometheus-community.github.io/helm-charts
helm repo add grafana https://grafana.github.io/helm-charts
helm repo add jaeger https://jaegertracing.github.io/helm-charts

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
with:
charts_dir: charts
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
cd charts/opentelemetry-collector
jfrog rt upload --access-token ${{ secrets.ARTIFACTORY_NONUSER_ACCESS_TOKEN }} "${{ env.CHART_NAME }}-*.tgz" coralogix-charts --url ${{ env.ARTIFACTORY_URL }}
18 changes: 0 additions & 18 deletions .github/workflows/stale.yaml

This file was deleted.

6 changes: 5 additions & 1 deletion charts/opentelemetry-collector/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +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`.
4. Run `make generate-examples CHARTS=opentelemetry-collector`.
11 changes: 6 additions & 5 deletions charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.60.0
version: 0.64.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
sources:
- https://github.com/coralogix/opentelemetry-helm-charts
- https://github.com/open-telemetry/opentelemetry-collector
- https://github.com/open-telemetry/opentelemetry-collector-contrib
maintainers:
- name: dmitryax
- name: TylerHelmuth
- https://github.com/open-telemetry/opentelemetry-helm-charts
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.79.0
maintainers:
- name: povilasv
appVersion: 0.77.0
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ The collector can be configured to collects cluster-level metrics from the Kuber
This feature is disabled by default. It has the following requirements:

- It requires [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8sclusterreceiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) version of the collector image.
- It requires statefulset or deployment mode with a signle replica.
- It requires statefulset or deployment mode with a single replica.

To enable this feature, set the `presets.clusterMetrics.enabled` property to `true`.

Expand Down
12 changes: 11 additions & 1 deletion charts/opentelemetry-collector/UPGRADING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Upgrade guidelines

These upgrade guidelines only contain instructions for version upgrades which require manual modifications on the user's side.
If the version you want to upgrade to is not listed here, then there is nothing to do for you.
Just upgrade and enjoy.

## 0.62 to 0.63

The `kubernetesAttributes` preset now respects order of processors in logs, metrics and traces pipelines.
This implicitly might break your pipelines if you relied on having the `k8sAttributes` processor rendered as the first processor but also explicitly listed it in the signal's pipeline somewhere else.

## 0.55.2 to 0.56

The `tpl` function has been added to references of pod labels and ingress hosts. This adds the ability to add some reusability in
Expand Down Expand Up @@ -38,7 +47,8 @@ As of v0.54.0 Collector chart, the default resource limits are removed. If you w
```
resources:
limits:
cpu: 256m
# CPU units are in fractions of 1000; memory in powers of 2
cpu: 250m
memory: 512Mi
```

Expand Down
6 changes: 0 additions & 6 deletions charts/opentelemetry-collector/ci/statefulset-values.yaml

This file was deleted.

1 change: 1 addition & 0 deletions charts/opentelemetry-collector/examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Here is a collection of common configurations for the OpenTelemetry collector.
- [Daemonset and deployment](daemonset-and-deployment)
- [Log collection, including collector logs](daemonset-collector-logs)
- [Add component (hostmetrics)](daemonset-hostmetrics)
- [Daemonset Windows](daemonset-windows)

The manifests are rendered using the `helm template` command and the specific example folder's values.yaml.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.60.0
helm.sh/chart: opentelemetry-collector-0.64.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.79.0"
app.kubernetes.io/version: "0.77.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.60.0
helm.sh/chart: opentelemetry-collector-0.64.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.79.0"
app.kubernetes.io/version: "0.77.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.60.0
helm.sh/chart: opentelemetry-collector-0.64.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.79.0"
app.kubernetes.io/version: "0.77.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,26 +21,23 @@ spec:
template:
metadata:
annotations:
checksum/config: fc64cc9e1870522fd4aafc5eced3fd8b9000c26553ae8916633d0ce044d28b6e
checksum/config: 1c2f96696b75e08803f916977aeef1429bd1fb4f52fba9f3c85c4e40b8d2e251

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
component: agent-collector

spec:

serviceAccountName: example-opentelemetry-collector
securityContext:
{}
securityContext: {}
containers:
- name: opentelemetry-collector
command:
- /otelcol-contrib
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.79.0"
securityContext: {}
image: "otel/opentelemetry-collector-contrib:0.77.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down Expand Up @@ -95,4 +92,6 @@ spec:
items:
- key: relay
path: relay.yaml
nodeSelector:
kubernetes.io/os: linux
hostNetwork: false
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.60.0
helm.sh/chart: opentelemetry-collector-0.64.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.79.0"
app.kubernetes.io/version: "0.77.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -23,26 +23,23 @@ spec:
template:
metadata:
annotations:
checksum/config: e551dd5d441d84d4e1edc7aabab79f91a691750705fea0c04c18ea47188ca2c3
checksum/config: 9968b8e069b6d553624cfa9f1e1a70886a20e0535743c84cbf77a653432d4fc4

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
component: standalone-collector

spec:

serviceAccountName: example-opentelemetry-collector
securityContext:
{}
securityContext: {}
containers:
- name: opentelemetry-collector
command:
- /otelcol-contrib
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.79.0"
securityContext: {}
image: "otel/opentelemetry-collector-contrib:0.77.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down Expand Up @@ -91,4 +88,6 @@ spec:
items:
- key: relay
path: relay.yaml
nodeSelector:
kubernetes.io/os: linux
hostNetwork: false
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ kind: Service
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.60.0
helm.sh/chart: opentelemetry-collector-0.64.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.79.0"
app.kubernetes.io/version: "0.77.0"
app.kubernetes.io/managed-by: Helm
component: standalone-collector
spec:
type: ClusterIP
ports:

ports:
- name: jaeger-compact
port: 6831
targetPort: 6831
Expand Down
Loading