summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+19
| | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
* Merge branch 'fix-gravator-default-url' into 'master' Robert Speicher2016-01-181-8/+14
| | | | | | | | | | | | | Ensure Gravatar host looks like an actual host Solves #10243. I've chosen to simplify the method that extracts the host: since we only need the host, let's get rid of the path and thus get rid of the escaping problems! Unit tests should ensure that most of the cases are covered. See merge request !2482
* Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send (fake) email during dev bootstrap This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener email popups in your browser. In the latest GDK we automatically set BOOTSTRAP=1 during `make`. [ci skip] See merge request !2447
| * Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
| | | | | | | | | | | | | | | | This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener emai popups in your browser.
* | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| * | Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| | |
| * | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
* | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| * | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-1/+1
| | |
| * | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
| | |
* | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-141-2/+2
| | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class.
* | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-3/+2
| | |
* | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-0/+1
| | |
* | | Disable `:format` in artifacts browser pathGrzegorz Bizon2016-01-141-1/+1
| | |
* | | Move artifacts controller level upGrzegorz Bizon2016-01-141-7/+3
| | | | | | | | | | | | This reverts nesting artifacts controller in builds module.
* | | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-1/+2
| | |
* | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-141-1/+9
| | |
* | | Broadcast Messages can now be editedRobert Speicher2016-01-131-1/+1
| | | | | | | | | | | | Closes #3046
* | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
| * | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-121-1/+1
| | |/ | |/| | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
* | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/ / | | | | | | This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256.
* | Remove the `:coffee` and `:coffeescript` Haml filtersrs-remove-coffee-filtersRobert Speicher2016-01-111-0/+6
| | | | | | | | See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
* | Optimize LDAP and add a search timeoutDrew Blessing2016-01-112-0/+6
| |
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-3/+3
|\ \ | |/
| * Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-081-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Fix problem with projects ending with .keys #3076 Closes #3076 Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys` See merge request !1883
| | * Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-061-3/+3
| | |
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-0/+9
|\ \ \ | |/ /
| * | Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-0/+9
| | |
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-071-0/+18
|\ \ \ | |/ /
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+18
| |/
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0631-191/+388
|\ \ | |/
| * Track total query/view timings in transactionsYorick Peterse2016-01-041-0/+1
| |
| * Removed tracking of hostnames for metricsYorick Peterse2015-12-311-1/+0
| | | | | | | | | | This isn't hugely useful and mostly wastes InfluxDB space. We can re-add this whenever needed (but only once we really need it).
| * Removed tracking of raw SQL queriesYorick Peterse2015-12-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This particular setup had 3 problems: 1. Storing SQL queries as tags is very inefficient as InfluxDB ends up indexing every query (and they can get pretty large). Storing these as values instead means we can't always display the SQL as easily. 2. We already instrument ActiveRecord query methods, thus we already have timing information about database queries. 3. SQL obfuscation is difficult to get right and I'd rather not expose sensitive data by accident.
| * Merge branch 'remove-whenever-schedule' into 'master' Robert Speicher2015-12-301-8/+0
| |\ | | | | | | | | | | | | | | | | | | Remove unused config/schedule.rb file [ci skip] See merge request !2249
| | * We don't use whenever anymore. Lets remove the schedule fileJeroen van Baarsen2015-12-301-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | **Why is this needed?** Not really needed, but having code that is not used around is confusing, so lets remove it Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-301-3/+3
| |/ | | | | | | | | * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
| * reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-283-18/+0
| |
| * Merge branch 'relocate-influxdb-settings' into 'master' Yorick Peterse2015-12-282-24/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Move InfluxDB settings to ApplicationSetting This moves the settings from the YAML files to the database. cc @sytses See merge request !2228
| | * Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-282-24/+10
| | |
| * | Fixed syntax in gitlab.yml.exampleYorick Peterse2015-12-281-1/+1
| | |
| * | Merge branch 'restart-settings-are-moved-too' into 'master' Dmitriy Zaporozhets2015-12-281-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | Restart settings are moved too. See merge request !2226
| | * Restart settings are moved too.Sytse Sijbrandij2015-12-281-2/+2
| | |
| * | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-282-0/+78
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Storing of application metrics in InfluxDB This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936. See merge request !2042
| | * | Added host option for InfluxDBinfluxdbYorick Peterse2015-12-281-0/+1
| | | |
| | * | Instrument all ActiveRecord model methodsYorick Peterse2015-12-171-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works by searching the raw source code for any references to commonly used ActiveRecord methods. While not bulletproof it saves us from having to list hundreds of methods by hand. It also ensures that (most) newly added methods are instrumented automatically. This _only_ instruments models defined in app/models, should a model reside somewhere else (e.g. somewhere in lib/) it _won't_ be instrumented.
| | * | Only track method calls above a certain thresholdYorick Peterse2015-12-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we don't end up wasting resources by tracking method calls that only take a few microseconds. By default the threshold is 10 milliseconds but this can be changed using the gitlab.yml configuration file.
| | * | Instrument Gitlab::Shel and Gitlab::GitYorick Peterse2015-12-171-0/+12
| | | |
| | * | Use custom code for instrumenting method callsYorick Peterse2015-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of ActiveSupport would slow down instrumented method calls by about 180x due to: 1. ActiveSupport itself not being the fastest thing on the planet 2. caller_locations() having quite some overhead The use of caller_locations() has been removed because it's not _that_ useful since we already know the full namespace of receivers and the names of the called methods. The use of ActiveSupport has been replaced with some custom code that's generated using eval() (which can be quite a bit faster than using define_method). This new setup results in instrumented methods only being about 35-40x slower (compared to non instrumented methods).
| | * | Storing of application metrics in InfluxDBYorick Peterse2015-12-172-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to write application metrics (e.g. SQL timings) to InfluxDB. These metrics can in turn be visualized using Grafana, or really anything else that can read from InfluxDB. These metrics can be used to track application performance over time, between different Ruby versions, different GitLab versions, etc. == Transaction Metrics Currently the following is tracked on a per transaction basis (a transaction is a Rails request or a single Sidekiq job): * Timings per query along with the raw (obfuscated) SQL and information about what file the query originated from. * Timings per view along with the path of the view and information about what file triggered the rendering process. * The duration of a request itself along with the controller/worker class and method name. * The duration of any instrumented method calls (more below). == Sampled Metrics Certain metrics can't be directly associated with a transaction. For example, a process' total memory usage is unrelated to any running transactions. While a transaction can result in the memory usage going up there's no accurate way to determine what transaction is to blame, this becomes especially problematic in multi-threaded environments. To solve this problem there's a separate thread that takes samples at a fixed interval. This thread (using the class Gitlab::Metrics::Sampler) currently tracks the following: * The process' total memory usage. * The number of file descriptors opened by the process. * The amount of Ruby objects (using ObjectSpace.count_objects). * GC statistics such as timings, heap slots, etc. The default/current interval is 15 seconds, any smaller interval might put too much pressure on InfluxDB (especially when running dozens of processes). == Method Instrumentation While currently not yet used methods can be instrumented to track how long they take to run. Unlike the likes of New Relic this doesn't require modifying the source code (e.g. including modules), it all happens from the outside. For example, to track `User.by_login` we'd add the following code somewhere in an initializer: Gitlab::Metrics::Instrumentation. instrument_method(User, :by_login) to instead instrument an instance method: Gitlab::Metrics::Instrumentation. instrument_instance_method(User, :save) Instrumentation for either all public model methods or a few crucial ones will be added in the near future, I simply haven't gotten to doing so just yet. == Configuration By default metrics are disabled. This means users don't have to bother setting anything up if they don't want to. Metrics can be enabled by editing one's gitlab.yml configuration file (see config/gitlab.yml.example for example settings). == Writing Data To InfluxDB Because InfluxDB is still a fairly young product I expect the worse. Data loss, unexpected reboots, the database not responding, you name it. Because of this data is _not_ written to InfluxDB directly, instead it's queued and processed by Sidekiq. This ensures that users won't notice anything when InfluxDB is giving trouble. The metrics worker can be started in a standalone manner as following: bundle exec sidekiq -q metrics The corresponding class is called MetricsWorker.