From 93c0974da3b9c474fdea89245eb58808b853d427 Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Wed, 31 May 2017 16:44:01 -0400 Subject: [PATCH 1/2] Revert "Clarify tags on new pod phase gauge (#397)" This reverts commit c72e0129a9abb152163cf08efa0f0aa78aa81c68. --- kubernetes_state/metadata.csv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes_state/metadata.csv b/kubernetes_state/metadata.csv index 1789a4601b0f0..3bc798460741e 100644 --- a/kubernetes_state/metadata.csv +++ b/kubernetes_state/metadata.csv @@ -50,8 +50,8 @@ kubernetes_state.resourcequota.requests.memory.limit,gauge,,byte,,Hard limit on kubernetes_state.resourcequota.requests.storage.limit,gauge,,byte,,Hard limit on the total of storage bytes requested for a resource quota,0,kubernetes,k8s_state.resourcequota.requests.storage.limit kubernetes_state.resourcequota.limits.cpu.limit,gauge,,cpu,,Hard limit on the sum of CPU core limits for a resource quota,0,kubernetes,k8s_state.resourcequota.limits.cpu.limit kubernetes_state.resourcequota.limits.memory.limit,gauge,,byte,,Hard limit on the sum of memory bytes limits for a resource quota,0,kubernetes,k8s_state.resourcequota.limits.mem.limit -kubernetes_state.pod.phase.running,gauge,,,Number of pods running, tagged by pod and namespace,0,kubernetes,k8s_state.pod.phase.running -kubernetes_state.pod.phase.pending,gauge,,,Number of pods pending scheduling, tagged by pod and namespace,0,kubernetes,k8s_state.pod.phase.pending -kubernetes_state.pod.phase.succeeded,gauge,,,Number of pods terminated with success, tagged by pod and namespace,0,kubernetes,k8s_state.pod.phase.succeeded -kubernetes_state.pod.phase.failed,gauge,,,Number of pods terminated with failure, tagged by pod and namespace,-1,kubernetes,k8s_state.pod.phase.failed -kubernetes_state.pod.phase.unknown,gauge,,,Number of pods in unknown state, tagged by pod and namespace,-1,kubernetes,k8s_state.pod.phase.unknown +kubernetes_state.pod.phase.running,gauge,,,Number of pods running with these tags,0,kubernetes,k8s_state.pod.phase.running +kubernetes_state.pod.phase.pending,gauge,,,Number of pods pending scheduling with these tags,0,kubernetes,k8s_state.pod.phase.pending +kubernetes_state.pod.phase.succeeded,gauge,,,Number of pods terminated with success with these tags,0,kubernetes,k8s_state.pod.phase.succeeded +kubernetes_state.pod.phase.failed,gauge,,,Number of pods terminated with failure with these tags,-1,kubernetes,k8s_state.pod.phase.failed +kubernetes_state.pod.phase.unknown,gauge,,,Number of pods in unknown state with these tags,-1,kubernetes,k8s_state.pod.phase.unknown From f13f58b1f993981d3bec38e7b624ab274440bed9 Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Wed, 31 May 2017 16:44:22 -0400 Subject: [PATCH 2/2] Revert "Merge pull request #395 from DataDog/xvello/record_status_phase" This reverts commit 3e6d2d0e33f548c63a8c4d366da4e0dd1165fa3b, reversing changes made to 588c6fa986879d760ab363f9bf148d7f2654a8ea. --- kubernetes_state/metadata.csv | 5 ----- 1 file changed, 5 deletions(-) diff --git a/kubernetes_state/metadata.csv b/kubernetes_state/metadata.csv index 3bc798460741e..0426caa7f7f92 100644 --- a/kubernetes_state/metadata.csv +++ b/kubernetes_state/metadata.csv @@ -50,8 +50,3 @@ kubernetes_state.resourcequota.requests.memory.limit,gauge,,byte,,Hard limit on kubernetes_state.resourcequota.requests.storage.limit,gauge,,byte,,Hard limit on the total of storage bytes requested for a resource quota,0,kubernetes,k8s_state.resourcequota.requests.storage.limit kubernetes_state.resourcequota.limits.cpu.limit,gauge,,cpu,,Hard limit on the sum of CPU core limits for a resource quota,0,kubernetes,k8s_state.resourcequota.limits.cpu.limit kubernetes_state.resourcequota.limits.memory.limit,gauge,,byte,,Hard limit on the sum of memory bytes limits for a resource quota,0,kubernetes,k8s_state.resourcequota.limits.mem.limit -kubernetes_state.pod.phase.running,gauge,,,Number of pods running with these tags,0,kubernetes,k8s_state.pod.phase.running -kubernetes_state.pod.phase.pending,gauge,,,Number of pods pending scheduling with these tags,0,kubernetes,k8s_state.pod.phase.pending -kubernetes_state.pod.phase.succeeded,gauge,,,Number of pods terminated with success with these tags,0,kubernetes,k8s_state.pod.phase.succeeded -kubernetes_state.pod.phase.failed,gauge,,,Number of pods terminated with failure with these tags,-1,kubernetes,k8s_state.pod.phase.failed -kubernetes_state.pod.phase.unknown,gauge,,,Number of pods in unknown state with these tags,-1,kubernetes,k8s_state.pod.phase.unknown