Merge pull request #9521 from zalando-incubator/remove-cadvisor

Remove legacy cadvisor and related config-items

Author: mikkeloscar

cluster/config-defaults.yaml

@@ -397,12 +397,6 @@ event_rate_limit_enable: "true"
 event_rate_limit_config_qps: "500"
 event_rate_limit_config_burst: "1000"
 
-# cadvisor settings
-cadvisor_cpu: "150m"
-cadvisor_memory: "150Mi"
-cadvisor_profiling_enabled: "false"
-cadvisor_enabled: "false"
-
 # settings for enabling the kubelet-summary-metrics proxy and prometheus metric
 # collection.
 kubelet_summary_metrics_enabled: "true"

cluster/manifests/node-monitor/daemonset.yaml

@@ -30,55 +30,6 @@ spec:
       priorityClassName: system-node-critical
       serviceAccountName: node-monitor
       containers:
-{{- if eq .Cluster.ConfigItems.cadvisor_enabled "true" }}
-        - name: cadvisor
-          image: container-registry.zalando.net/teapot/cadvisor:v0.47.0-master-11
-          args:
-            - --port=9101
-{{- if eq .Cluster.ConfigItems.cadvisor_profiling_enabled "true" }}
-            - --profiling
-{{- end }}
-            - --housekeeping_interval=10s
-            - --max_housekeeping_interval=15s
-            - --event_storage_event_limit=default=0
-            - --event_storage_age_limit=default=0
-            - --disable_metrics=sched,percpu,tcp,udp,cpu_topology,advtcp
-            - --docker_only
-            - --raw_cgroup_prefix_whitelist=/system.slice/kubelet.service
-            - --store_container_labels=false
-            - --whitelisted_container_labels=io.kubernetes.container.name,io.kubernetes.pod.name,io.kubernetes.pod.namespace,io.kubernetes.pod.uid,application,component
-          resources:
-            requests:
-              cpu: "{{ .Cluster.ConfigItems.cadvisor_cpu }}"
-              memory: "{{ .Cluster.ConfigItems.cadvisor_memory }}"
-              ephemeral-storage: 256Mi
-            limits:
-              cpu: "{{ .Cluster.ConfigItems.cadvisor_cpu }}"
-              memory: "{{ .Cluster.ConfigItems.cadvisor_memory }}"
-          securityContext:
-            privileged: true # allows reading /dev/kmsg
-          volumeMounts:
-            - name: rootfs
-              mountPath: /rootfs
-              readOnly: true
-            - name: var-run
-              mountPath: /var/run
-              readOnly: true
-            - name: sys
-              mountPath: /sys
-              readOnly: true
-            - name: containerd
-              mountPath: /opt/podruntime/containerd
-              readOnly: true
-            - name: kmsg
-              mountPath: /dev/kmsg
-              readOnly: true
-          ports:
-            - name: cadvisor
-              containerPort: 9101
-              hostPort: 9101
-              protocol: TCP
-{{- end }}
         - image: container-registry.zalando.net/teapot/prometheus-node-exporter:v1.9.1-master-24
           args:
 {{- if eq .Cluster.ConfigItems.node_exporter_experimental_metrics "true" }}

cluster/manifests/node-monitor/service.yaml

@@ -8,12 +8,6 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-{{- if eq .Cluster.ConfigItems.cadvisor_enabled "true" }}
-    - name: cadvisor
-      port: 80
-      targetPort: 9101
-      protocol: TCP
-{{- end }}
     - name: node-exporter
       port: 81
       targetPort: 9100

cluster/manifests/prometheus/configmap.yaml

@@ -354,50 +354,6 @@ data:
       - action: replace
         source_labels: ['__meta_kubernetes_pod_node_name']
         target_label: node_name
-{{- if eq .Cluster.ConfigItems.cadvisor_enabled "true" }}
-    - job_name: 'cadvisor'
-      scheme: http
-      honor_labels: true
-      kubernetes_sd_configs:
-      - role: endpointslice
-        namespaces:
-          names:
-            - kube-system
-      relabel_configs:
-      - source_labels: [__meta_kubernetes_endpointslice_name]
-        action: keep
-        regex: "node-monitor-.*"
-      - source_labels: [__meta_kubernetes_endpointslice_port_name]
-        action: keep
-        regex: cadvisor
-      - action: replace
-        source_labels: ['__meta_kubernetes_pod_node_name']
-        target_label: node_name
-      metric_relabel_configs:
-{{- if eq .Cluster.ConfigItems.disable_zmon_appliance_worker_tracking "true" }}
-      - action: drop
-        source_labels: ["container_label_application", "container_label_component"]
-        regex: "zmon-appliance;worker"
-{{- end }}
-      - action: replace
-        source_labels: ['container_label_application']
-        target_label: application
-      - action: replace
-        source_labels: ['container_label_io_kubernetes_container_name']
-        target_label: container_name
-      - action: replace
-        source_labels: ['container_label_io_kubernetes_pod_name']
-        target_label: pod_name
-      - action: replace
-        source_labels: ['container_label_io_kubernetes_pod_namespace']
-        target_label: namespace
-      - action: replace
-        source_labels: ['container_label_io_kubernetes_pod_uid']
-        target_label: uid
-      - source_labels: [__name__]
-        action: keep
-        regex: '(container_cpu_cfs_throttled_seconds_total|container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_memory_rss|container_memory_cache|container_network_receive_bytes_total|container_network_receive_packets_dropped_total|container_network_transmit_bytes_total|container_network_transmit_packets_dropped_total|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|container_threads|container_threads_max|container_file_descriptors{{ if eq .Cluster.ConfigItems.node_exporter_experimental_metrics "true" }}|ethtool{{end}})'
-{{- end }}
     - job_name: 'node-exporter'
       scheme: http
       honor_labels: true