summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-223-17/+0
* Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-2251-57/+1969
|\
| * Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-221036-5914/+10545
| |\
| * | Add Changelog messagePawel Chojnacki2017-06-211-0/+4
| * | Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-205-46/+50
| * | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-205-12/+50
| * | Remove unnecessary prometheus_service method, that is now handled by new auto...Pawel Chojnacki2017-06-201-4/+0
| * | Memoize only yaml loading methodPawel Chojnacki2017-06-162-7/+2
| * | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-163-2/+2
| * | Move Prometheus service to project modelPawel Chojnacki2017-06-168-24/+21
| * | Fix prometheus service frontend fixturePawel Chojnacki2017-06-162-3/+3
| * | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-161189-7088/+21912
| |\ \
| * | | cleanup wipPawel Chojnacki2017-06-163-6/+9
| * | | Use include ActiveModel::Model to hold metrics data parsed from yaml.Pawel Chojnacki2017-06-165-43/+32
| * | | Test Additional metrics parser and fix query checking testsPawel Chojnacki2017-06-095-11/+265
| * | | Fix Additional metrics filteringPawel Chojnacki2017-06-085-6/+9
| * | | Use `key?` instead of `has_key?`Pawel Chojnacki2017-06-072-3/+3
| * | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-07973-6054/+18885
| |\ \ \
| * | | | Remove unecessary before blockPawel Chojnacki2017-06-071-4/+0
| * | | | Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-079-33/+136
| * | | | Add schema matcher for non response objects + use schema to test additional m...Pawel Chojnacki2017-06-064-71/+88
| * | | | expand Namespaces:: and refactoring yaml parsing out of MetricGroup classPawel Chojnacki2017-06-0616-239/+282
| * | | | Explicitly require format.json in prometheus_controllerPawel Chojnacki2017-06-063-7/+76
| * | | | Fix prometheus service testsPawel Chojnacki2017-06-062-2/+16
| * | | | Fix transient error in deployment testPawel Chojnacki2017-06-061-0/+4
| * | | | Remove orig file + rubocop cleanupPawel Chojnacki2017-06-056-26/+13
| * | | | Cleanup Additional Metrics testsPawel Chojnacki2017-06-056-68/+20
| * | | | Refactor Metric tests to use more common codePawel Chojnacki2017-06-053-19/+16
| * | | | Additional Metrics of deployment testsPawel Chojnacki2017-06-054-142/+179
| * | | | Environments#additional_metrics testsPawel Chojnacki2017-06-052-0/+133
| * | | | Test Partial additional query responsePawel Chojnacki2017-06-051-9/+45
| * | | | Additional metrics test using multiple groupsPawel Chojnacki2017-06-053-32/+111
| * | | | Additional Metrics testsPawel Chojnacki2017-06-056-18/+126
| * | | | Towards Reviewable prometheusPawel Chojnacki2017-06-054-35/+146
| * | | | Matched Metrics testsPawel Chojnacki2017-06-055-39/+97
| * | | | Merge branch '28717-fe-prometheus-additional-metrics' into '28717-additional-...Phil Hughes2017-06-0213-12/+478
| |\ \ \ \
| | * | | | Use `.text-center` class instead of text-align prop28717-fe-prometheus-additional-metricskushalpandya2017-06-022-3/+2
| | * | | | Update as per review feedbackkushalpandya2017-06-016-43/+87
| | * | | | Tests for `PrometheusMetrics` classkushalpandya2017-06-012-0/+166
| | * | | | Handle response failure case for loadActiveMetricskushalpandya2017-06-011-2/+5
| | * | | | Changes based on UX reviewkushalpandya2017-06-012-4/+9
| | * | | | Remove service help, add URL field helpkushalpandya2017-06-011-12/+2
| | * | | | Lint: Fix missing new line at EOFkushalpandya2017-05-313-3/+3
| | * | | | Styles for banner within panelkushalpandya2017-05-311-0/+8
| | * | | | Populate Missing env var panelkushalpandya2017-05-312-5/+26
| | * | | | Prometheus Service Fixture Generatorkushalpandya2017-05-311-0/+31
| | * | | | Add support for Prometheus Servicekushalpandya2017-05-311-0/+8
| | * | | | Add styles for Prometheus Service Metricskushalpandya2017-05-311-1/+37
| | * | | | Add Prometheus Metrics Bundle, panel for Missing environment variableskushalpandya2017-05-311-4/+21
| | * | | | Add Prometheus Metrics Bundlekushalpandya2017-05-311-0/+1
View Lorry Controller Status