diff --git a/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml b/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml index 5f6358f8..433b5666 100644 --- a/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml +++ b/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: prometheus containers: - name: kube-state-metrics - image: quay.io/coreos/kube-state-metrics:{{ .Values.controller.imageTag }} + image: sdnvortex/kube-state-metrics:{{ .Values.controller.imageTag }} ports: - name: http-metrics containerPort: 8080 diff --git a/deploy/helm/config/development.yaml b/deploy/helm/config/development.yaml index 353eee6c..3910287b 100644 --- a/deploy/helm/config/development.yaml +++ b/deploy/helm/config/development.yaml @@ -41,7 +41,7 @@ apps: # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics kube-state-metrics: controller: - imageTag: v1.3.1 + imageTag: v1.3.2 cpu: 50m # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter node-exporter: diff --git a/deploy/helm/config/productaion.yaml b/deploy/helm/config/productaion.yaml index 00c386c9..98b35eff 100644 --- a/deploy/helm/config/productaion.yaml +++ b/deploy/helm/config/productaion.yaml @@ -41,7 +41,7 @@ apps: # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics kube-state-metrics: controller: - imageTag: v1.3.1 + imageTag: v1.3.2 cpu: 100m # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter node-exporter: diff --git a/deploy/helm/config/testing.yaml b/deploy/helm/config/testing.yaml index 3c788b0b..a61c26a8 100644 --- a/deploy/helm/config/testing.yaml +++ b/deploy/helm/config/testing.yaml @@ -41,7 +41,7 @@ apps: # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics kube-state-metrics: controller: - imageTag: v1.3.1 + imageTag: v1.3.2 cpu: 20m # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter node-exporter: diff --git a/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml b/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml index 9c43b035..28591707 100644 --- a/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml +++ b/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: prometheus containers: - name: kube-state-metrics - image: quay.io/coreos/kube-state-metrics:v1.3.1 + image: sdnvortex/kube-state-metrics:v1.3.2 ports: - name: http-metrics containerPort: 8080 diff --git a/src/entity/metrics_pod.go b/src/entity/metrics_pod.go index b90cf1ae..b49d814e 100644 --- a/src/entity/metrics_pod.go +++ b/src/entity/metrics_pod.go @@ -10,6 +10,7 @@ type PodMetrics struct { PodName string `json:"podName"` Namespace string `json:"namespace"` Node string `json:"node"` + UID string `json:"uid"` Status string `json:"status"` CreateAt int `json:"createAt"` CreateByKind string `json:"createByKind"` diff --git a/src/prometheuscontroller/controller.go b/src/prometheuscontroller/controller.go index 15421e7c..e9bc41af 100644 --- a/src/prometheuscontroller/controller.go +++ b/src/prometheuscontroller/controller.go @@ -183,6 +183,7 @@ func GetPod(sp *serviceprovider.Container, id string) (entity.PodMetrics, error) pod.Namespace = string(result.Metric["namespace"]) pod.CreateByKind = string(result.Metric["created_by_kind"]) pod.CreateByName = string(result.Metric["created_by_name"]) + pod.UID = string(result.Metric["uid"]) case "kube_pod_created": pod.CreateAt = int(result.Value)