Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Task] VX-261: Show uid when get the pod in prometheus #241

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Task] VX-261: Show uid when get the pod in prometheus #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/config/development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/config/productaion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/config/testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/entity/metrics_pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
1 change: 1 addition & 0 deletions src/prometheuscontroller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down