Skip to content

Commit 29092f1

Browse files
committed
feat(workspace): migrate controller from owner-based auth to workspace model
1 parent 7df708a commit 29092f1

6 files changed

Lines changed: 393 additions & 142 deletions

File tree

charts/grafana/templates/grafana-configmap.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ data:
6363
[users]
6464
allow_sign_up = false
6565
allow_org_create = false
66-
auto_assign_org = false
66+
auto_assign_org = true
67+
auto_assign_org_role = None
6768
login_hint = email or username
6869
6970
[auth]
@@ -102,12 +103,12 @@ data:
102103
103104
[quota]
104105
enabled = true
105-
org_user = 2
106+
org_user = -1
106107
org_dashboard = 20
107108
org_data_source = 5
108109
org_api_key = 2
109110
org_alert_rule = 20
110-
user_org = 2
111+
user_org = -1
111112
alerting_rule_group_rules = 20
112113
alerting_rule_evaluation_results = 20
113114

rootfs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
44
ARG DRYCC_UID=1001 \
55
DRYCC_GID=1001 \
66
DRYCC_HOME_DIR=/usr/share/grafana \
7-
GRAFANA_VERSION="12.2.1" \
7+
GRAFANA_VERSION="12.4.2" \
88
JQ_VERSION="1.7.1" \
9-
CADDY_VERSION="2.10.2" \
9+
CADDY_VERSION="2.11.2" \
1010
PYTHON_VERSION="3.14"
1111

1212
RUN groupadd drycc --gid ${DRYCC_GID} \

rootfs/usr/share/grafana/oauth2/datasources/prometheus.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Prometheus on Drycc",
33
"type": "prometheus",
44
"uid": "prometheus_on_drycc",
5-
"url": "${controller_url}/v2/prometheus/${username}",
5+
"url": "${controller_url}/v2/prometheus/${workspace}",
66
"access": "proxy",
77
"isDefault": true,
88
"basicAuth": false,

rootfs/usr/share/grafana/oauth2/datasources/quickwit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Application Logs",
33
"type": "quickwit-quickwit-datasource",
44
"uid": "application_logs",
5-
"url": "${controller_url}/v2/quickwit/${username}",
5+
"url": "${controller_url}/v2/quickwit/${workspace}",
66
"access": "proxy",
77
"basicAuth": false,
88
"jsonData": {

0 commit comments

Comments
 (0)