Skip to content

Commit

Permalink
Quick fix for concat behavior while handling the CRI partial logs to …
Browse files Browse the repository at this point in the history
…not include newline char as separator. (#65)
  • Loading branch information
santhoshkvuda authored Jan 9, 2024
1 parent fdea39e commit 14c4445
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 2024-01-09
### Changed
- Concat filter plugin behavior changed to not include newline character as separator while handling CRI partial logs.
- Dashboards Import is now optional while installing the monitoring solution through RMS Stack. Default behavior remains the same.

## 2023-12-01
### Added
- Uptake ARM compatible container image from OCR for logan(Fluentd) chart.
Expand Down
2 changes: 1 addition & 1 deletion charts/logan/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: v2
name: oci-onm-logan
description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics.
type: application
version: 3.2.1
version: 3.2.2
appVersion: "3.0.0"

dependencies:
Expand Down
3 changes: 3 additions & 0 deletions charts/logan/templates/logs-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ data:
use_partial_cri_logtag true
partial_cri_logtag_key logtag
partial_cri_stream_key stream
separator ""
# timeout scenario should not occur in general for partial logs handling
timeout_label "@NORMAL{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}"
</filter>
Expand Down Expand Up @@ -407,6 +408,7 @@ data:
use_partial_cri_logtag true
partial_cri_logtag_key logtag
partial_cri_stream_key stream
separator ""
# timeout scenario should not occur in general for partial logs handling
timeout_label "@NORMAL{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}"
</filter>
Expand Down Expand Up @@ -514,6 +516,7 @@ data:
use_partial_cri_logtag true
partial_cri_logtag_key logtag
partial_cri_stream_key stream
separator ""
# timeout scenario should not occur in general for partial logs handling
timeout_label "@NORMAL{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}"
</filter>
Expand Down
4 changes: 2 additions & 2 deletions charts/oci-onm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.2.1
version: 3.2.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -32,7 +32,7 @@ dependencies:
repository: "file://../common"
condition: oci-onm-common.enabled
- name: oci-onm-logan
version: "3.2.1"
version: "3.2.2"
repository: "file://../logan"
condition: oci-onm-logan.enabled
- name: oci-onm-mgmt-agent
Expand Down

0 comments on commit 14c4445

Please sign in to comment.