Skip to content

Commit 694ef0c

Browse files
author
Michael Myaskovsky
committed
fixed pr
1 parent 774bb4e commit 694ef0c

File tree

2 files changed

+3
-28
lines changed

2 files changed

+3
-28
lines changed

macros/edr/data_monitoring/monitors_query/column_monitoring_query.sql

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -94,33 +94,7 @@
9494
),
9595

9696
column_metrics_unpivot as (
97-
{%- if column_metrics %}
98-
{% for metric_name, metric_type in metric_name_to_type.items() %}
99-
select
100-
{{ elementary.const_as_string(column_obj.name) }} as edr_column_name,
101-
bucket_start,
102-
bucket_end,
103-
{% if timestamp_column %}
104-
{{ elementary.timediff("hour", "bucket_start", "bucket_end") }} as bucket_duration_hours,
105-
{% else %}
106-
{{ elementary.null_int() }} as bucket_duration_hours,
107-
{% endif %}
108-
{% if dimensions | length > 0 %}
109-
{{ elementary.const_as_string(elementary.join_list(dimensions, separator='; ')) }} as dimension,
110-
{{ elementary.list_concat_with_separator(prefixed_dimensions, separator='; ') }} as dimension_value,
111-
{% else %}
112-
{{ elementary.null_string() }} as dimension,
113-
{{ elementary.null_string() }} as dimension_value,
114-
{% endif %}
115-
{{ elementary.edr_cast_as_float(metric_type) }} as metric_value,
116-
{{ elementary.edr_cast_as_string(elementary.edr_quote(metric_name)) }} as metric_name,
117-
{{ elementary.edr_cast_as_string(elementary.edr_quote(metric_type)) }} as metric_type
118-
from column_metrics where {{ metric_type }} is not null
119-
{% if not loop.last %} union all {% endif %}
120-
{%- endfor %}
121-
{%- else %}
122-
{{ elementary.empty_table([('edr_column_name','string'),('bucket_start','timestamp'),('bucket_end','timestamp'),('bucket_duration_hours','int'),('dimension','string'),('dimension_value','string'),('metric_name','string'),('metric_type','string'),('metric_value','float')]) }}
123-
{%- endif %}
97+
{{ elementary.get_column_metrics_unpivot_query(column_metrics, column_obj, metric_name_to_type, timestamp_column, dimensions) }}
12498
),
12599

126100
metrics_final as (

macros/utils/cross_db_utils/get_profile_creation_query.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA {{ parameters["schema"] }} GRANT SELECT ON TA
9696
-- Create clickhouse user
9797
CREATE USER {{ parameters["user"] }} identified by '{{ parameters["password"] }}';
9898

99-
-- Grant select on all tables in the Elementary schema to the user
99+
-- Grant access on schema to user
100100
grant select on {{ parameters["schema"] }}.* to {{ parameters["user"] }}
101+
grant create table on {{ parameters["schema"] }}.* to {{ parameters["user"] }}
101102
{% endmacro %}
102103

103104

0 commit comments

Comments
 (0)