public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[UI] logs for clusters where teamId has dash (#1859) 

* [UI] logs for clusters where teamId has dash
This commit is contained in:
Felix Kunde 2022-04-20 18:28:46 +02:00 committed by GitHub
parent 532772c5cd
commit cde448d12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/operator_ui/main.py
View File

@ -961,8 +961,13 @@ def get_operator_get_logs(worker: int):
@app.route('/operator/clusters/<namespace>/<cluster>/logs') @app.route('/operator/clusters/<namespace>/<cluster>/logs')
@authorize @authorize
def get_operator_get_logs_per_cluster(namespace: str, cluster: str): def get_operator_get_logs_per_cluster(namespace: str, cluster: str):
team, clustername = cluster.split('-', 1) user_teams = get_teams_for_user(session.get('user_name', ''))
return proxy_operator(f'/clusters/{team}/{namespace}/{clustername}/logs/') for user_team in user_teams:
if cluster.find(user_team) == 0:
team = cluster[:len(user_team)]
cluster_name = cluster[len(user_team)+1:]
break
return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')
@app.route('/login') @app.route('/login')

10
ui/requirements.txt
View File

@ -1,15 +1,15 @@
Flask-OAuthlib==0.9.5 Flask-OAuthlib==0.9.6
Flask==1.1.2 Flask==2.1.0
backoff==1.10.0 backoff==1.10.0
boto3==1.16.52 boto3==1.16.52
boto==2.49.0 boto==2.49.0
click==7.1.2 click==8.1.2
furl==2.1.0 furl==2.1.0
gevent==20.12.1 gevent==20.12.1
jq==1.1.1 jq==1.2.2
json_delta>=2.0 json_delta>=2.0
kubernetes==3.0.0 kubernetes==3.0.0
requests==2.25.1 requests==2.25.1
stups-tokens>=1.1.19 stups-tokens>=1.1.19
wal_e==1.1.1 wal_e==1.1.1
werkzeug==0.16.1 werkzeug==2.1.1