diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:06:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:06:17 +0000 |
commit | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (patch) | |
tree | 23fd5f85efef0fb95eb73bf6395d5b7e8c0f1b9f /db | |
parent | 6b75320f525f841454f1ab162d141d3610f2e77b (diff) | |
download | gitlab-ce-238d22c07218adf2b8f3db630ee8b74ca6f29df5.tar.gz |
Add latest changes from gitlab-org/gitlab@masterlist
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20190919091300_create_evidences.rb | 14 | ||||
-rw-r--r-- | db/migrate/20191003015155_add_self_managed_prometheus_alerts.rb | 21 | ||||
-rw-r--r-- | db/migrate/20191016220135_add_join_table_for_self_managed_prometheus_alert_issues.rb | 22 | ||||
-rw-r--r-- | db/schema.rb | 38 |
4 files changed, 94 insertions, 1 deletions
diff --git a/db/migrate/20190919091300_create_evidences.rb b/db/migrate/20190919091300_create_evidences.rb new file mode 100644 index 00000000000..3f861ed26bd --- /dev/null +++ b/db/migrate/20190919091300_create_evidences.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class CreateEvidences < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + create_table :evidences do |t| + t.references :release, foreign_key: { on_delete: :cascade }, null: false + t.timestamps_with_timezone + t.binary :summary_sha + t.jsonb :summary, null: false, default: {} + end + end +end diff --git a/db/migrate/20191003015155_add_self_managed_prometheus_alerts.rb b/db/migrate/20191003015155_add_self_managed_prometheus_alerts.rb new file mode 100644 index 00000000000..94d16e921df --- /dev/null +++ b/db/migrate/20191003015155_add_self_managed_prometheus_alerts.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class AddSelfManagedPrometheusAlerts < ActiveRecord::Migration[5.2] + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + create_table :self_managed_prometheus_alert_events do |t| + t.references :project, index: false, foreign_key: { on_delete: :cascade }, null: false + t.references :environment, index: true, foreign_key: { on_delete: :cascade } + t.datetime_with_timezone :started_at, null: false + t.datetime_with_timezone :ended_at + + t.integer :status, null: false, limit: 2 + t.string :title, null: false, limit: 255 + t.string :query_expression, limit: 255 + t.string :payload_key, null: false, limit: 255 + t.index [:project_id, :payload_key], unique: true, name: 'idx_project_id_payload_key_self_managed_prometheus_alert_events' + end + end +end diff --git a/db/migrate/20191016220135_add_join_table_for_self_managed_prometheus_alert_issues.rb b/db/migrate/20191016220135_add_join_table_for_self_managed_prometheus_alert_issues.rb new file mode 100644 index 00000000000..68b448f8836 --- /dev/null +++ b/db/migrate/20191016220135_add_join_table_for_self_managed_prometheus_alert_issues.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class AddJoinTableForSelfManagedPrometheusAlertIssues < ActiveRecord::Migration[5.2] + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + # Join table to Issues + create_table :issues_self_managed_prometheus_alert_events, id: false do |t| + t.references :issue, null: false, + index: false, # Uses the index below + foreign_key: { on_delete: :cascade } + t.references :self_managed_prometheus_alert_event, null: false, + index: { name: 'issue_id_issues_self_managed_rometheus_alert_events_index' }, + foreign_key: { on_delete: :cascade } + + t.timestamps_with_timezone + t.index [:issue_id, :self_managed_prometheus_alert_event_id], + unique: true, name: 'issue_id_self_managed_prometheus_alert_event_id_index' + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 825b66f6dfd..cf706f8caaa 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_10_16_072826) do +ActiveRecord::Schema.define(version: 2019_10_16_220135) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -1424,6 +1424,15 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do t.index ["target_type", "target_id"], name: "index_events_on_target_type_and_target_id" end + create_table "evidences", force: :cascade do |t| + t.bigint "release_id", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.binary "summary_sha" + t.jsonb "summary", default: {}, null: false + t.index ["release_id"], name: "index_evidences_on_release_id" + end + create_table "external_pull_requests", force: :cascade do |t| t.datetime_with_timezone "created_at", null: false t.datetime_with_timezone "updated_at", null: false @@ -1936,6 +1945,15 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do t.index ["prometheus_alert_event_id"], name: "issue_id_issues_prometheus_alert_events_index" end + create_table "issues_self_managed_prometheus_alert_events", id: false, force: :cascade do |t| + t.bigint "issue_id", null: false + t.bigint "self_managed_prometheus_alert_event_id", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.index ["issue_id", "self_managed_prometheus_alert_event_id"], name: "issue_id_self_managed_prometheus_alert_event_id_index", unique: true + t.index ["self_managed_prometheus_alert_event_id"], name: "issue_id_issues_self_managed_rometheus_alert_events_index" + end + create_table "jira_connect_installations", force: :cascade do |t| t.string "client_key" t.string "encrypted_shared_secret" @@ -3309,6 +3327,19 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do t.index ["group_id", "token_encrypted"], name: "index_scim_oauth_access_tokens_on_group_id_and_token_encrypted", unique: true end + create_table "self_managed_prometheus_alert_events", force: :cascade do |t| + t.bigint "project_id", null: false + t.bigint "environment_id" + t.datetime_with_timezone "started_at", null: false + t.datetime_with_timezone "ended_at" + t.integer "status", limit: 2, null: false + t.string "title", limit: 255, null: false + t.string "query_expression", limit: 255 + t.string "payload_key", limit: 255, null: false + t.index ["environment_id"], name: "index_self_managed_prometheus_alert_events_on_environment_id" + t.index ["project_id", "payload_key"], name: "idx_project_id_payload_key_self_managed_prometheus_alert_events", unique: true + end + create_table "sent_notifications", id: :serial, force: :cascade do |t| t.integer "project_id" t.integer "noteable_id" @@ -4079,6 +4110,7 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do add_foreign_key "events", "namespaces", column: "group_id", name: "fk_61fbf6ca48", on_delete: :cascade add_foreign_key "events", "projects", on_delete: :cascade add_foreign_key "events", "users", column: "author_id", name: "fk_edfd187b6f", on_delete: :cascade + add_foreign_key "evidences", "releases", on_delete: :cascade add_foreign_key "external_pull_requests", "projects", on_delete: :cascade add_foreign_key "fork_network_members", "fork_networks", on_delete: :cascade add_foreign_key "fork_network_members", "projects", column: "forked_from_project_id", name: "fk_b01280dae4", on_delete: :nullify @@ -4140,6 +4172,8 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do add_foreign_key "issues", "users", column: "updated_by_id", name: "fk_ffed080f01", on_delete: :nullify add_foreign_key "issues_prometheus_alert_events", "issues", on_delete: :cascade add_foreign_key "issues_prometheus_alert_events", "prometheus_alert_events", on_delete: :cascade + add_foreign_key "issues_self_managed_prometheus_alert_events", "issues", on_delete: :cascade + add_foreign_key "issues_self_managed_prometheus_alert_events", "self_managed_prometheus_alert_events", on_delete: :cascade add_foreign_key "jira_connect_subscriptions", "jira_connect_installations", on_delete: :cascade add_foreign_key "jira_connect_subscriptions", "namespaces", on_delete: :cascade add_foreign_key "jira_tracker_data", "services", on_delete: :cascade @@ -4279,6 +4313,8 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do add_foreign_key "reviews", "users", column: "author_id", on_delete: :nullify add_foreign_key "saml_providers", "namespaces", column: "group_id", on_delete: :cascade add_foreign_key "scim_oauth_access_tokens", "namespaces", column: "group_id", on_delete: :cascade + add_foreign_key "self_managed_prometheus_alert_events", "environments", on_delete: :cascade + add_foreign_key "self_managed_prometheus_alert_events", "projects", on_delete: :cascade add_foreign_key "services", "projects", name: "fk_71cce407f9", on_delete: :cascade add_foreign_key "slack_integrations", "services", on_delete: :cascade add_foreign_key "smartcard_identities", "users", on_delete: :cascade |