diff options
| author | syasonik <syasonik@gitlab.com> | 2019-02-15 14:59:14 +0800 |
|---|---|---|
| committer | syasonik <syasonik@gitlab.com> | 2019-02-15 19:42:51 +0800 |
| commit | 44542b4505d5b0a8d14e2d1aaec369703860b51c (patch) | |
| tree | 2c823a366560271e5e9d7f910268e4094f038381 | |
| parent | 52782824b678cfb9a6f12a731b75b04dd7ec2e5b (diff) | |
| download | gitlab-ce-44542b4505d5b0a8d14e2d1aaec369703860b51c.tar.gz | |
Add import/export support for prometheus queries
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 099677a791c..5da9e937540 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -71,7 +71,8 @@ project_tree: - :create_access_levels - :project_feature - :custom_attributes - - :prometheus_metrics + - prometheus_metrics: + - :prometheus_queries - :project_badges - :ci_cd_settings - :error_tracking_setting @@ -127,6 +128,8 @@ excluded_attributes: prometheus_metrics: - :common - :identifier + prometheus_queries: + - :identifier snippets: - :expired_at merge_request_diff: diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index c15b360b563..96927fc59d9 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -323,6 +323,9 @@ priorities: - label prometheus_metrics: - project +- prometheus_queries +prometheus_queries: +- prometheus_metric timelogs: - issue - merge_request diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index baca8f6d542..dfef1a11a8f 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -581,6 +581,14 @@ PrometheusMetric: - group - common - identifier +PrometheusQuery: +- id +- created_at +- updated_at +- prometheus_metric_id +- unit +- legend +- query Badge: - id - link_url |