diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-08-10 13:17:18 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-08-10 13:17:18 +0000 |
| commit | ea671dec7f9db06c1d45ddd1536c1af194de8f62 (patch) | |
| tree | a34af0a11df86b9077161d317b9eb206b7e66548 | |
| parent | dabb332462aec45be06df8c998ca4b4a6066a470 (diff) | |
| parent | 631113f9dae7f3404f3a40036ad7bfc786883016 (diff) | |
| download | gitlab-ce-ea671dec7f9db06c1d45ddd1536c1af194de8f62.tar.gz | |
Merge branch 'ce-docker_image_replication_node_status' into 'master'
Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14943
See merge request gitlab-org/gitlab-ce!31406
| -rw-r--r-- | db/migrate/20190612111201_add_geo_container_repository_counters.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 4 | ||||
| -rw-r--r-- | doc/api/geo_nodes.md | 12 |
3 files changed, 32 insertions, 0 deletions
diff --git a/db/migrate/20190612111201_add_geo_container_repository_counters.rb b/db/migrate/20190612111201_add_geo_container_repository_counters.rb new file mode 100644 index 00000000000..b73bb885ab7 --- /dev/null +++ b/db/migrate/20190612111201_add_geo_container_repository_counters.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class AddGeoContainerRepositoryCounters < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + change_table :geo_node_statuses do |t| + t.column :container_repositories_count, :integer + t.column :container_repositories_synced_count, :integer + t.column :container_repositories_failed_count, :integer + t.column :container_repositories_registry_count, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 6674f412140..591758af0e4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1429,6 +1429,10 @@ ActiveRecord::Schema.define(version: 2019_08_06_071559) do t.integer "repositories_retrying_verification_count" t.integer "wikis_retrying_verification_count" t.integer "projects_count" + t.integer "container_repositories_count" + t.integer "container_repositories_synced_count" + t.integer "container_repositories_failed_count" + t.integer "container_repositories_registry_count" t.index ["geo_node_id"], name: "index_geo_node_statuses_on_geo_node_id", unique: true end diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md index ac64cbedf7d..e3af5d60533 100644 --- a/doc/api/geo_nodes.md +++ b/doc/api/geo_nodes.md @@ -192,6 +192,10 @@ Example response: "job_artifacts_failed_count": nil, "job_artifacts_synced_missing_on_primary_count": 0, "job_artifacts_synced_in_percentage": "0.00%", + "container_repositories_count": 3, + "container_repositories_synced_count": nil, + "container_repositories_failed_count": nil, + "container_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": nil, "repositories_synced_count": nil, @@ -255,6 +259,10 @@ Example response: "job_artifacts_failed_count": 1, "job_artifacts_synced_missing_on_primary_count": 0, "job_artifacts_synced_in_percentage": "50.00%", + "container_repositories_count": 3, + "container_repositories_synced_count": nil, + "container_repositories_failed_count": nil, + "container_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, @@ -334,6 +342,10 @@ Example response: "job_artifacts_failed_count": 1, "job_artifacts_synced_missing_on_primary_count": 0, "job_artifacts_synced_in_percentage": "50.00%", + "container_repositories_count": 3, + "container_repositories_synced_count": nil, + "container_repositories_failed_count": nil, + "container_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, |