From b0a849d1c6548d2348bc207117de15542b108040 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Sun, 30 Jun 2024 16:13:23 +0300 Subject: [PATCH] add node_name lable to jobs metrics --- charts/mlops/values.yaml | 2 +- charts/optionals/Makefile | 4 +++- charts/optionals/helmfile.yaml | 1 + pkg/app/dbs/tmpl/prom/prometheus/scrapeconfigs.tpl | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/mlops/values.yaml b/charts/mlops/values.yaml index 9cfae8b0..777719bc 100644 --- a/charts/mlops/values.yaml +++ b/charts/mlops/values.yaml @@ -89,7 +89,7 @@ controlPlane: readinessPeriodSeconds: 100 readinessTimeoutSeconds: 60 cnvrgScheduler: - enabled: false + enabled: true requests: cpu: 200m memory: 1000Mi diff --git a/charts/optionals/Makefile b/charts/optionals/Makefile index e2bc4fe8..99863f31 100644 --- a/charts/optionals/Makefile +++ b/charts/optionals/Makefile @@ -2,4 +2,6 @@ istio: # deploy istio CRDs & istiod helmfile apply -lstage=istio-infra --wait # deploy istio ingress controller - helmfile apply -lstage=istio-gateway --wait \ No newline at end of file + helmfile apply -lstage=istio-gateway --wait +nginx: + kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.1/deploy/static/provider/cloud/deploy.yaml \ No newline at end of file diff --git a/charts/optionals/helmfile.yaml b/charts/optionals/helmfile.yaml index 99fc3962..6b672b68 100644 --- a/charts/optionals/helmfile.yaml +++ b/charts/optionals/helmfile.yaml @@ -20,6 +20,7 @@ releases: labels: stage: istio-gateway + repositories: - name: istio url: https://istio-release.storage.googleapis.com/charts \ No newline at end of file diff --git a/pkg/app/dbs/tmpl/prom/prometheus/scrapeconfigs.tpl b/pkg/app/dbs/tmpl/prom/prometheus/scrapeconfigs.tpl index d2f0fc1b..1721146c 100644 --- a/pkg/app/dbs/tmpl/prom/prometheus/scrapeconfigs.tpl +++ b/pkg/app/dbs/tmpl/prom/prometheus/scrapeconfigs.tpl @@ -24,6 +24,9 @@ data: - source_labels: [__meta_kubernetes_namespace] action: replace target_label: namespace + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: node_name kubernetes_sd_configs: - role: pod selectors: