Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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: 0.9.10
version: 0.9.11


dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
rules:
- apiGroups:
- ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
subjects:
- kind: ServiceAccount
name: nr-k8s-otel-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
data:
daemonset-config.yaml: |
receivers:
Expand Down Expand Up @@ -514,25 +514,6 @@ data:
aggregation_type: sum

# following system.% metrics reduce metrics reported by hostmetrics receiver
filter/exclude_cpu_utilization:
metrics:
datapoint:
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "interrupt"'
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "nice"'
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "softirq"'
filter/exclude_memory_utilization:
metrics:
datapoint:
- 'metric.name == "system.memory.utilization" and attributes["state"] == "slab_unreclaimable"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "inactive"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "cached"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "buffered"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "slab_reclaimable"'
filter/exclude_memory_usage:
metrics:
datapoint:
- 'metric.name == "system.memory.usage" and attributes["state"] == "slab_unreclaimable"'
- 'metric.name == "system.memory.usage" and attributes["state"] == "inactive"'
filter/exclude_filesystem_utilization:
metrics:
datapoint:
Expand Down Expand Up @@ -605,7 +586,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.9.10
value: 0.9.11
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand Down Expand Up @@ -773,9 +754,6 @@ data:
- filter/exclude_metrics_low_data_mode
- metricstransform/hostmetrics_cpu
- transform/truncate
- filter/exclude_cpu_utilization
- filter/exclude_memory_utilization
- filter/exclude_memory_usage
- filter/exclude_filesystem_utilization
- filter/exclude_filesystem_usage
- filter/exclude_filesystem_inodes_usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
spec:
selector:
matchLabels:
Expand All @@ -24,7 +24,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: daemonset
annotations:
checksum/config: 9dd6a8a2e8197440a17eb7a6141f4f6aaef3d497f2ef1b551ed612e2fe2b566a
checksum/config: 18844c972994a4927b8e0a6cf68fc69704b547d99b4f85b830da6dc267f83588
spec:
serviceAccountName: nr-k8s-otel-collector
initContainers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
data:
deployment-config.yaml: |
receivers:
Expand Down Expand Up @@ -477,37 +477,6 @@ data:
metric:
- 'HasAttrOnDatapoint("low.data.mode", "false")'

filter/exclude_zero_value_kube_node_status_condition:
metrics:
datapoint:
- metric.name == "kube_node_status_condition" and value_double == 0.0

filter/exclude_zero_value_kube_persistentvolumeclaim_status_phase:
metrics:
datapoint:
- metric.name == "kube_persistentvolumeclaim_status_phase" and value_double == 0.0

filter/nr_exclude_zero_value_kube_pod_container_deployment_statuses:
metrics:
datapoint:
- metric.name == "kube_pod_status_phase" and value_double < 0.5
- metric.name == "kube_pod_status_ready" and value_double < 0.5
- metric.name == "kube_pod_status_scheduled" and value_double < 0.5
- metric.name == "kube_pod_container_status_ready" and value_double < 0.5
- metric.name == "kube_pod_container_status_phase" and value_double < 0.5
- metric.name == "kube_pod_container_status_restarts_total" and value_double < 0.5
- metric.name == "kube_deployment_status_condition" and value_double < 0.5
- metric.name == "kube_pod_container_status_waiting_reason" and value_double < 0.5

filter/nr_exclude_zero_value_kube_jobs:
metrics:
datapoint:
- metric.name == "kube_job_complete" and value_double < 0.5
- metric.name == "kube_job_spec_parallelism" and value_double < 0.5
- metric.name == "kube_job_status_failed" and value_double < 0.5
- metric.name == "kube_job_status_active" and value_double < 0.5
- metric.name == "kube_job_status_succeeded" and value_double < 0.5

resource/newrelic:
attributes:
# We set the cluster name to what the customer specified in the helm chart
Expand All @@ -516,7 +485,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.9.10
value: 0.9.11
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand All @@ -534,7 +503,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.9.10
value: 0.9.11

transform/events:
log_statements:
Expand Down Expand Up @@ -759,15 +728,11 @@ data:
processors:
- memory_limiter
- metricstransform/kube_pod_container_status_phase
- filter/exclude_zero_value_kube_node_status_condition
- filter/exclude_zero_value_kube_persistentvolumeclaim_status_phase
- filter/nr_exclude_zero_value_kube_pod_container_deployment_statuses
- transform/convert_timestamp
- metricstransform/ldm
- metricstransform/k8s_cluster_info_ldm
- metricstransform/ksm
- filter/exclude_metrics_low_data_mode
- filter/nr_exclude_zero_value_kube_jobs
- transform/low_data_mode_inator
- resource/low_data_mode_inator
- resource/newrelic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
spec:
replicas: 1
minReadySeconds: 5
Expand All @@ -26,7 +26,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: deployment
annotations:
checksum/config: aaa8aa229e963e30fd154113fb8ff04c208deb3e8883de262bed601b5abcb224
checksum/config: 5d08b1c4a8fe0c74118c489b6b70c3677a1ae7c1d05a72c83ff67f2b3f6650c2
spec:
serviceAccountName: nr-k8s-otel-collector
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
data:
licenseKey: PE5SX2xpY2Vuc2VLZXk+
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
spec:
type: ClusterIP
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.9.10
helm.sh/chart: nr-k8s-otel-collector-0.9.11
annotations:
22 changes: 0 additions & 22 deletions charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -531,25 +531,6 @@ data:
aggregation_type: sum

# following system.% metrics reduce metrics reported by hostmetrics receiver
filter/exclude_cpu_utilization:
metrics:
datapoint:
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "interrupt"'
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "nice"'
- 'metric.name == "system.cpu.utilization" and attributes["state"] == "softirq"'
filter/exclude_memory_utilization:
metrics:
datapoint:
- 'metric.name == "system.memory.utilization" and attributes["state"] == "slab_unreclaimable"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "inactive"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "cached"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "buffered"'
- 'metric.name == "system.memory.utilization" and attributes["state"] == "slab_reclaimable"'
filter/exclude_memory_usage:
metrics:
datapoint:
- 'metric.name == "system.memory.usage" and attributes["state"] == "slab_unreclaimable"'
- 'metric.name == "system.memory.usage" and attributes["state"] == "inactive"'
filter/exclude_filesystem_utilization:
metrics:
datapoint:
Expand Down Expand Up @@ -827,9 +808,6 @@ data:
{{- end }}
- metricstransform/hostmetrics_cpu
- transform/truncate
- filter/exclude_cpu_utilization
- filter/exclude_memory_utilization
- filter/exclude_memory_usage
- filter/exclude_filesystem_utilization
- filter/exclude_filesystem_usage
- filter/exclude_filesystem_inodes_usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,37 +522,6 @@ data:
metric:
- 'HasAttrOnDatapoint("low.data.mode", "false")'

filter/exclude_zero_value_kube_node_status_condition:
metrics:
datapoint:
- metric.name == "kube_node_status_condition" and value_double == 0.0

filter/exclude_zero_value_kube_persistentvolumeclaim_status_phase:
metrics:
datapoint:
- metric.name == "kube_persistentvolumeclaim_status_phase" and value_double == 0.0

filter/nr_exclude_zero_value_kube_pod_container_deployment_statuses:
metrics:
datapoint:
- metric.name == "kube_pod_status_phase" and value_double < 0.5
- metric.name == "kube_pod_status_ready" and value_double < 0.5
- metric.name == "kube_pod_status_scheduled" and value_double < 0.5
- metric.name == "kube_pod_container_status_ready" and value_double < 0.5
- metric.name == "kube_pod_container_status_phase" and value_double < 0.5
- metric.name == "kube_pod_container_status_restarts_total" and value_double < 0.5
- metric.name == "kube_deployment_status_condition" and value_double < 0.5
- metric.name == "kube_pod_container_status_waiting_reason" and value_double < 0.5

filter/nr_exclude_zero_value_kube_jobs:
metrics:
datapoint:
- metric.name == "kube_job_complete" and value_double < 0.5
- metric.name == "kube_job_spec_parallelism" and value_double < 0.5
- metric.name == "kube_job_status_failed" and value_double < 0.5
- metric.name == "kube_job_status_active" and value_double < 0.5
- metric.name == "kube_job_status_succeeded" and value_double < 0.5

{{- if include "newrelic.common.openShift" . }}
resourcedetection/openshift:
detectors: ["openshift"]
Expand Down Expand Up @@ -836,16 +805,12 @@ data:
processors:
- memory_limiter
- metricstransform/kube_pod_container_status_phase
- filter/exclude_zero_value_kube_node_status_condition
- filter/exclude_zero_value_kube_persistentvolumeclaim_status_phase
- filter/nr_exclude_zero_value_kube_pod_container_deployment_statuses
- transform/convert_timestamp
{{- if include "nrKubernetesOtel.lowDataMode" . }}
- metricstransform/ldm
- metricstransform/k8s_cluster_info_ldm
- metricstransform/ksm
- filter/exclude_metrics_low_data_mode
- filter/nr_exclude_zero_value_kube_jobs
- transform/low_data_mode_inator
- resource/low_data_mode_inator
{{- end }}
Expand Down
Loading