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.

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

Already on GitHub? Sign in to your account

[kubernetes] add metrics for k8s deployments #2728

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 30 additions & 2 deletions checks.d/kubernetes.py
Expand Up @@ -317,13 +317,41 @@ def _update_metrics(self, instance, pods_list):

self._update_pods_metrics(instance, pods_list)

deployment_list = self.kubeutil.retrieve_deployments_list()
self._update_deployment_metrics(instance, deployment_list)

def _update_deployment_metrics(self, instance, deployments):
deployments_map = dict()
for deployment in deployments['items']:
try:
pod_count = deployment['status']['replicas']
pod_desired_count = deployment['spec']['replicas']
pod_available_count = deployment['status']['availableReplicas']
deployments_map[deployment['metadata']['name']] = {
'pods': pod_count,
'desired': pod_desired_count,
'available': pod_available_count,
'unavailable': pod_count - pod_available_count
}
except KeyError:
continue

tags = instance.get('tags', [])
for dep, stats in deployments_map.iteritems():
_tags = tags[:]
_tags.append('kube_deployment:{0}'.format(dep))
self.publish_gauge(self, NAMESPACE + '.pods.running', stats['pods'], _tags)
self.publish_gauge(self, NAMESPACE + '.pods.desired', stats['desired'], _tags)
self.publish_gauge(self, NAMESPACE + '.pods.available', stats['available'], _tags)
self.publish_gauge(self, NAMESPACE + '.pods.unavailable', stats['unavailable'], _tags)

def _update_pods_metrics(self, instance, pods):
supported_kinds = [
"DaemonSet",
"Deployment",
"Job",
"ReplicationController",
"ReplicaSet",
"Deployment",
"ReplicaSet"
]

controllers_map = defaultdict(int)
Expand Down
136 changes: 136 additions & 0 deletions tests/checks/fixtures/kubernetes/deployments_list.json
@@ -0,0 +1,136 @@
{
"kind": "DeploymentList",
"apiVersion": "extensions/v1beta1",
"metadata": {
"selfLink": "/apis/extensions/v1beta1/deployments",
"resourceVersion": "1323769"
},
"items": [
{
"metadata": {
"name": "heapster-v1.1.0",
"namespace": "kube-system",
"selfLink": "/apis/extensions/v1beta1/namespaces/kube-system/deployments/heapster-v1.1.0",
"uid": "4707e5fd-4e98-11e6-8ed7-42010af0019d",
"resourceVersion": "1146651",
"generation": 4,
"creationTimestamp": "2016-07-20T16:37:41Z",
"labels": {
"k8s-app": "heapster",
"kubernetes.io/cluster-service": "true",
"version": "v1.1.0"
},
"annotations": {
"deployment.kubernetes.io/revision": "2"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"k8s-app": "heapster",
"version": "v1.1.0"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0"
}
},
"spec": {
"containers": [
{
"name": "heapster",
"image": "eu.gcr.io/google_containers/heapster:v1.1.0",
"command": [
"/heapster",
"--source=kubernetes.summary_api:''"
],
"resources": {
"limits": {
"cpu": "88m",
"memory": "204Mi"
},
"requests": {
"cpu": "88m",
"memory": "204Mi"
}
},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent"
},
{
"name": "heapster-nanny",
"image": "eu.gcr.io/google_containers/addon-resizer:1.3",
"command": [
"/pod_nanny",
"--cpu=80m",
"--extra-cpu=0.5m",
"--memory=140Mi",
"--extra-memory=4Mi",
"--threshold=5",
"--deployment=heapster-v1.1.0",
"--container=heapster",
"--poll-period=300000",
"--estimator=exponential"
],
"env": [
{
"name": "MY_POD_NAME",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
"fieldPath": "metadata.name"
}
}
},
{
"name": "MY_POD_NAMESPACE",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
"fieldPath": "metadata.namespace"
}
}
}
],
"resources": {
"limits": {
"cpu": "50m",
"memory": "92960Ki"
},
"requests": {
"cpu": "50m",
"memory": "92960Ki"
}
},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent"
}
],
"restartPolicy": "Always",
"terminationGracePeriodSeconds": 30,
"dnsPolicy": "ClusterFirst",
"securityContext": {}
}
},
"strategy": {
"type": "RollingUpdate",
"rollingUpdate": {
"maxUnavailable": 1,
"maxSurge": 1
}
}
},
"status": {
"observedGeneration": 4,
"replicas": 1,
"updatedReplicas": 1,
"availableReplicas": 1
}
}
]
}