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

[UI] use safe defaults for fetching cluster logs (#1872) 

* [UI] use safe defaults for fetching cluster logs
This commit is contained in:
Felix Kunde 2022-04-29 14:44:20 +02:00 committed by GitHub
parent a77d5df158
commit 97c7091370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/operator_ui/main.py
View File

@ -961,11 +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, cluster_name = cluster.split('-', 1)
# team id might contain hyphens, try to find correct team name
user_teams = get_teams_for_user(session.get('user_name', '')) user_teams = get_teams_for_user(session.get('user_name', ''))
for user_team in user_teams: for user_team in user_teams:
if cluster.find(user_team) == 0: if cluster.find(user_team + '-') == 0:
team = cluster[:len(user_team)] team = cluster[:len(user_team)]
cluster_name = cluster[len(user_team)+1:] cluster_name = cluster[len(user_team + '-'):]
break break
return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/') return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')