stable
Clone or download
Read-only
Merge 'gerrit #11647' into stable/master
* commit '19ae458c7f': request #11614 Allow usage of prometheus instead of statsd for instrumentation Change-Id: If24d55742954da5acd0ecced8ff2617efa944731
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | .gitignore | +1 | −0 | Go to diff View file |
| M | docker-compose.yml | +8 | −7 | Go to diff View file |
| M | plugins/docman/include/Docman_Controller.class.php | +1 | −0 | Go to diff View file |
| M | plugins/git/include/Git/AdminRouter.class.php | +1 | −0 | Go to diff View file |
| M | plugins/git/include/Git/GitPluginDefaultController.php | +1 | −0 | Go to diff View file |
| M | plugins/git/include/Git/GitRepositoryBrowserController.php | +1 | −0 | Go to diff View file |
| M | plugins/git/include/Git/HTTP/HTTPController.php | +1 | −0 | Go to diff View file |
| A | plugins/tracker/include/Tracker/Artifact/ArtifactInstrumentation.php | +35 | −0 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Changeset/NewChangesetCreatorBase.class.php | +2 | −0 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact.class.php | +2 | −2 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_ArtifactCreator.class.php | +2 | −0 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Report/Tracker_Report.class.php | +0 | −3 | Go to diff View file |
| A | prometheus.yml | +18 | −0 | Go to diff View file |
| M | src/common/CLI/Command/ConfigSetCommand.php | +2 | −3 | Go to diff View file |
| M | src/common/Instrument/Collect.php | +3 | −13 | Go to diff View file |
| A | src/common/Instrument/MetricsController.php | +98 | −0 | Go to diff View file |
| M | src/common/Instrument/NoopStatsd.php | +0 | −8 | Go to diff View file |
| A | src/common/Instrument/Prometheus/Prometheus.php | +65 | −0 | Go to diff View file |
| M | src/common/Instrument/StatsdInterface.php | +0 | −2 | Go to diff View file |
| M | src/common/Request/FrontRouter.php | +8 | −0 | Go to diff View file |
| A | src/common/Request/RequestInstrumentation.php | +37 | −0 | Go to diff View file |
| M | src/common/autoload.php | +7 | −2 | Go to diff View file |
| M | src/common/project/Home.php | +1 | −0 | Go to diff View file |
| M | src/common/project/Service.class.php | +1 | −0 | Go to diff View file |
| A | src/common/project/ServiceInstrumentation.php | +32 | −0 | Go to diff View file |
| A | src/common/user/LoginInstrumentation.php | +32 | −0 | Go to diff View file |
| M | src/common/user/UserManager.class.php | +2 | −0 | Go to diff View file |
| M | src/composer.json | +2 | −1 | Go to diff View file |
| M | src/composer.lock | +280 | −2 | Go to diff View file |
| M | src/www/forum/forum_utils.php | +1 | −0 | Go to diff View file |
| M | src/www/include/pre.php | +4 | −4 | Go to diff View file |
| M | src/www/index.php | +1 | −0 | Go to diff View file |
| M | src/www/mail/mail_utils.php | +1 | −0 | Go to diff View file |
| M | src/www/news/news_utils.php | +1 | −0 | Go to diff View file |
| M | src/www/svn/svn_utils.php | +1 | −0 | Go to diff View file |
| M | src/www/tracker/include/ArtifactTypeHtml.class.php | +1 | −0 | Go to diff View file |
| M | src/www/wiki/index.php | +1 | −0 | Go to diff View file |
| M | tools/utils/php56/run.sh | +5 | −0 | Go to diff View file |