summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add pot file for translation tagsinternationalize-graph-pageShah El-Rahman2018-02-071-2/+11
* Add changelogShah El-Rahman2018-02-071-0/+5
* Annotate graph page for internationalizationShah El-Rahman2018-02-072-3/+3
* Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-074-19/+15
|\
| * Reset column information after the schema is migrated in MigrationsHelpers.sc...ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
* | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-072-19/+28
|\ \
| * | Clear the timeout in Jobs class after each testPhil Hughes2018-02-072-19/+28
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-0747-118/+612
|\ \ \
| * | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-072-0/+12
| * | | Avoid unless/elsePawel Chojnacki2018-02-071-4/+4
| * | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-073-6/+7
| * | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-074-4/+30
| * | | add i8n to the Prometheus integration settings pageMike Greiling2018-02-061-8/+8
| * | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06715-4180/+11964
| |\ \ \
| * | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| * | | | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
| * | | | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
| * | | | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ...Mike Greiling2018-01-311-1/+2
| * | | | fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
| * | | | style the prometheus integration service page according to designMike Greiling2018-01-313-10/+33
| * | | | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-312-18/+27
| * | | | change prometheus service description text to match designMike Greiling2018-01-3118-18/+18
| * | | | add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-314-10/+31
| * | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-31185-1665/+3243
| |\ \ \ \
| * | | | | fix eslint and formatting issuesMike Greiling2018-01-311-4/+4
| * | | | | display manage application button only when it is installedMike Greiling2018-01-311-2/+5
| * | | | | internationalize the "Manage" button labelMike Greiling2018-01-301-1/+4
| * | | | | add button to configure prometheus integration from cluster pageMike Greiling2018-01-303-1/+9
| * | | | | add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
| * | | | | Fix rubocopPawel Chojnacki2018-01-301-0/+1
| * | | | | enable manual configuration property for all test prometheus servicesPawel Chojnacki2018-01-301-1/+2
| * | | | | fix service generic testsPawel Chojnacki2018-01-301-4/+1
| * | | | | Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2...Mike Greiling2018-01-291-76/+64
| |\ \ \ \ \
| | * | | | | Fix values.yaml for PrometheusJoshua Lambert2018-01-261-76/+64
| * | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-291026-10120/+17067
| |\ \ \ \ \ \
| * | | | | | | check if service is templatePawel Chojnacki2018-01-171-0/+1
| * | | | | | | add manual_configuration to prometheus_service factory to enable it by defaultPawel Chojnacki2018-01-171-0/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-171388-13895/+36568
| |\ \ \ \ \ \ \
| * | | | | | | | Add Changelog itemPawel Chojnacki2018-01-041-0/+6
| * | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-044-13/+19
| * | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-042-2/+58
| * | | | | | | | add tests for Manual configuration override and service activation synchroniz...Pawel Chojnacki2018-01-041-0/+66
| * | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-043-49/+52
| * | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-045-19/+147
| * | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-042-10/+21
| * | | | | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-048-24/+65
| * | | | | | | | Auto enable prometheus service if Prometheus is InstalledPawel Chojnacki2018-01-021-4/+6
| * | | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-022-8/+29
| * | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-023-44/+22
| * | | | | | | | wipPawel Chojnacki2018-01-026-28/+99
View Lorry Controller Status