Skip to content

Enhance env_id configuration to accept numeric values #457

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

Merged
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
2 changes: 1 addition & 1 deletion charts/fluentd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Helm chart for shipping Kubernetes logs via Fluentd.
keywords:
- logging
- fluentd
version: 0.29.1
version: 0.29.2
appVersion: 1.5.1
maintainers:
- name: Yotam loewenbach
Expand Down
2 changes: 2 additions & 0 deletions charts/fluentd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ If needed, the fluentd image can be changed to support windows server 2022 with


## Change log
- **0.29.2**:
- Enhanced env_id handling to support both numeric and string formats.
- **0.29.1**:
- Added `enabled` value, to conditianly control the deployment of this chart by a parent chart.
- Added `daemonset.LogFileRefreshInterval` and `windowsDaemonset.LogFileRefreshInterval` values, to control list of watched log files refresh interval.
Expand Down
2 changes: 1 addition & 1 deletion charts/fluentd/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
{{- end }}

{{- if .Values.env_id }}
env-id.conf : {{ toYaml .Values.configmap.envId | indent 2 }}
env-id.conf : {{ toYaml .Values.configmap.envId | quote | indent 2 }}
{{- end }}
{{- if .Values.configmap.extraConfig }}
{{- range $key, $value := fromYaml .Values.configmap.extraConfig }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluentd/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ spec:
value: {{ .Values.windowsDaemonset.containersPath | quote }}
{{- if .Values.env_id }}
- name: ENV_ID
value: {{ .Values.env_id }}
value: {{ .Values.env_id | quote}}
{{- end }}
{{- if .Values.windowsDaemonset.extraEnv }}
{{ toYaml .Values.windowsDaemonset.extraEnv | indent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/logzio-k8s-events/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ keywords:
- logging
- k8s
- kubernetes
version: 0.0.3
version: 0.0.4
appVersion: 0.0.2
maintainers:
- name: Raul Gurshumov
Expand Down
2 changes: 2 additions & 0 deletions charts/logzio-k8s-events/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain


## Change log
- **0.0.4**:
- Enhanced env_id handling to support both numeric and string formats.
- **0.0.3**:
- Rename listener template.
- **0.0.2**:
Expand Down
2 changes: 1 addition & 1 deletion charts/logzio-k8s-events/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ type: Opaque
stringData:
logzio-log-shipping-token: {{ required "Logzio shipping token is required!" .Values.secrets.logzioShippingToken }}
logzio-log-listener: {{ template "logzio-k8s-events.listenerHost" . }}
env-id: {{ .Values.secrets.env_id }}
env-id: {{ .Values.secrets.env_id | quote }}
{{- end }}
1 change: 1 addition & 0 deletions charts/logzio-logs-collector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,6 @@ The collector supports by default various log formats (including multiline logs)
- Update multiline parsing
- Update error detection in logs
- Change default log type
- Enhanced env_id handling to support both numeric and string formats.
* 1.0.0
- kubernetes logs collection agent for logz.io based on opentelemetry collector
2 changes: 1 addition & 1 deletion charts/logzio-logs-collector/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
env-id: {{.Values.secrets.env_id}}
env-id: {{.Values.secrets.env_id | quote}}
log-type: {{ .Values.secrets.logType}}
logzio-listener-region: {{ .Values.secrets.LogzioRegion}}
{{ if .Values.secrets.logzioLogsToken}}
Expand Down
2 changes: 1 addition & 1 deletion charts/logzio-trivy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ keywords:
- logging
- trivy
- security
version: 0.3.0
version: 0.3.1
appVersion: 0.2.1
sources:
- https://github.com/logzio/logzio-helm
Expand Down
2 changes: 1 addition & 1 deletion charts/logzio-trivy/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
name: {{ .Values.secrets.name }}
key: logzio-log-listener
- name: ENV_ID
value: {{ .Values.env_id }}
value: {{ .Values.env_id | quote }}
- name: SCHEDULE
value: {{ .Values.schedule }}
- name: LOG_LEVEL
Expand Down