Save monitored in when generating overview

Author: mateuszklimek

macros/meta/save_monitored.sql

@@ -0,0 +1,17 @@
+{% macro save_monitored(monitored_path) %}
+
+    {% set monitored_query %}
+        select
+            {{ full_table_name('name', 'schema', 'database') }} as {{ re_data.quote_column('model') }},
+             time_filter as {{ re_data.quote_column('time_filter') }},
+            metrics as {{ re_data.quote_column('metrics') }},
+            columns as {{ re_data.quote_column('columns') }},
+            anomaly_detector as {{ re_data.quote_column('anomaly_detector') }},
+            owners as {{ re_data.quote_column('owners') }}
+        from {{ ref('re_data_selected') }}
+    {% endset %}
+    {% set query_result = run_query(monitored_query) %}
+    {% set monitored_file_path = monitored_path or 'target/re_data/monitored.json' %}
+    {% do query_result.to_json(monitored_file_path) %}
+
+{% endmacro %}

macros/public/store/export_alerts.sql

@@ -18,18 +18,5 @@
     {% set query_result = run_query(alerts_query) %}
     {% set alerts_file_path = alerts_path or 'target/re_data/alerts.json' %}
     {% do query_result.to_json(alerts_file_path) %}
-
-    {% set monitored_query %}
-        select
-            {{ full_table_name('name', 'schema', 'database') }} as {{ re_data.quote_column('model') }},
-             time_filter as {{ re_data.quote_column('time_filter') }},
-            metrics as {{ re_data.quote_column('metrics') }},
-            columns as {{ re_data.quote_column('columns') }},
-            anomaly_detector as {{ re_data.quote_column('anomaly_detector') }},
-            owners as {{ re_data.quote_column('owners') }}
-        from {{ ref('re_data_selected') }}
-    {% endset %}
-    {% set query_result = run_query(monitored_query) %}
-    {% set monitored_file_path = monitored_path or 'target/re_data/monitored.json' %}
-    {% do query_result.to_json(monitored_file_path) %}
+    {{ save_monitored(monitored_path) }}
 {% endmacro %}

macros/public/store/generate_overview.sql

@@ -6,7 +6,7 @@
     {{ timestamp_col }} as {{ re_data.quote_column('computed_on') }},
 {% endmacro %}
 
-{% macro generate_overview(start_date, end_date, interval, overview_path=None) %}
+{% macro generate_overview(start_date, end_date, interval, overview_path=None, monitored_path=None) %}
 -- depends_on: {{ ref('re_data_anomalies') }}
 -- depends_on: {{ ref('re_data_base_metrics') }}
 -- depends_on: {{ ref('re_data_schema_changes') }}
@@ -87,5 +87,7 @@
 
     {% set overview_result = run_query(overview_query) %}
     {% set overview_file_path = overview_path or 'target/re_data/overview.json' %}
-    {% do overview_result.to_json(overview_file_path) %}
+    {% do overview_result.to_json(overview_path) %}
+    {% do save_monitored(monitored_path) %}
+
 {% endmacro %}