diff --git a/victoria-monitoring/scrape-calico.yaml b/victoria-monitoring/scrape-calico.yaml index 04bba2b..8419bf4 100644 --- a/victoria-monitoring/scrape-calico.yaml +++ b/victoria-monitoring/scrape-calico.yaml @@ -30,34 +30,39 @@ metadata: name: calico-kube-controllers namespace: vm spec: - selector: - matchLabels: - k8s-app: kube-controllers namespaceSelector: matchNames: - calico-system + selector: + matchLabels: + k8s-app: calico-kube-controllers endpoints: - - port: metrics + - port: metrics-port path: /metrics scheme: http interval: 30s scrapeTimeout: 10s --- apiVersion: operator.victoriametrics.com/v1beta1 -kind: VMServiceScrape +kind: VMPodScrape metadata: name: calico-typha namespace: vm spec: - selector: - matchLabels: - k8s-app: calico-typha namespaceSelector: matchNames: - calico-system - endpoints: + selector: + matchLabels: + k8s-app: calico-typha + podMetricsEndpoints: - targetPort: 9093 path: /metrics scheme: http interval: 30s - scrapeTimeout: 10s \ No newline at end of file + scrapeTimeout: 10s + relabelConfigs: + - sourceLabels: [__meta_kubernetes_pod_name] + targetLabel: pod + - sourceLabels: [__meta_kubernetes_namespace] + targetLabel: kubernetes_namespace \ No newline at end of file