Commit Graph
1379 Commits
Author SHA1 Message Date
Robert Speicher a0b3654e2e Merge branch 'remove-whenever-schedule' into 'master'
Remove unused config/schedule.rb file

[ci skip]

See merge request !2249
2015-12-30 21:56:07 +00:00
Gabriel Mazetto 82bfa8f40c Added additional config environmental variables to help Debian packaging
* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO
2015-12-30 12:45:24 -02:00
Jeroen van Baarsen a6fd7b74ee We don't use whenever anymore. Lets remove the schedule file
**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>
2015-12-30 13:42:57 +01:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Yorick Peterse af00558d38 Merge branch 'relocate-influxdb-settings' into 'master'
Move InfluxDB settings to ApplicationSetting

This moves the settings from the YAML files to the database.

cc @sytses

See merge request !2228
2015-12-28 20:00:57 +00:00
Yorick Peterse 0eab0c6efd Fixed syntax in gitlab.yml.example 2015-12-28 20:28:40 +01:00
Yorick Peterse 4d925f2147 Move InfluxDB settings to ApplicationSetting 2015-12-28 18:00:32 +01:00
Dmitriy Zaporozhets 17ef4cdff9 Merge branch 'restart-settings-are-moved-too' into 'master'
Restart settings are moved too.



See merge request !2226
2015-12-28 15:36:44 +00:00
Sytse Sijbrandij 297f83425e Restart settings are moved too. 2015-12-28 16:33:37 +01:00
Dmitriy Zaporozhets 540eb0a9af Merge branch 'influxdb' into 'master'
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
2015-12-28 13:42:15 +00:00
Dmitriy Zaporozhets c08cb923ec Merge branch 'environment-variables-in-the-app' into 'master'
Environment variables in the app

Fixes #3717 and #3519 

## Why environment variables?

We need environmental variables, they are an expected way to configure apps https://medium.com/@kelseyhightower/12-fractured-apps-1080c73d481c#.ntrdiyu4c

This causes many tools and to tutorials to make it easy to set environmental variables and harder to supply a configuration file. 

So even though we agree they are not ideal https://support.cloud.engineyard.com/hc/en-us/articles/205407508-Environment-Variables-and-Why-You-Shouldn-t-Use-Them the market has spoken.

## Why for GitLab the application and not for the Omnibus packages?

Environmental variables are also needed by people that do not run our Omnibus packages, for example natively bundled apps (Debian apt-get) and idiomatic Docker packages (Mesos, Kubernetes, etc.).

Of course it should work great with Omnibus packages too so any advise is welcome in that regard.

There is an MR https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/575/diffs to be able to set any variable in gitlab.rb via environmental variables. I think both that and this MR should be merged to solve the configuration problem for both Omnibus and non-Omnibus installations. When both are merged the documentation should be crosslinked.

## Why uppercase?

Need to be all cap according to Google Shell guideline:
"Constants and Environment Variable Names => All caps, separated with underscores, declared at the top of the file."
https://google.github.io/styleguide/shell.xml#Constants_and_Environment_Variable_Names

Or as explained on http://stackoverflow.com/a/673940/613240
Keeping to this convention, you can rest assured that you don't need to know every environment variable used by UNIX tools or shells in order to avoid overwriting them. If it's your variable, lowercase it. If you export it, uppercase it.

/cc @JobV @DouweM @marin @jacobvosmaer @ayufan @pravi

See merge request !2215
2015-12-28 12:44:03 +00:00
Yorick Peterse 1be5668ae0 Added host option for InfluxDB 2015-12-28 13:14:48 +01:00
Sytse Sijbrandij 61fba0f4cc Thanks Robert for the corrections in the environment variables docs. 2015-12-28 09:37:59 +01:00
Stan Hu 9e0f532f3e Add documentation for using reCAPTCHA 2015-12-27 20:38:44 -08:00
Stan Hu 9f7d379c2a Add support for Google reCAPTCHA in user registration to prevent spammers 2015-12-27 09:04:11 -08:00
Sytse Sijbrandij fe2f1b4481 Add documentation and example file for environent variables. 2015-12-27 17:36:50 +01:00
Sytse Sijbrandij 4ebd447a05 Use environment variables to configure GitLab. 2015-12-27 17:36:08 +01:00
Gabriel Mazetto 31fb2b7702 Grace period support for TFA 2015-12-24 19:01:30 -02:00
Gabriel Mazetto a7a52f7567 Hotfix for sidekiq-cron being loaded from Settingslogic with defaults 2015-12-22 13:02:42 -02:00
Dmitriy Zaporozhets e6e338f00e Merge branch 'feature/sidekiq-cron-config' into 'master'
Sidekiq-cron configuration moved to gitlab.yml

When `sidekiq-cron` was introduced, jobs configuration where placed
in `schedule.yml` file.

As discussed in #3928, this is not desirable. 
We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration.

See merge request !2087
2015-12-22 09:49:47 +00:00
Robert Speicher f4c05ee45f Merge branch 'admin_add_identity' into 'master'
Allow admin to create new user identities

Fixes #2442 

See merge request !2077
2015-12-21 17:58:20 +00:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
2015-12-21 17:53:20 +00:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Yorick Peterse bcee44ad33 Instrument all ActiveRecord model methods
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.
2015-12-17 17:25:48 +01:00
Yorick Peterse a41287d898 Only track method calls above a certain threshold
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.
2015-12-17 17:25:48 +01:00
Yorick Peterse 6dc25ad58c Instrument Gitlab::Shel and Gitlab::Git 2015-12-17 17:25:48 +01:00
Yorick Peterse 1b077d2d81 Use custom code for instrumenting method calls
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).
2015-12-17 17:25:48 +01:00
Yorick Peterse 141e946c3d Storing of application metrics in InfluxDB
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.
2015-12-17 17:25:48 +01:00
Drew Blessing 577448ab6a Allow admin to create new user identities 2015-12-15 13:54:35 -06:00
tduehr 8e3f1fa629 add CAS authentication support 2015-12-14 21:43:41 -06:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Drew Blessing be41d84fb0 Allow account unlock via email 2015-12-14 15:35:02 -06:00
Gabriel Mazetto 51ef4a2fed Sidekiq-cron configuration moved to gitlab.yml 2015-12-14 14:17:20 -02:00
Grzegorz Bizon 2ec93abed7 Merge branch 'master' into ci/persist-registration-token
* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb
2015-12-14 12:26:40 +01:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
2015-12-14 10:35:40 +00:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master'
Ci Services migrate



See merge request !1985
2015-12-14 10:32:57 +00:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Grzegorz Bizon 2da3cf3146 Add CI runners registration token reset button 2015-12-11 10:39:39 +01:00
Grzegorz Bizon e2e43a114b Use new runners registration token to register CI runners 2015-12-11 10:39:39 +01:00
Gabriel Mazetto 3e5b24d46a Upgraded Sidekiq to 4.x 2015-12-10 17:18:03 -02:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Drew Blessing f4ec906e90 Use devise paranoid mode and ensure the same message is returned every time
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
2015-12-09 18:40:37 -06:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
2015-12-09 09:00:25 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master'
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
2015-12-09 00:05:23 +00:00
Robert Speicher 275e8e7309 Merge branch 'issue-closing-docs' into 'master'
Update documentation about automatic issue closing

RE !1933

See merge request !2000
2015-12-08 22:03:07 +00:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +01:00