root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
105,907 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

66 Commits

Author SHA1 Message Date
GitLab Bot 69f0d90aad Add latest changes from gitlab-org/gitlab@master 2021-03-01 18:11:21 +00:00
GitLab Bot 5231344d99 Add latest changes from gitlab-org/gitlab@master 2021-02-11 15:09:11 +00:00
GitLab Bot 06528399ad Add latest changes from gitlab-org/gitlab@master 2020-08-25 00:10:16 +00:00
GitLab Bot 3825437c53 Add latest changes from gitlab-org/gitlab@master 2020-08-13 21:10:04 +00:00
GitLab Bot 8aab944cc5 Add latest changes from gitlab-org/gitlab@master 2020-07-15 00:09:23 +00:00
GitLab Bot 846a84f2e9 Add latest changes from gitlab-org/gitlab@master 2020-07-14 09:09:02 +00:00
GitLab Bot a64fb464b4 Add latest changes from gitlab-org/gitlab@master 2020-06-11 09:08:16 +00:00
GitLab Bot 37c8b3b44e Add latest changes from gitlab-org/gitlab@master 2020-06-04 21:08:11 +00:00
GitLab Bot 513eff6210 Add latest changes from gitlab-org/gitlab@master 2020-04-16 09:09:37 +00:00
GitLab Bot 52cacdb89b Add latest changes from gitlab-org/gitlab@master 2020-04-14 03:09:39 +00:00
GitLab Bot 5372e109c0 Add latest changes from gitlab-org/gitlab@master 2020-04-08 15:09:29 +00:00
GitLab Bot 903ccf7c93 Add latest changes from gitlab-org/gitlab@master 2020-04-07 12:09:34 +00:00
GitLab Bot 5064bf8c56 Add latest changes from gitlab-org/gitlab@master 2020-03-25 09:08:11 +00:00
GitLab Bot d3c29eae5c Add latest changes from gitlab-org/gitlab@master 2020-03-05 21:08:13 +00:00
GitLab Bot 1ca9950d5f Add latest changes from gitlab-org/gitlab@master 2020-02-11 18:08:58 +00:00
GitLab Bot 211a8c3361 Add latest changes from gitlab-org/gitlab@master 2020-02-07 12:09:13 +00:00
GitLab Bot fedf978f9a Add latest changes from gitlab-org/gitlab@master 2020-01-28 15:08:36 +00:00
GitLab Bot cfc792b9ca Add latest changes from gitlab-org/gitlab@master 2019-12-10 07:53:40 +00:00
GitLab Bot ed73d4f207 Add latest changes from gitlab-org/gitlab@master 2019-12-06 03:08:02 +00:00
GitLab Bot 68b6846fa6 Add latest changes from gitlab-org/gitlab@master 2019-11-22 15:06:39 +00:00
GitLab Bot 4c464055fb Add latest changes from gitlab-org/gitlab@master 2019-11-05 15:06:17 +00:00
David Wilkins 467a411e88 Convert RestClient to Gitlab::HTTP for Prometheus Monitor 
- Closes #60024

- Change PrometheusClient.new to accept a base url instead of an
  already created RestClient

- Use Gitlab::HTTP in PrometheusClient instead of creating RestClient
  in PrometheusService

- Move http_options from PrometheusService to
  PrometheusClient (follow_redirects: false)

- ensure that base urls don't have the trailing slash

- Created a `PrometheusClient#url` method that might not be strictly
  required

- Change rescued exceptions from RestClient::* to
  HTTParty::ResponseError where possible and StandardError for the
  rest
 2019-08-07 02:42:20 +00:00
Reuben Pereira 50591efc75 Check validity of prometheus_service before query 
Check validity before querying so that if the dns entry for the api_url
has been changed to something invalid after the model was saved and
checked for validity, it will not query. This is to solve a toctou
(time of check to time of use) issue.
 2019-03-04 18:36:43 +00:00
Cindy Pallares 94ab2d5fc8
Merge branch 'security-2736-prometheus-ssrf' into 'master' 
[master] Do not follow redirects in prometheus service

See merge request gitlab/gitlabhq!2617
 2018-11-28 19:08:32 -05:00
George Tsiolis 6ff9cea568 Remove prometheus configuration help text 2018-10-17 10:48:32 +03:00
Peter Leitzen 3a3ec6f021
Show available clusters when installed or updated 
Before this commit updating Prometheus (e.g. adding alerts) made it
"updated" therefore not installed.
 2018-10-16 09:16:43 +02:00
gfyoung 32af384adf Enable frozen string in rest of app/models/**/*.rb 
Partially addresses #47424.
 2018-08-10 00:51:01 -07:00
Francisco Javier López 840f80d48b Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
Pawel Chojnacki 0feeddaa0f drop the ! from synchronize_service_state! + remove unused scope 2018-02-24 01:06:08 +01:00
Pawel Chojnacki 57de968a92 Squashed commit of the following: 
commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae
Merge: 766a42a9639 e966c6aea2
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 6844a2df87
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
 2018-02-24 00:15:12 +01:00
Paweł Chojnacki 0e97eca1d8 Backport custom metrics ce components 2018-02-23 17:58:40 +00:00
Pawel Chojnacki 8cb105cf5f Fix order of checks in editable? method. 
+ address small nitpicks
 2018-02-07 01:54:09 +01:00
Pawel Chojnacki 277f7fef2c Make prometheus service querying approach much nicer wrt to arity and default function params 2018-02-07 01:54:09 +01:00
Mike Greiling 9cdec947e1
fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests where project is nil 2018-01-31 17:12:24 -06:00
Mike Greiling 310ae68774
hide prometheus manual integration form when auto config is active 2018-01-31 15:55:47 -06:00
Mike Greiling 0b47134e6a
change prometheus service description text to match design 2018-01-31 15:22:03 -06:00
Pawel Chojnacki 529edc9e85 Fix rubocop 2018-01-30 11:35:30 +01:00
Pawel Chojnacki 983d033135 fix service generic tests 2018-01-30 11:28:20 +01:00
Pawel Chojnacki 4b1d42bbc5 check if service is template 2018-01-17 12:29:18 +01:00
Pawel Chojnacki 57c1f7cae0 Fix rubocop warnings 2018-01-04 17:11:39 +01:00
Pawel Chojnacki 720032733a Cleanup PrometheusService tests 2018-01-04 15:04:14 +01:00
Pawel Chojnacki e308bb0cd2 Cleanup implementation and add cluster finding tests 2018-01-04 13:56:07 +01:00
Pawel Chojnacki 80d4c0675f Add test checking if prometheus integration is enabled after prometheus is installed 2018-01-04 02:45:57 +01:00
Pawel Chojnacki 249c9a8cf6 Auto enable prometheus service if Prometheus is Installed 2018-01-02 22:56:12 +01:00
Pawel Chojnacki 0c802f4fba Manual Configuration instead of Activation. Prometheus Service just got a bit weirder 2018-01-02 22:40:03 +01:00
Pawel Chojnacki b38b5ceb8e Move client creation to Prometheus Application, manufacture proper rest client 2018-01-02 21:42:24 +01:00
Pawel Chojnacki db2433c36d wip 2018-01-02 20:24:12 +01:00
Jose Ivan Vargas Lopez e30cecbc27 Resolve "Internationalization support for Prometheus Service Configuration" 2017-11-15 08:42:37 +00:00
Pawel Chojnacki e00f487049 Fix bug where Service `created_at` time was used instead of deployment time. 2017-06-22 21:19:55 +02:00
Pawel Chojnacki 0e7e7c2f2b Test Additional metrics parser and fix query checking tests 2017-06-09 22:47:01 +02:00