Skip to content

Commit

Permalink
logzio-telemetry v4.0.0 (#416)
Browse files Browse the repository at this point in the history
* Use K8S 360 metrics list from values

- Deleted the kubernetes-360-metrics key from the logzio-secret.
  - Populate the pods containers env var directly using the opentelemetry k8s360 definition to inherit the list from values file instead.
- Added logzio_app label with kubernetes360 value to cadvisor metrics to avoid dropping specific metrics.

* Update README.md

* Upgrade to v4 as it's a breaking change
  • Loading branch information
ralongit authored Jan 9, 2024
1 parent cedf095 commit bcb29ba
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion charts/logzio-telemetry/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
# 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.0.0
version: 4.0.0

# 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 Down
5 changes: 5 additions & 0 deletions charts/logzio-telemetry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ If you don't want the sub charts to installed add the relevant flag per sub char


## Change log
* 4.0.0
- **BREAKING CHANGES**:
- Removed the `kubernetes-360-metrics` key from the `logzio-secret`.
- Populate the pods containers `K8S_360_METRICS` environment variable directly using the opentelemetry-collector.k8s360 definition to inherit the list from values file instead.
- Added `logzio_app` label with `kubernetes360` value to cadvisor metrics pipeline to avoid dropping specific metrics by matching the k8s 360 filter.
* 3.0.0
- Updated K360 metrics list in `secrets.yaml` - now created dynamically from OOB filters.
- Added `job_dummy` relabel and processor - Fixing an issue where duplicate metrics were being sent if the metrics were not in the `K8S_360_METRICS` environment variable.
Expand Down
5 changes: 1 addition & 4 deletions charts/logzio-telemetry/templates/_daemonset-pod.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ containers:
fieldRef:
fieldPath: spec.nodeName
- name: K8S_360_METRICS
valueFrom:
secretKeyRef:
name: {{ .Values.secrets.name }}
key: kubernetes-360-metrics
value: {{ include "opentelemetry-collector.k360Metrics" . }}
- name: LOGZIO_AGENT_VERSION
value: {{.Chart.Version}}
- name: REALESE_NAME
Expand Down
5 changes: 1 addition & 4 deletions charts/logzio-telemetry/templates/_pod.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ containers:
fieldRef:
fieldPath: spec.nodeName
- name: K8S_360_METRICS
valueFrom:
secretKeyRef:
name: {{ .Values.secrets.name }}
key: kubernetes-360-metrics
value: {{ include "opentelemetry-collector.k360Metrics" . }}
- name: LOGZIO_AGENT_VERSION
value: {{.Chart.Version}}
- name: REALESE_NAME
Expand Down
1 change: 0 additions & 1 deletion charts/logzio-telemetry/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
kubernetes-360-metrics: {{ include "opentelemetry-collector.k360Metrics" . | quote }}
{{- if .Values.opencost.enabled -}}
opencost-duplicates: container_memory_usage_bytes|container_fs_limit_bytes|container_fs_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_transmit_bytes_total|container_cpu_usage_seconds_total|container_cpu_cfs_periods_total|container_cpu_cfs_throttled_periods_total|kube_deployment_spec_replicas|kube_deployment_status_replicas_available|kube_job_status_failed|kube_namespace_annotations|kube_namespace_labels|kube_node_labels|kube_node_status_allocatable|kube_node_status_allocatable_cpu_cores|kube_node_status_allocatable_memory_bytes|kube_node_status_capacity|kube_node_status_capacity_cpu_cores|kube_node_status_capacity_memory_bytes|kube_node_status_condition|kube_persistentvolume_capacity_bytes|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_pod_annotations|kube_pod_container_resource_limits|kube_pod_container_resource_limits_cpu_cores|kube_pod_container_resource_limits_memory_bytes|kube_pod_container_resource_requests|kube_pod_container_status_restarts_total|kube_pod_container_status_running|kube_pod_container_status_terminated_reason|kube_pod_labels|kube_pod_owner|kube_pod_status_phase|kube_replicaset_owner|node_cpu_seconds_total|node_disk_reads_completed|node_disk_reads_completed_total|node_disk_writes_completed|node_disk_writes_completed_total|node_filesystem_device_error|node_memory_Buffers_bytes|node_memory_Cached_bytes|node_memory_MemAvailable_bytes|node_memory_MemFree_bytes|node_memory_MemTotal_bytes|node_network_transmit_bytes_total|
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/logzio-telemetry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,9 @@ daemonsetConfig:
relabel_configs:
- action: labelmap
regex: __meta_kubernetes_node_label_(.+)
- action: replace
replacement: kubernetes360
target_label: logzio_app
metric_relabel_configs: []
prometheus/collector:
config:
Expand Down

0 comments on commit bcb29ba

Please sign in to comment.