lnmch/kops-arm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#114 hide completed jobs after one hour

Browse Source
This commit is contained in:
Henning Jacobs
2017-01-24 11:36:42 +01:00
parent a7d416d18d
commit d4f35a0952
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/node.js
View File

@@ -33,6 +33,8 @@ export default class Node extends PIXI.Graphics {
let numberOfPods = 0 let numberOfPods = 0
for (const pod of Object.values(this.node.pods)) { for (const pod of Object.values(this.node.pods)) {
numberOfPods++ numberOfPods++
// do not account for completed jobs
if (pod.phase != 'Succeeded') {
for (const container of pod.containers) { for (const container of pod.containers) {
if (container.resources && container.resources.requests) { if (container.resources && container.resources.requests) {
for (const key of Object.keys(container.resources.requests)) { for (const key of Object.keys(container.resources.requests)) {
@@ -41,6 +43,7 @@ export default class Node extends PIXI.Graphics {
} }
} }
} }
}
resources['pods'].requested = numberOfPods resources['pods'].requested = numberOfPods
resources['pods'].used = numberOfPods resources['pods'].used = numberOfPods
return resources return resources

21
kube_ops_view/kubernetes.py
View File

@@ -1,5 +1,6 @@
import datetime import datetime
import logging import logging
import time
from urllib.parse import urljoin from urllib.parse import urljoin
import requests import requests
@@ -55,6 +56,10 @@ def request(cluster, path, **kwargs):
return session.get(urljoin(cluster.api_server_url, path), auth=cluster.auth, verify=cluster.ssl_ca_cert, **kwargs) return session.get(urljoin(cluster.api_server_url, path), auth=cluster.auth, verify=cluster.ssl_ca_cert, **kwargs)
def parse_time(s: str):
return datetime.datetime.strptime(s, '%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=datetime.timezone.utc).timestamp()
def query_kubernetes_cluster(cluster): def query_kubernetes_cluster(cluster):
cluster_id = cluster.id cluster_id = cluster.id
api_server_url = cluster.api_server_url api_server_url = cluster.api_server_url
@@ -68,14 +73,24 @@ def query_kubernetes_cluster(cluster):
nodes[obj['name']] = obj nodes[obj['name']] = obj
response = request(cluster, '/api/v1/pods') response = request(cluster, '/api/v1/pods')
response.raise_for_status() response.raise_for_status()
now = time.time()
for pod in response.json()['items']: for pod in response.json()['items']:
obj = map_pod(pod) obj = map_pod(pod)
if 'deletionTimestamp' in pod['metadata']: if 'deletionTimestamp' in pod['metadata']:
obj['deleted'] = datetime.datetime.strptime(pod['metadata']['deletionTimestamp'], obj['deleted'] = parse_time(pod['metadata']['deletionTimestamp'])
'%Y-%m-%dT%H:%M:%SZ').replace(
tzinfo=datetime.timezone.utc).timestamp()
for cont in pod['spec']['containers']: for cont in pod['spec']['containers']:
obj['containers'].append(map_container(cont, pod)) obj['containers'].append(map_container(cont, pod))
if obj['phase'] == 'Succeeded':
last_termination_time = 0
for container in obj['containers']:
termination_time = container.get('state', {}).get('terminated', {}).get('finishedAt', '')
termination_time = parse_time(termination_time)
if termination_time > last_termination_time:
last_termination_time = termination_time
if last_termination_time < now - 3600:
# the job/pod finished more than an hour ago
# => filter out
continue
pods_by_namespace_name[(obj['namespace'], obj['name'])] = obj pods_by_namespace_name[(obj['namespace'], obj['name'])] = obj
pod_key = '{}/{}'.format(obj['namespace'], obj['name']) pod_key = '{}/{}'.format(obj['namespace'], obj['name'])
if 'nodeName' in pod['spec'] and pod['spec']['nodeName'] in nodes: if 'nodeName' in pod['spec'] and pod['spec']['nodeName'] in nodes: