Commits · d79106283fdfd1b359767f84489ec69c665016c2 · nexedi / gitlab-ce

07 Mar, 2018 6 commits

Squashed commit of the following: · d7910628

Pawel Chojnacki authored Mar 07, 2018

commit 4ff8db0d
Merge: 60f52508 5e8138aa
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Mar 6 16:08:11 2018 +0100

    Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metrics-ce

    # Conflicts:
    #	spec/models/clusters/applications/prometheus_spec.rb

commit 60f52508
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Mar 6 16:05:24 2018 +0100

    Arg.id via method pointer

commit bd684b70
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Mon Mar 5 23:32:08 2018 +0100

    one space too far

commit b5335654
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Mon Mar 5 21:02:26 2018 +0100

    Check if prometheus_adapter is properly called

commit 5ceec83a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Mon Mar 5 19:34:59 2018 +0100

    Implemente Prometheus:AdapterService

commit 273e4142
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Mar 1 20:20:41 2018 +0100

    add missing newline

commit 8ad9cd55
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Mar 1 18:14:54 2018 +0100

    Implement PrometheusDeploymentLocator + fix metrics controller

commit 2c090539
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Mon Feb 26 19:57:11 2018 +0100

    use deployment_platform DI in environment and revert changes to k8s cert verification policy

commit 637c9558
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Mon Feb 26 12:40:40 2018 +0100

    Fix failing test, when deployment platform is not bound to a cluster.

commit 0feeddaa
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sat Feb 24 01:06:08 2018 +0100

    drop the ! from synchronize_service_state! + remove unused scope

commit 22e2cad9
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sat Feb 24 00:56:50 2018 +0100

    Use deployment platform to find cluster with prometheus application

commit 57de968a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 21:33:33 2018 +0100

    Squashed commit of the following:

    commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae
    Merge: 766a42a9639 e966c6ae
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 21:30:46 2018 +0100

        Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

        # Conflicts:
        #	app/controllers/projects/prometheus/metrics_controller.rb
        #	app/controllers/projects/prometheus_controller.rb
        #	app/models/project_services/prometheus_service.rb
        #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
        #	spec/controllers/projects/prometheus/metrics_controller_spec.rb
        #	spec/models/project_services/prometheus_service_spec.rb

    commit 766a42a96393f502d439c1f0beb0b6cfb2c228d4
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 17:58:45 2018 +0100

        Move prometheus adapter to app/models/concerns

    commit ca84eed49811cf3064a2e5ea611af1c947c590d7
    Merge: 66702099586 cb504cedc2a
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 15:36:03 2018 +0100

        Merge remote-tracking branch 'upstream/backport_custom_metrics_ce_components' into 38783-add-cluster-metrics.yml

        + fix failing tests

        # Conflicts:
        #	app/controllers/projects/prometheus_controller.rb
        #	app/models/project_services/prometheus_service.rb
        #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
        #	spec/models/project_services/prometheus_service_spec.rb

    commit cb504cedc2a6e353ffb56833334681e3da09fc14
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 14:46:15 2018 +0100

        Fix prometheus_service found by find_or_initialize_service

    commit 928b84c72c2c4c46e1785b9a943c1822a137de16
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 23:15:11 2018 +0100

        additional metrics and backported tests

    commit 41291383b4b6976af94eaf9e1a7b2e2a172310e7
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 21:57:45 2018 +0100

        Introduce Metrics controller and retire prometheus controller

    commit 6e7492e4c7ffa9d8621f09198071bc14be875976
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 21:46:37 2018 +0100

        Backport PrometheusClient::Error and all->common_metrics rename

    commit 66702099586c864a7f78970a0ee0dd9f3c2beeef
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 20:23:03 2018 +0100

        fix failing tests

    commit ce921ea723cde61b2441ba98c9aca97606c719c8
    Author: Mike Greiling <mike@pixelcog.com>
    Date:   Wed Feb 21 23:47:30 2018 -0600

        add labels to cluster metrics

    commit 993830c6892e4fbf53d3f72da00002d642c7e9b2
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 01:20:49 2018 +0100

        Fix formatting probelms and few small tests

    commit 66ee65d8e3f747c90d986bc3056178422156bc8e
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 01:08:03 2018 +0100

        stop using in deployment tests environment.id

    commit 62c91978d15f0369988521363dae24bd7510d68d
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 01:06:33 2018 +0100

        fix prometheus_controller and adapter tests

    commit 977b1d34c1d03c7233582e8328f85caf634895ed
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 22 00:19:39 2018 +0100

        finish up active? -> can_query? rename

    commit e614f7daee58a9758d83ba3efe1649c8b80bc1e2
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Wed Feb 21 23:51:33 2018 +0100

        deployment prometheus adapter tests fix

    commit ebd726c114a6026fef0adf3eba6ee1972530148a
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Wed Feb 21 21:40:40 2018 +0100

        Move environment dependant tests to environment

    commit 6d31311cd3729c29233283dded70e03a4a9a3c97
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Wed Feb 21 20:40:24 2018 +0100

        update monitoring service and move adding dpeloyment_time to deployment model

    commit 60b6bf391ab36846dce122bc6b0c5196a186267c
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Wed Feb 21 20:15:46 2018 +0100

        adjust deployment spec and prometheus specs

    commit 6681662cf1c028aff2ff94aa0501732cb7119ba1
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 22:30:20 2018 +0100

        Revert changes to reactive caching

    commit e282f86c45a056889f57d3f7fd23a81c88efff6a
    Merge: 5751c73df59 6844a2df
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 22:08:17 2018 +0100

        Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

    commit 5751c73df59d0a03840a1b4b71b0637670f971a6
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 22:07:43 2018 +0100

        rename active? to can_query? and cleanup environment prometheus router

    commit 3f3c6e1d33dcd9315979daf26a95f2aab83a7de9
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 21:51:43 2018 +0100

        Fix tests, and only use prometheus service if its active

    commit 6345838bac584c213b665d334252ccab202cb271
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 16:24:27 2018 +0100

        Fix typo

    commit 7a585d32afe8da050b5615b1d036a550e06479f5
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 15:29:40 2018 +0100

        Cluster id is not required

    commit e6af62afb11fa380f6aff1c31a81bcc9bab3b1eb
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 15:15:46 2018 +0100

        Result transformation support

    commit f3b1bd7c67894f44efe33591ddb70093bd620c03
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 15:07:07 2018 +0100

        Fix rubocop warning and exten cluster query timeframe

    commit be77947cea64261a4d3dead33c3c57f413a9880c
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 14:42:47 2018 +0100

        Fix additional metrics test

    commit eb3922e16221abe16f59fae1c38122f227643343
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 14:34:44 2018 +0100

        rename prometheus adapter methods

    commit 045476cd08b21593818b274ae8a44d19b705523f
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 13:19:36 2018 +0100

        Make prometheus adapter a module

    commit f2daf050d8c689f72c4c61207930bc53c331f12e
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 20 12:00:44 2018 +0100

        refactoring wip

    commit 52e4ef5587794e811dc10a0f2dca522342a865da
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Sun Feb 18 20:25:55 2018 +0100

        cleanup prometheus adapter concept

    commit 3887365faab9dfcd9c00bcfc501d09ac62431a03
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Sun Feb 18 19:22:11 2018 +0100

        Refactor out deployment id, Rename PrometheusQuerier to PrometheusAdapter

    commit aa2fc2df57bd72c9a5e94f66d1f1e23990be6c3f
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 16 23:59:54 2018 +0100

        Refactor prometheus client

    commit e43c1ca9d9874d6cf1569f40fa1aca158d9d5d91
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 15 20:24:45 2018 +0100

        Use initial version of cluster_metrics.yml

    commit 867821ce0b2609ebf8994220aa8e3a94d66a01e0
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 15 05:24:14 2018 +0100

        Fix querying cluster metrics

    commit 1601e002a064cbb10ffe110a19433c5662858f1d
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 15 04:49:03 2018 +0100

        Queues for unicersal querier

    commit 5db198fdc925c0223be24939b76da1d544dd569c
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 15 03:35:17 2018 +0100

        refactor reactive caching and prometheus querying

    commit b0fc00e8c9d21e961ef44b0129103e2a62928b52
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Thu Feb 15 00:12:03 2018 +0100

        Add generic query additional metrics

    commit ffe76e6a9ba196bccff22c4880e0384959ad5e48
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Tue Feb 13 15:40:15 2018 +0100

        Cluster Metric yml initial

    + Remove cluster query

    + remove cluster_metrics.yml

    + Prometheus adapter tests

d7910628

Merge branch 'consistent-deployment_platform-ee' into 'master' · 674be13f
Grzegorz Bizon authored Mar 07, 2018
```
Unify deployment_platform interface with CE

See merge request gitlab-org/gitlab-ee!4875
```
674be13f
Unify deployment_platform interface with CE · 45d99c92
Lin Jen-Shin authored Mar 07, 2018
```
Make sure we override the method from CE, too
```
45d99c92
Merge branch 'sh-make-git-fetch-prune-configurable-ee' into 'master' · fe1a3903
Nick Thomas authored Mar 07, 2018
```
Make --prune a configurable parameter in fetching a git remote

See merge request gitlab-org/gitlab-ee!4818
```
fe1a3903
Merge branch '4934-improve-bring-a-demoted-primary-back-online' into 'master' · b058d335
Stan Hu authored Mar 07, 2018
```
Improve "Bring a demoted primary back online" documentation

Closes #4934

See merge request gitlab-org/gitlab-ee!4578
```
b058d335
Remove double mention of `gitlab-ctl reconfigure` · c40267e3
Stan Hu authored Mar 06, 2018

c40267e3

06 Mar, 2018 34 commits
- Merge branch 'sh-fix-duplicate-code' into 'master' · 92d4f7d6
  Robert Speicher authored Mar 06, 2018
```
Remove duplicate code

See merge request gitlab-org/gitlab-ee!4871
```
  92d4f7d6
- Merge branch 'rc/speedup-rake-jobs-ee' into 'master' · 7e56ff3c
  Robert Speicher authored Mar 06, 2018
```
[EE] Speedup rake jobs

See merge request gitlab-org/gitlab-ee!4857
```
  7e56ff3c
- Remove duplicate code · ccd8b3a8
  Stan Hu authored Mar 06, 2018
```
This was added in !4860, but somehow the code was was already present in
9c000451, causing https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/56081024
to fail.
```
  ccd8b3a8
- Merge branch 'remove-common-vue-ee' into 'master' · bafc2305
  Clement Ho authored Mar 06, 2018
```
EE Port of "Remove common_vue bundle"

See merge request gitlab-org/gitlab-ee!4849
```
  bafc2305
- EE Port of "Remove common_vue bundle" · 74d2163c
  Mike Greiling authored Mar 06, 2018
  
  74d2163c
- Merge branch 'ee-ee-183-common-code-backport' into 'master' · e1e1c338
  Sean McGivern authored Mar 06, 2018
```
Port of ee-183-common-code-backport to EE

See merge request gitlab-org/gitlab-ee!4860
```
  e1e1c338
- Merge branch '183-approvers-api' into 'master' · 7574be1c
  Sean McGivern authored Mar 06, 2018
```
Projects and MRs Approvers API

Closes #183

See merge request gitlab-org/gitlab-ee!4636
```
  7574be1c
- Merge branch 'ce-to-ee-2018-03-06' into 'master' · 25fb4798
  Robert Speicher authored Mar 06, 2018
```
CE upstream - 2018-03-06 15:24 UTC

Closes gitaly#1056, gitaly#1059, and gitlab-com/gitlab-docs#154

See merge request gitlab-org/gitlab-ee!4858
```
  25fb4798
- Merge branch 'master' into ce-to-ee-2018-03-06 · f61c6cdd
  Robert Speicher authored Mar 06, 2018
  
  f61c6cdd
- Merge branch '4658-geo-admin-fixes' into 'master' · 2ed6b0cd
  Filipa Lacerda authored Mar 06, 2018
```
Fixes and enhancements for Geo admin dashboard

Closes #4658, #4864, and #4493

See merge request gitlab-org/gitlab-ee!4536
```
  2ed6b0cd
- Merge branch '3727-fe-labels-for-epics' into 'master' · ae5ecfad
  Filipa Lacerda authored Mar 06, 2018
```
Add labels support to Epics

Closes #3727 and #4032

See merge request gitlab-org/gitlab-ee!4773
```
  ae5ecfad
- API - add approval-related endpoints for MRs and Projects · 9c000451
  Mario de la Ossa authored Feb 15, 2018
```
allow changing of approval related configuration as well as adding and
removing approvers and approver groups for both Projects and MRs
```
  9c000451
- Port of ee-183-common-code-backport to EE · 8895abaf
  Mario de la Ossa authored Mar 06, 2018
  
  8895abaf
- Merge branch '1123-mirroring-notifies-when-hard-failed' into 'master' · c0c34cda
  Douwe Maan authored Mar 06, 2018
```
Resolve "Repository mirroring should notify when failed"

Closes #1123

See merge request gitlab-org/gitlab-ee!4699
```
  c0c34cda
- Merge branch 'proper-fix-for-artifacts-service-ee' into 'master' · b7fa60d3
  Kamil Trzciński authored Mar 06, 2018
```
Port to EE "Add archive feature to trace"

See merge request gitlab-org/gitlab-ee!4776
```
  b7fa60d3
- New .dedicated-no-docs-pull-cache-job and .no-db-job definitions · b6346eaa
  Rémy Coutable authored Oct 17, 2017
```
This should speed up a bit some jobs.

Also, use ruby:2.4-alpine image in the flaky-examples-check job
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b6346eaa
- Merge branch 'ee-issue_38337' into 'master' · d76e1ce8
  Sean McGivern authored Mar 06, 2018
```
EE PORT Bring one group issue board to CE

See merge request gitlab-org/gitlab-ee!4606
```
  d76e1ce8
- Resolve additional_metrics.yml conflict · 856900d2
  Pawel Chojnacki authored Mar 06, 2018
  
  856900d2
- Add changelog entry · ad0cdcb2
  Kushal Pandya authored Mar 06, 2018
  
  ad0cdcb2
- Update endpoint details · 1f9a9bf3
  Kushal Pandya authored Mar 06, 2018
  
  1f9a9bf3
- Add styles for disabled node hover · 7acd2304
  Kushal Pandya authored Mar 06, 2018
  
  7acd2304
- Change notification recipient from mirror user to project owners and masters · 3f335fad
  Tiago Botelho authored Feb 28, 2018
  
  3f335fad
- Pass `syncStatusUnavailable` to node sync settings component · fad4ace2
  Kushal Pandya authored Mar 06, 2018
  
  fad4ace2
- Return `Unknown` for nodeVersion and dbReplicationLag on null details · e6d743c4
  Kushal Pandya authored Mar 06, 2018
  
  e6d743c4
- Merge branch 'ee-prepend-grape-api-ce' into 'master' · 701f1e82
  Rémy Coutable authored Mar 06, 2018
```
Unify lib/api/merge_requests.rb between CE and EE

See merge request gitlab-org/gitlab-ee!4404
```
  701f1e82
- Render `Unknown` for sync settings when `syncStatusUnavailable` is true · 511738f0
  Kushal Pandya authored Mar 06, 2018
  
  511738f0
- Fade out node container when request is active · 1397e92b
  Kushal Pandya authored Mar 06, 2018
  
  1397e92b
- Add methods to show modal dialog on Toggle or Remove actions · bcbbd05c
  Kushal Pandya authored Mar 06, 2018
  
  bcbbd05c
- Make Toggle, Repair and Remove actions async · 3ae93c72
  Kushal Pandya authored Mar 06, 2018
  
  3ae93c72
- Update mock data to include `_links` · 30227d7d
  Kushal Pandya authored Mar 06, 2018
  
  30227d7d
- Add `web_edit_url` and `status` keys · 1a95152b
  Kushal Pandya authored Mar 06, 2018
  
  1a95152b
- Clean up to remove ESLint disable, GeoNodesService init · 785c9adb
  Kushal Pandya authored Mar 06, 2018
  
  785c9adb
- Add methods to remove & format node object · 300987bb
  Kushal Pandya authored Mar 06, 2018
  
  300987bb
- Resolve doc/user/project/integrations/prometheus_library/kubernetes.md · 1aa55456
  Robert Speicher authored Mar 06, 2018
```
[ci skip]
```
  1aa55456