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

feat: add otelcollector as sidecar for firehose #121

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add otelcollector as sidecar for firehose #121

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: 2 additions & 2 deletions stable/firehose/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: firehose
description: A Helm chart for deploying Firehose on Kubernetes
type: application
version: 0.1.3
appVersion: 0.7.1
version: 0.1.4
appVersion: 0.8.1
10 changes: 9 additions & 1 deletion stable/firehose/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,15 @@ The following table lists the configurable parameters of Firehose chart and thei
| telegraf.resources.limits.memory | string | `"64Mi"` | telegraf container memory limit |
| telegraf.resources.requests.cpu | string | `"50m"` | telegraf container cpu requests |
| telegraf.resources.requests.memory | string | `"64Mi"` | telegraf container memory requests |

| otelcollector.enabled | bool | `false` | flag for enabling otelcollector |
| otelcollector.image.pullPolicy | string | `"IfNotPresent"` | the Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value for otelcollector container |
| otelcollector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | docker repository to download otelcollector image |
| otelcollector.image.tag | string | `"0.108.0"` | otelcollector docker image tag |
| otelcollector.resources.limits.cpu | string | `"50m"` | otelcollector container cpu limit |
| otelcollector.resources.limits.memory | string | `"64Mi"` | otelcollector container memory limit |
| otelcollector.resources.requests.cpu | string | `"50m"` | otelcollector container cpu requests |
| otelcollector.resources.requests.memory | string | `"64Mi"` | otelcollector container memory requests |
| otelcollector.config | object | `` | otelcollector configurations
---

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
Expand Down
14 changes: 14 additions & 0 deletions stable/firehose/templates/configmap-otelcollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{{- if index .Values.otelcollector.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "firehose.fullname" . }}-otelcollector-config
namespace: {{ .Release.Namespace }}
labels:
labels: {{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value }}
{{- end }}
data:
otel-collector-config.yaml: |+
{{ toYaml .Values.otelcollector.config | indent 4 }}
{{- end }}
15 changes: 15 additions & 0 deletions stable/firehose/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ spec:
- mountPath: /etc/telegraf
name: telegraf-conf
{{- end }}
{{- if index .Values.otelcollector.enabled }}
- name: otelcollector
image: "{{ .Values.otelcollector.image.repository }}:{{ .Values.otelcollector.image.tag }}"
imagePullPolicy: {{ .Values.otelcollector.image.pullPolicy }}
resources:
{{- toYaml .Values.otelcollector.resources | nindent 12 }}
volumeMounts:
- mountPath: /etc/otelcollector
name: otelcollector-conf
{{- end }}
{{- if index .Values "init-firehose" "enabled" }}
initContainers:
- args:
Expand All @@ -81,6 +91,11 @@ spec:
name: {{ include "firehose.fullname" . }}-telegraf-config
name: telegraf-conf
{{- end }}
{{- if index .Values.otelcollector.enabled }}
- configMap:
name: {{ include "firehose.fullname" . }}-otelcollector-config
name: otelcollector-conf
{{- end }}
{{- if index .Values "init-firehose" "enabled" }}
- emptyDir: {}
name: workdir
Expand Down
3 changes: 3 additions & 0 deletions stable/firehose/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,6 @@ telegraf:
requests:
cpu: 50m
memory: 64Mi

otelcollector:
enabled: false