Skip to content

Commit b7a4246

Browse files
committed
enable clickhouse_role_manage_settings_profiles and clickhouse_role_manage_quotas
https://github.com/idealista/clickhouse_role/blob/main/molecule/default/group_vars/clickhouse_group.yml actually use sha256 password type clickhouse role disregards password_type and only looks at key password_sha256_hex ... fix quotas keys
1 parent a5fd688 commit b7a4246

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

ansible/group_vars/clickhouse/vars.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ clickhouse_distributed_ddl:
165165
cleanup_delay_period: 60
166166
max_tasks_in_queue: 1000
167167

168+
clickhouse_role_manage_settings_profiles: True
168169
clickhouse_default_profiles:
169170
default:
170171
readonly: 2
@@ -226,12 +227,12 @@ clickhouse_default_users:
226227
profile: write
227228
quota: default
228229

229-
clickhouse_role_manage_users: true
230+
clickhouse_role_manage_users: True
230231
clickhouse_custom_users:
231232
- user:
232233
name: oonimeasurements
233234
password_type: sha256_password
234-
password: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/clickhouse_oonimeasurements_password', profile='oonidevops_user_prod') }}"
235+
password_sha256_hex: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/clickhouse_oonimeasurements_password', profile='oonidevops_user_prod') | hash('sha256') }}"
235236
networks:
236237
- "IP '0.0.0.0/0'"
237238
settings:
@@ -252,19 +253,19 @@ clickhouse_custom_users:
252253
quota: "oonimeasurements"
253254
databases: [ooni]
254255

255-
# TODO: this quota was created by hand since it wasn't working in the idealista playbook
256-
clickhouse_role_manage_quotas: false
256+
clickhouse_role_manage_quotas: True
257257
clickhouse_custom_quotas:
258258
# quota over a 10 minute window
259259
- quota:
260260
name: oonimeasurements
261-
settings:
262-
- "INTERVAL 10 minute MAX queries = 12000, MAX errors = 1000, MAX execution_time = 1000"
263-
to:
264-
- oonimeasurements
261+
duration: 600
262+
queries: 12000
263+
errors: 1000
264+
result_rows: 0
265+
read_rows: 0
266+
execution_time: 1000
265267

266-
clickhouse_role_manage_grants: true
267-
clickhouse_role_manage_roles: true
268+
clickhouse_role_manage_grants: True
268269
clickhouse_custom_grants:
269270
- on:
270271
databases: [ooni]
@@ -276,6 +277,7 @@ clickhouse_custom_grant_roles:
276277
- roles: [oonimeasurements]
277278
to: [oonimeasurements]
278279

280+
clickhouse_role_manage_roles: True
279281
clickhouse_custom_roles:
280282
- role:
281283
name: oonimeasurements

0 commit comments

Comments
 (0)