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

Cu 86bymm3dp support komodor owner refs #323

Merged
merged 4 commits into from
Jun 23, 2024
+8 −8
Merged

Cu 86bymm3dp support komodor owner refs #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7922bfb
Update fields and linux image
michaeldeift Jun 19, 2024
5ce9db2
Update readme
michaeldeift Jun 19, 2024
0310831
Update windows metrics image
michaeldeift Jun 19, 2024
8277364
Update to telegraf 1.31.0. Fix for CVE-2024-24790
michaeldeift Jun 20, 2024
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
8 changes: 4 additions & 4 deletions charts/komodor-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ The command removes all the Kubernetes components associated with the chart and
| components.komodorDaemon.metricsInit.image | object | `{ "name": "init-daemon-agent", "tag": .Chart.AppVersion }` | Override the komodor agent metrics init image name or tag. |
| components.komodorDaemon.metricsInit.resources | object | `{}` | Set custom resources to the komodor agent metrics init container |
| components.komodorDaemon.metricsInit.extraEnvVars | list | `[]` | List of additional environment variables, Each entry is a key-value pair |
| components.komodorDaemon.metrics | object | `{"extraEnvVars":[],"image":{"name":"telegraf","tag":"1.29.4-alpine-v2"},"resources":{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}}` | Configure the komodor daemon metrics components |
| components.komodorDaemon.metrics.image | object | `{"name":"telegraf","tag":"1.29.4-alpine-v2"}` | Override the komodor agent metrics image name or tag. |
| components.komodorDaemon.metrics | object | `{"extraEnvVars":[],"image":{"name":"telegraf","tag":"1.31.0-alpine-v1"},"resources":{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}}` | Configure the komodor daemon metrics components |
| components.komodorDaemon.metrics.image | object | `{"name":"telegraf","tag":"1.31.0-alpine-v1"}` | Override the komodor agent metrics image name or tag. |
| components.komodorDaemon.metrics.resources | object | `{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}` | Set custom resources to the komodor agent metrics container |
| components.komodorDaemon.metrics.extraEnvVars | list | `[]` | List of additional environment variables, Each entry is a key-value pair |
| components.komodorDaemon.networkSniffer | object | See sub-values | Configure the komodor daemon network sniffer components |
Expand All @@ -182,8 +182,8 @@ The command removes all the Kubernetes components associated with the chart and
| components.komodorDaemonWindows.nodeSelector | object | `{}` | Set node selectors for the komodor agent daemon |
| components.komodorDaemonWindows.tolerations | list | `[]` | Add tolerations to the komodor agent daemon |
| components.komodorDaemonWindows.podAnnotations | object | `{}` | # Add annotations to the komodor agent watcher pod |
| components.komodorDaemonWindows.metrics | object | `{"extraEnvVars":[],"image":{"name":"telegraf-windows","tag":"1.29.4-alpine-v2"},"resources":{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}}` | Configure the komodor daemon metrics components |
| components.komodorDaemonWindows.metrics.image | object | `{"name":"telegraf-windows","tag":"1.29.4-alpine-v2"}` | Override the komodor agent metrics image name or tag. |
| components.komodorDaemonWindows.metrics | object | `{"extraEnvVars":[],"image":{"name":"telegraf-windows","tag":"1.31.0-v1"},"resources":{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}}` | Configure the komodor daemon metrics components |
| components.komodorDaemonWindows.metrics.image | object | `{"name":"telegraf-windows","tag":"1.31.0-v1"}` | Override the komodor agent metrics image name or tag. |
| components.komodorDaemonWindows.metrics.resources | object | `{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":0.1,"memory":"384Mi"}}` | Set custom resources to the komodor agent metrics container |
| components.komodorDaemonWindows.metrics.extraEnvVars | list | `[]` | List of additional environment variables, Each entry is a key-value pair |
| allowedResources.event | bool | `true` | Enables watching `event` |
Expand Down
2 changes: 1 addition & 1 deletion charts/komodor-agent/templates/metrics/configmap-daemon-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data:
[[inputs.execd]]
command = ["C:/telegraf/custom_input.exe", "-config", "C:/telegraf/plugin.conf"]
namedrop = ["kubernetes_system_container"]
fieldinclude = ["resource_requests_millicpu_units","resource_limits_millicpu_units","resource_requests_memory_bytes","resource_limits_memory_bytes", "capacity_cpu_cores", "capacity_millicpu_cores", "capacity_memory_bytes", "restarts_total", "memory_usage_bytes", "cpu_usage_nanocores", "memory_working_set_bytes", "allocatable_millicpu_cores", "allocatable_memory_bytes"]
fieldinclude = ["resource_requests_millicpu_units","resource_limits_millicpu_units","resource_requests_memory_bytes","resource_limits_memory_bytes", "capacity_cpu_cores", "capacity_millicpu_cores", "capacity_memory_bytes", "restarts_total", "memory_usage_bytes", "cpu_usage_nanocores", "memory_working_set_bytes", "allocatable_millicpu_cores", "allocatable_memory_bytes", "komodor_owner_refs"]
[inputs.execd.tags]
measure_type = "consolidated"

Expand Down
2 changes: 1 addition & 1 deletion charts/komodor-agent/templates/metrics/configmap-daemon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data:
[[inputs.execd]]
command = ["custom_input", "-config", "/etc/telegraf/plugin.conf"]
namedrop = ["kubernetes_system_container"]
fieldinclude = ["resource_requests_millicpu_units","resource_limits_millicpu_units","resource_requests_memory_bytes","resource_limits_memory_bytes", "capacity_cpu_cores", "capacity_millicpu_cores", "capacity_memory_bytes", "restarts_total", "memory_usage_bytes", "cpu_usage_nanocores", "memory_working_set_bytes", "allocatable_millicpu_cores", "allocatable_memory_bytes"]
fieldinclude = ["resource_requests_millicpu_units","resource_limits_millicpu_units","resource_requests_memory_bytes","resource_limits_memory_bytes", "capacity_cpu_cores", "capacity_millicpu_cores", "capacity_memory_bytes", "restarts_total", "memory_usage_bytes", "cpu_usage_nanocores", "memory_working_set_bytes", "allocatable_millicpu_cores", "allocatable_memory_bytes", "komodor_owner_refs"]
[inputs.execd.tags]
measure_type = "consolidated"

Expand Down
4 changes: 2 additions & 2 deletions charts/komodor-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ components:
# components.komodorDaemon.metrics.image -- Override the komodor agent metrics image name or tag.
image:
name: telegraf
tag: 1.29.4-alpine-v2
tag: 1.31.0-alpine-v1
# components.komodorDaemon.metrics.resources -- Set custom resources to the komodor agent metrics container
resources:
limits:
Expand Down Expand Up @@ -261,7 +261,7 @@ components:
# components.komodorDaemonWindows.metrics.image -- Override the komodor agent metrics image name or tag.
image:
name: telegraf-windows
tag: 1.29.4-alpine-v2
tag: 1.31.0-v1
# components.komodorDaemonWindows.metrics.resources -- Set custom resources to the komodor agent metrics container
resources:
limits:
Expand Down