Skip to content

Commit aa0c730

Browse files
bardabunralongit
andauthored
Add support for numeric values in env_id (#457)
Co-authored-by: Ral G <[email protected]>
1 parent 98ddc6c commit aa0c730

File tree

11 files changed

+13
-8
lines changed

11 files changed

+13
-8
lines changed

charts/fluentd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Helm chart for shipping Kubernetes logs via Fluentd.
44
keywords:
55
- logging
66
- fluentd
7-
version: 0.29.1
7+
version: 0.29.2
88
appVersion: 1.5.1
99
maintainers:
1010
- name: Yotam loewenbach

charts/fluentd/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ If needed, the fluentd image can be changed to support windows server 2022 with
303303

304304

305305
## Change log
306+
- **0.29.2**:
307+
- Enhanced env_id handling to support both numeric and string formats.
306308
- **0.29.1**:
307309
- Added `enabled` value, to conditianly control the deployment of this chart by a parent chart.
308310
- Added `daemonset.LogFileRefreshInterval` and `windowsDaemonset.LogFileRefreshInterval` values, to control list of watched log files refresh interval.

charts/fluentd/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ data:
3636
{{- end }}
3737

3838
{{- if .Values.env_id }}
39-
env-id.conf : {{ toYaml .Values.configmap.envId | indent 2 }}
39+
env-id.conf : {{ toYaml .Values.configmap.envId | quote | indent 2 }}
4040
{{- end }}
4141
{{- if .Values.configmap.extraConfig }}
4242
{{- range $key, $value := fromYaml .Values.configmap.extraConfig }}

charts/fluentd/templates/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ spec:
277277
value: {{ .Values.windowsDaemonset.containersPath | quote }}
278278
{{- if .Values.env_id }}
279279
- name: ENV_ID
280-
value: {{ .Values.env_id }}
280+
value: {{ .Values.env_id | quote}}
281281
{{- end }}
282282
{{- if .Values.windowsDaemonset.extraEnv }}
283283
{{ toYaml .Values.windowsDaemonset.extraEnv | indent 8 }}

charts/logzio-k8s-events/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords:
55
- logging
66
- k8s
77
- kubernetes
8-
version: 0.0.3
8+
version: 0.0.4
99
appVersion: 0.0.2
1010
maintainers:
1111
- name: Raul Gurshumov

charts/logzio-k8s-events/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain
9898

9999

100100
## Change log
101+
- **0.0.4**:
102+
- Enhanced env_id handling to support both numeric and string formats.
101103
- **0.0.3**:
102104
- Rename listener template.
103105
- **0.0.2**:

charts/logzio-k8s-events/templates/secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ type: Opaque
1111
stringData:
1212
logzio-log-shipping-token: {{ required "Logzio shipping token is required!" .Values.secrets.logzioShippingToken }}
1313
logzio-log-listener: {{ template "logzio-k8s-events.listenerHost" . }}
14-
env-id: {{ .Values.secrets.env_id }}
14+
env-id: {{ .Values.secrets.env_id | quote }}
1515
{{- end }}

charts/logzio-logs-collector/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,6 @@ The collector supports by default various log formats (including multiline logs)
146146
- Update multiline parsing
147147
- Update error detection in logs
148148
- Change default log type
149+
- Enhanced env_id handling to support both numeric and string formats.
149150
* 1.0.0
150151
- kubernetes logs collection agent for logz.io based on opentelemetry collector

charts/logzio-logs-collector/templates/secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
namespace: {{ .Release.Namespace }}
99
type: Opaque
1010
stringData:
11-
env-id: {{.Values.secrets.env_id}}
11+
env-id: {{.Values.secrets.env_id | quote}}
1212
log-type: {{ .Values.secrets.logType}}
1313
logzio-listener-region: {{ .Values.secrets.LogzioRegion}}
1414
{{ if .Values.secrets.logzioLogsToken}}

charts/logzio-trivy/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords:
55
- logging
66
- trivy
77
- security
8-
version: 0.3.0
8+
version: 0.3.1
99
appVersion: 0.2.1
1010
sources:
1111
- https://github.com/logzio/logzio-helm

charts/logzio-trivy/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: {{ .Values.secrets.name }}
3232
key: logzio-log-listener
3333
- name: ENV_ID
34-
value: {{ .Values.env_id }}
34+
value: {{ .Values.env_id | quote }}
3535
- name: SCHEDULE
3636
value: {{ .Values.schedule }}
3737
- name: LOG_LEVEL

0 commit comments

Comments
 (0)