Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix TRIGGER checks for MySQLfix-mysql-grant-check | Yorick Peterse | 2017-11-06 | 1 | -11/+19 |
| | | | | | | | | | This ensures we can check if the user has TRIGGER permissions without querying restricted tables. Thanks to Steve Norman (https://gitlab.com/stevenorman) for helping out with this merge request. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38372 | ||||
* | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 3 | -18/+5 |
|\ | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879 | ||||
| * | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 3 | -8/+115 |
| |\ | |||||
| * \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 5 | -4/+89 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 23 | -48/+102 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 11 | -32/+230 |
| |\ \ \ \ | |||||
| * | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 2 | -5/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 25 | -65/+270 |
| |\ \ \ \ \ | |||||
| * | | | | | | This works | Shinya Maeda | 2017-10-23 | 1 | -13/+0 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master' | Grzegorz Bizon | 2017-11-06 | 21 | -350/+684 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all InfluxDB metrics to prometheus See merge request gitlab-org/gitlab-ce!13891 | ||||
| * | | | | | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643 | Pawel Chojnacki | 2017-11-03 | 1 | -12/+21 |
| | | | | | | | | |||||
| * | | | | | | | Make subscriber tests pass, after refactoring metrics | Pawel Chojnacki | 2017-11-02 | 2 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Use Mutex to guard metrics creation in transaction. Switch action view to ↵ | Pawel Chojnacki | 2017-11-02 | 2 | -28/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threadsafe instance variables | ||||
| * | | | | | | | move metrics for ActiveRecord, RailsCache and queue duration to instance ↵ | Pawel Chojnacki | 2017-11-02 | 3 | -38/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables | ||||
| * | | | | | | | rename BackgroundMigration to SidekiqMigration | Pawel Chojnacki | 2017-11-02 | 3 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix sidekiq middleware tests | Pawel Chojnacki | 2017-11-02 | 3 | -6/+5 |
| | | | | | | | | |||||
| * | | | | | | | Remove unnecessary namespace use | Pawel Chojnacki | 2017-11-02 | 2 | -7/+7 |
| | | | | | | | | |||||
| * | | | | | | | Tests for Web transaction and remove simple transacton | Pawel Chojnacki | 2017-11-02 | 5 | -264/+33 |
| | | | | | | | | |||||
| * | | | | | | | Web/Sidekiq transaction split | Pawel Chojnacki | 2017-11-02 | 3 | -1/+262 |
| | | | | | | | | |||||
| * | | | | | | | Move labels to be initialized in constructor | Pawel Chojnacki | 2017-11-02 | 1 | -5/+2 |
| | | | | | | | | |||||
| * | | | | | | | Avoid using Send (but is it better?) + small rubocop cleanup | Pawel Chojnacki | 2017-11-02 | 2 | -10/+8 |
| | | | | | | | | |||||
| * | | | | | | | Cleanup metrics names and removing unnecessary cache read total | Pawel Chojnacki | 2017-11-02 | 1 | -15/+5 |
| | | | | | | | | |||||
| * | | | | | | | Adjust test to changed metrics methods. | Pawel Chojnacki | 2017-11-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + remove deprecated test suite | ||||
| * | | | | | | | Convert rails_queue_duration to metric_rails_queue_duration_seconds | Pawel Chojnacki | 2017-11-02 | 1 | -1/+12 |
| | | | | | | | | |||||
| * | | | | | | | Add info about prometheus buckets | Pawel Chojnacki | 2017-11-02 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fix cpu time | ||||
| * | | | | | | | Guard metrics creation with a mutex | Pawel Chojnacki | 2017-11-02 | 1 | -7/+23 |
| | | | | | | | | |||||
| * | | | | | | | Move labels tests from Metrics rack spec to Transaction spec | Pawel Chojnacki | 2017-11-02 | 2 | -19/+19 |
| | | | | | | | | |||||
| * | | | | | | | Fix rspec errors, and add more tests to MethodCall and ActionView | Pawel Chojnacki | 2017-11-02 | 2 | -5/+21 |
| | | | | | | | | |||||
| * | | | | | | | Fix Active record and transaction specs | Pawel Chojnacki | 2017-11-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix rubocop warnings | Pawel Chojnacki | 2017-11-02 | 4 | -4/+3 |
| | | | | | | | | |||||
| * | | | | | | | Differentiatie between class and instance methods | Pawel Chojnacki | 2017-11-02 | 1 | -4/+6 |
| | | | | | | | | |||||
| * | | | | | | | Split call name to module and method name | Pawel Chojnacki | 2017-11-02 | 4 | -10/+27 |
| | | | | | | | | |||||
| * | | | | | | | More parsable labels in method performance measurements | Pawel Chojnacki | 2017-11-02 | 2 | -7/+7 |
| | | | | | | | | |||||
| * | | | | | | | Make transaction labels more readable | Pawel Chojnacki | 2017-11-02 | 3 | -34/+48 |
| | | | | | | | | |||||
| * | | | | | | | Fix measure codde to work with seconds | Pawel Chojnacki | 2017-11-02 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Rails cache metrics name alignment | Pawel Chojnacki | 2017-11-02 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | Transaction needs to be able to describe controller action by itself | Pawel Chojnacki | 2017-11-02 | 2 | -71/+73 |
| | | | | | | | | |||||
| * | | | | | | | Tune bucket sizes an action labels | Pawel Chojnacki | 2017-11-02 | 4 | -19/+19 |
| | | | | | | | | |||||
| * | | | | | | | Add action tag to more metrics | Pawel Chojnacki | 2017-11-02 | 2 | -7/+30 |
| | | | | | | | | |||||
| * | | | | | | | Introduce missing Action concept | Pawel Chojnacki | 2017-11-02 | 4 | -33/+62 |
| | | | | | | | | |||||
| * | | | | | | | Cleanup transaction metrics | Pawel Chojnacki | 2017-11-02 | 3 | -20/+35 |
| | | | | | | | | |||||
| * | | | | | | | Cleanup sampling code and fix bug with samplers running without sleep | Pawel Chojnacki | 2017-11-02 | 5 | -29/+20 |
| | | | | | | | | |||||
| * | | | | | | | remove common Base Sampler code | Pawel Chojnacki | 2017-11-02 | 1 | -53/+18 |
| | | | | | | | | |||||
| * | | | | | | | Remove transaction tags and map transaction metrics to prometheus | Pawel Chojnacki | 2017-11-02 | 2 | -25/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + clean transaction metrics + Gemfile.lock file update | ||||
| * | | | | | | | Transaction and method instrumentation | Pawel Chojnacki | 2017-11-02 | 3 | -26/+58 |
| | | | | | | | | |||||
| * | | | | | | | Finished Ruby Sampler | Pawel Chojnacki | 2017-11-02 | 1 | -18/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Cleanup sampler, use latest Prometheus gem | ||||
| * | | | | | | | Add samples total and cleanup | Pawel Chojnacki | 2017-11-02 | 1 | -26/+53 |
| | | | | | | | | |||||
| * | | | | | | | Add GC sampler and small refactor of samplers | Pawel Chojnacki | 2017-11-02 | 7 | -212/+338 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master' | Sean McGivern | 2017-11-06 | 2 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129 | ||||
| * | | | | | | | fix the failing specremove-ensure-ref-fetched-from-controllers | micael.bergeron | 2017-11-03 | 1 | -1/+0 |
| | | | | | | | |