Update cadvisor and containerd

vendor/github.com/google/cadvisor/collector/prometheus_collector.go

@@ -184,6 +184,17 @@ func (s byName) Less(i, j int) bool {
 	return s.prometheusLabels[i].GetName() < s.prometheusLabels[j].GetName()
 }
 
+func prometheusLabelSetToCadvisorLabels(promLabels model.Metric) map[string]string {
+	labels := make(map[string]string)
+	for k, v := range promLabels {
+		if string(k) == "__name__" {
+			continue
+		}
+		labels[string(k)] = string(v)
+	}
+	return labels
+}
+
 func prometheusLabelSetToCadvisorLabel(promLabels model.Metric) string {
 	labels := labelSetToLabelPairs(promLabels)
 	sort.Sort(byName{labels})
@@ -247,11 +258,13 @@ func (collector *PrometheusCollector) Collect(metrics map[string][]v1.MetricVal)
 			// TODO Handle multiple labels nicer. Prometheus metrics can have multiple
 			// labels, cadvisor only accepts a single string for the metric label.
 			label := prometheusLabelSetToCadvisorLabel(sample.Metric)
+			labels := prometheusLabelSetToCadvisorLabels(sample.Metric)
 
 			metric := v1.MetricVal{
 				FloatValue: float64(sample.Value),
 				Timestamp:  sample.Timestamp.Time(),
 				Label:      label,
+				Labels:     labels,
 			}
 			newMetrics[metName] = append(newMetrics[metName], metric)
 			if len(newMetrics) > collector.metricCountLimit {