From b0e066ba683314e50b9dded498853ec6b451429f Mon Sep 17 00:00:00 2001 From: Nikhil Popli <97437109+nikp1172@users.noreply.github.com> Date: Fri, 8 Nov 2024 18:17:44 +0530 Subject: [PATCH 1/3] Update values.yaml --- charts/tfy-loki/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/tfy-loki/values.yaml b/charts/tfy-loki/values.yaml index 949726f2..02ff9ff1 100644 --- a/charts/tfy-loki/values.yaml +++ b/charts/tfy-loki/values.yaml @@ -24,11 +24,15 @@ loki: ## @param loki.loki.limits_config.max_query_lookback Limit how far back in time series data and metadata can be queried, up until lookback duration ago. ## @param loki.loki.limits_config.split_queries_by_interval Split queries by a time interval and execute in parallel. ## @param loki.loki.limits_config.max_entries_limit_per_query Maximum number of log entries that will be returned for a query. + ## @param loki.loki.limits_config.max_line_size Max line size of a log. If log exceeds this length, it will either be skipped or truncated depeneding on max_line_size_truncate + ## @param loki.loki.limits_config.max_line_size_truncate If a log exceeds max_line_size, log will be truncated if set to true else skipped limits_config: retention_period: 168h max_query_lookback: 168h split_queries_by_interval: 10h max_entries_limit_per_query: 30000 + max_line_size: 20000 + max_line_size_truncate: true ## @skip loki.test.enabled test: enabled: false From b4ea636f3634c6e3e4390d6c08a609fe79bc9f4e Mon Sep 17 00:00:00 2001 From: nikp1172 Date: Fri, 8 Nov 2024 12:48:24 +0000 Subject: [PATCH 2/3] Update README.md with readme-generator-for-helm Signed-off-by: nikp1172 --- charts/tfy-loki/README.md | 44 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/charts/tfy-loki/README.md b/charts/tfy-loki/README.md index 8b4b173d..436b1246 100644 --- a/charts/tfy-loki/README.md +++ b/charts/tfy-loki/README.md @@ -12,24 +12,26 @@ https://github.com/grafana/helm-charts/tree/8b9ca8240e4e412f72af2df42f833c94142a ### Upstream Loki configurations -| Name | Description | Value | -| -------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | ----------------------------------- | -| `loki.enabled` | Enable loki | `true` | -| `loki.loki.storage.type` | Method to use for storage | `filesystem` | -| `loki.loki.compactor.shared_store` | The shared store used for storing boltdb files. | `filesystem` | -| `loki.loki.compactor.retention_enabled` | Activate custom (per-stream,per-tenant) retention. | `true` | -| `loki.loki.auth_enabled` | Enables authentication through the X-Scope-OrgID header | `false` | -| `loki.loki.limits_config.retention_period` | Retention period to apply to stored data. | `168h` | -| `loki.loki.limits_config.max_query_lookback` | Limit how far back in time series data and metadata can be queried, up until lookback duration ago. | `168h` | -| `loki.loki.limits_config.split_queries_by_interval` | Split queries by a time interval and execute in parallel. | `10h` | -| `loki.loki.limits_config.max_entries_limit_per_query` | Maximum number of log entries that will be returned for a query. | `30000` | -| `loki.singleBinary.replicas` | Number of replicas for the single binary | `1` | -| `loki.singleBinary.resources.requests.cpu` | CPU requests for promtail container | `0.03` | -| `loki.singleBinary.resources.requests.memory` | Memory requests for promtail container | `250Mi` | -| `loki.singleBinary.persistence.size` | Size of persistent disk | `50Gi` | -| `loki.singleBinary.persistence.enableStatefulSetAutoDeletePVC` | Enable StatefulSetAutoDeletePVC feature | `false` | -| `promtail.enabled` | Enable promtail | `true` | -| `promtail.config.clients[0].url` | Loki push API URL | `http://loki:3100/loki/api/v1/push` | -| `promtail.resources.requests.cpu` | CPU requests for promtail container | `40m` | -| `promtail.resources.requests.memory` | Memory requests for promtail container | `100Mi` | -| `promtail.resources.requests.ephemeral-storage` | Ephemeral storage requests for promtail container | `256Mi` | +| Name | Description | Value | +| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | +| `loki.enabled` | Enable loki | `true` | +| `loki.loki.storage.type` | Method to use for storage | `filesystem` | +| `loki.loki.compactor.shared_store` | The shared store used for storing boltdb files. | `filesystem` | +| `loki.loki.compactor.retention_enabled` | Activate custom (per-stream,per-tenant) retention. | `true` | +| `loki.loki.auth_enabled` | Enables authentication through the X-Scope-OrgID header | `false` | +| `loki.loki.limits_config.retention_period` | Retention period to apply to stored data. | `168h` | +| `loki.loki.limits_config.max_query_lookback` | Limit how far back in time series data and metadata can be queried, up until lookback duration ago. | `168h` | +| `loki.loki.limits_config.split_queries_by_interval` | Split queries by a time interval and execute in parallel. | `10h` | +| `loki.loki.limits_config.max_entries_limit_per_query` | Maximum number of log entries that will be returned for a query. | `30000` | +| `loki.loki.limits_config.max_line_size` | Max line size of a log. If log exceeds this length, it will either be skipped or truncated depeneding on max_line_size_truncate | `20000` | +| `loki.loki.limits_config.max_line_size_truncate` | If a log exceeds max_line_size, log will be truncated if set to true else skipped | `true` | +| `loki.singleBinary.replicas` | Number of replicas for the single binary | `1` | +| `loki.singleBinary.resources.requests.cpu` | CPU requests for promtail container | `0.03` | +| `loki.singleBinary.resources.requests.memory` | Memory requests for promtail container | `250Mi` | +| `loki.singleBinary.persistence.size` | Size of persistent disk | `50Gi` | +| `loki.singleBinary.persistence.enableStatefulSetAutoDeletePVC` | Enable StatefulSetAutoDeletePVC feature | `false` | +| `promtail.enabled` | Enable promtail | `true` | +| `promtail.config.clients[0].url` | Loki push API URL | `http://loki:3100/loki/api/v1/push` | +| `promtail.resources.requests.cpu` | CPU requests for promtail container | `40m` | +| `promtail.resources.requests.memory` | Memory requests for promtail container | `100Mi` | +| `promtail.resources.requests.ephemeral-storage` | Ephemeral storage requests for promtail container | `256Mi` | From d3a390cbdc3660e8557e3ab668ffacc8a9836cb3 Mon Sep 17 00:00:00 2001 From: Nikhil Popli <97437109+nikp1172@users.noreply.github.com> Date: Fri, 8 Nov 2024 18:18:32 +0530 Subject: [PATCH 3/3] Update Chart.yaml --- charts/tfy-loki/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tfy-loki/Chart.yaml b/charts/tfy-loki/Chart.yaml index 6bb0140b..2ec24724 100644 --- a/charts/tfy-loki/Chart.yaml +++ b/charts/tfy-loki/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: tfy-loki description: Truefoundry Loki Provisioner -version: 0.1.3-rc.1 +version: 0.1.3-rc.2 maintainers: - name: truefoundry dependencies: