summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Rubocop styling in AR subscriber specsmetrics-tuningYorick Peterse2016-01-041-1/+1
|
* Automatically prefix transaction series namesYorick Peterse2016-01-048-20/+19
| | | | | This ensures Rails and Sidekiq transactions are split into the series "rails_transactions" and "sidekiq_transactions" respectively.
* Use separate series for Rails/Sidekiq sample statsYorick Peterse2016-01-042-13/+44
| | | | | This removes the need for any tags to differentiate between Sidekiq and Rails statistics while still being able to separate the two.
* Track total method call times per transactionYorick Peterse2016-01-042-0/+8
| | | | | This makes it easier to see where time is spent without having to aggregate all the individual points in the method_calls series.
* Track total query/view timings in transactionsYorick Peterse2016-01-045-0/+62
|
* Ability to increment custom transaction valuesYorick Peterse2016-01-042-2/+25
| | | | | | This will be used to store/increment the total query/view rendering timings on a per transaction basis. This in turn can greatly reduce the amount of metrics stored.
* Removed tracking of hostnames for metricsYorick Peterse2015-12-315-19/+2
| | | | | This isn't hugely useful and mostly wastes InfluxDB space. We can re-add this whenever needed (but only once we really need it).
* Use separate series for Rails/Sidekiq transactionsYorick Peterse2015-12-319-14/+15
| | | | This removes the need for tagging all metrics with a "process_type" tag.
* Cache InfluxDB settings after the first useYorick Peterse2015-12-312-23/+21
| | | | | This ensures we don't need to load anything from either PostgreSQL or the Rails cache whenever creating new InfluxDB connections.
* Removed tracking of raw SQL queriesYorick Peterse2015-12-315-221/+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 'update-allocations-gem' into 'master' Yorick Peterse2015-12-311-1/+1
|\ | | | | See merge request !2262
| * Updated allocations Gem to version 1.0.3update-allocations-gemYorick Peterse2015-12-311-1/+1
| |
* | Merge branch 'reduce-influxdb-tags' into 'master' Yorick Peterse2015-12-312-8/+2
|\ \ | |/ |/| See merge request !2252
| * Removed various default metrics tagsreduce-influxdb-tagsYorick Peterse2015-12-312-8/+2
|/ | | | | | | | While it's useful to keep track of the different versions (Ruby, GitLab, etc) doing so for every point wastes disk space and possibly also RAM (which InfluxDB is all to eager to gobble up). If we want to see the performance differences between different GitLab versions simply looking at the performance since the last release date should suffice.
* Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' ↵Robert Speicher2015-12-303-9/+9
|\ | | | | | | | | | | | | | | | | | | into 'master' Swap Author and Assignee Selectors on issuable index view Closes #4039 See merge request !2256
| * Update CHANGELOGRobert Speicher2015-12-301-1/+0
| | | | | | | | [ci skip]
| * Fix "I see current user as the first user" stepRobert Speicher2015-12-301-5/+4
| | | | | | | | Why did this break? `¯\_(ツ)_/¯`
| * Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-302-4/+6
|/ | | | Closes #4039
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Speicher2015-12-301-8/+0
|\
| * 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>
* | | Update CHANGELOGRobert Speicher2015-12-301-1/+1
|/ / | | | | | | [ci skip]
* | Merge branch 'fix-build' into 'master' Robert Speicher2015-12-301-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure that is no pending migrations when using database on Gitlab::CurrentSettings This fixes the undefined method `recaptcha_enabled' for #<ApplicationSetting:0x007f28552f8238> when running the build. See merge request !2254
| * | Make sure that is no pending migrations in Gitlab::CurrentSettingsfix-buildDouglas Barbosa Alexandre2015-12-301-1/+3
| |/
* | Merge branch 'feature/env_variables_for_emails' into 'master' jenkins-integration-fixSytse Sijbrandij2015-12-303-6/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Added additional config environmental variables to help Debian packaging * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO This is a followup on https://gitlab.com/gitlab-org/gitlab-ce/issues/3717 See merge request !2251
| * Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-303-6/+9
|/ | | | | * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
* Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
|\ | | | | | | | | | | | | Hotfix for builds trace data integrity Closes #4246 See merge request !2224
| * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| | | | | | | | | | | | | | | | | | | | | | This is a temporary hotfix that allows to access build artifacts created before 8.3. See #5257. This needs to be changed after migrating CI build files. Note that `ArtifactUploader` uses `artifacts_path` to create a storage directory before and after parsisting `Ci::Build` instance, before and after moving a file to store (save and fetch a file).
| * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
| | | | | | | | Issue #4246
* | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false ``` Fixes #4118, #4136 See merge request !2136
| * | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
| | |
* | | Merge branch 'fix-transfer-project-email' into 'master' Robert Speicher2015-12-292-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project transfer e-mail sending incorrect paths in e-mail notification The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670 See merge request !2235
| * | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-292-1/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670
* | | Update CHANGELOGRobert Speicher2015-12-291-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-296-23/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * | | note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
| | | |
| * | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-286-21/+22
| | | |
* | | | Merge branch 'influxdb-current-settings' into 'master' Yorick Peterse2015-12-291-25/+11
|\ \ \ \ | | | | | | | | | | See merge request !2239
| * | | | Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
|/ / / / | | | | | | | | | | | | | | | | This ensures we can still start up even when not connecting to a database.
* | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-2919-155/+155
|\ \ \ \ | | | | | | | | | | See merge request !2238
| * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-2918-155/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
| * | | | Strip newlines from obfuscated SQLYorick Peterse2015-12-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Newlines aren't really needed and they may mess with InfluxDB's line protocol.
* | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234
| * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-2913-71/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231
| * | | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settingsStan Hu2015-12-281-1/+1
| | | | | |
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-2813-71/+84
| | | | | |
* | | | | | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-292-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling mistake, thanks Connor. [ci skip] See merge request !2227
| * | | | | Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-282-4/+4
| | | | | |
* | | | | | Merge branch 'influxdb-missing-settings' into 'master' Yorick Peterse2015-12-282-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing settings table for metrics See merge request !2232
View Lorry Controller Status