root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity
11,858 Commits 1,416 Branches 627 Tags 2.6 GiB
Commit Graph

90 Commits

Author SHA1 Message Date
Marcus Efraimsson c8ac6add16 test: speedup mysql and postgres integration tests by 10-20x 
Use docker tmpfs mounts for mysql and postgres data volumes
 2017-11-29 14:40:23 +01:00
bergquist d7321cd89c prom: initial docker block for prometheus 2 2017-11-21 09:55:42 +01:00
Torkel Ödegaard acede1d5f9 graphite: progress on new query editor 2017-11-15 13:45:51 +01:00
Torkel Ödegaard b5b93a68fc Merge branch 'master' into graphite-series-by-tags 2017-11-15 11:12:11 +01:00
Daniel Lee 799aaf720a docker: expose statsd endpoint for graphite block 2017-11-07 15:14:39 +01:00
bergquist 6292d7c204 reduce docker-compose header version 2017-11-01 19:28:28 +01:00
cglewis f5d2ce2a72 MAINTAINER is deprecated, now using LABEL 2017-10-31 10:21:20 -07:00
Akshay Chhajed 38ec8ddefc Transitioning fig to docker-compose v3 2017-10-31 18:59:27 +05:30
Torkel Ödegaard 3471e262a5 docker: updated our graphite docker container 2017-10-11 16:40:15 +02:00
bergquist ff108bd871 prom_docker: give targets correct job name 2017-09-25 08:55:54 +02:00
bergquist 7eec60ec2e dev-docker: add grafana as target 2017-09-24 21:58:33 +02:00
Daniel Lee 53d862143b docker: adds alertmanager to prometheus fig 
with an alert rule that will always fire
 2017-09-21 17:28:31 +02:00
bergquist 83ddd2b158 change port for jaeger dev container 2017-09-18 11:08:58 +02:00
bergquist 98c84f9458 docker file for running jaeger 2017-09-18 11:08:58 +02:00
Torkel Ödegaard addeccb4f0 Merge branch 'v4.4.x' 2017-08-08 16:18:08 +02:00
Torkel Ödegaard a47b31ac62 fix: MySQL/Postgress max_idle_conn default was wrongly set to zero, which does not mean unlimited but zero, which in practice disables connection pooling, not good. now max idle conn is set to golang's default which is 2, fixes #8513 2017-08-08 16:17:52 +02:00
Torkel Ödegaard 0e2b809f7e docker: added graphite v1.x docker block 2017-08-07 15:12:12 +02:00
Torkel Ödegaard 5909f9ef92 feat: more work on metrics tab reworkings 2017-05-19 21:32:23 +02:00
Daniel Lee 92d723d6f5 docker: remove downloaded temp files from opendata image 2017-04-24 11:40:38 +02:00
Torkel Ödegaard 253b8be449 mysql: updated test data 2017-04-23 13:50:49 +02:00
Daniel Lee fdc68a8baa docker: adds mysqldb with test data 
Downloads a large open dataset from NYC Open Data.
Then converts date columns into the mysql format.
 2017-04-22 02:01:29 +02:00
Torkel Ödegaard c78c460f79 mysql: worked on mysql data soruce 2017-04-20 17:10:23 +02:00
Torkel Ödegaard a109049de4 smpt: Added smtp docker block 2017-04-11 16:41:07 +02:00
Torkel Ödegaard 5af81b974e mysql: graph showing 2017-03-31 13:57:10 +02:00
Torkel Ödegaard bb2eb00b0e minor data source edit form improvement 2017-03-09 07:05:49 +01:00
Torkel Ödegaard 0841e841f5 cleanup(): removed docker/production folder as it was old and unused (ie grafana-docker repo is the place for the offical production docker container 2016-12-12 22:12:27 +01:00
bergquist 873024b917 tech(elastic): use bool conditions for all es queries 2016-12-09 11:13:28 +01:00
bergquist 2bdeb78885 style(docker): remove comments 2016-11-28 18:48:34 +01:00
bergquist 20df0aafc2 tech(docker): adds docker fig for elastic 5 2016-11-28 18:43:26 +01:00
bergquist 8713dd8221 tech(docker): pin elastic to 2.4.1 for dev 2016-11-08 14:31:59 +01:00
Hans Kristian Flaatten b5eaa5ea59 Add missing closing " in Docker README (#6413) 2016-10-28 11:55:47 +02:00
bergquist 9429434cb5 feat(influxdb): use database auth if provided 
closes #6310
 2016-10-18 15:12:04 +02:00
bergquist b519d5e92c feat(docker): update docker-compose for influxdb 2016-10-06 12:50:06 +02:00
Carl Bergquist 5b9366a9c3 tech(docker): update prometheus config 2016-08-23 11:50:17 +02:00
Torkel Ödegaard 05697d5ecd Merge branch 'master' into alerting 
Conflicts:
	conf/sample.ini
 2016-08-17 10:03:33 +02:00
bergquist de714e3398 tech(docker): add default db for postgres 2016-08-16 15:54:13 +02:00
Torkel Ödegaard 624cd6fc0a feat(alerting): cleanup, removed alert changes table and code 2016-07-13 11:58:55 +02:00
Torkel Ödegaard 9b4c0cca07 fix(flot): fixed flot issue introduced in alerting branch 2016-06-28 14:04:29 -07:00
bergquist 14169c5092 tech(docker): add memcached exporter target for prom 2016-06-22 17:36:22 +02:00
Torkel Ödegaard 0555525f97 tech(): updated list of docker stuff 2016-06-22 11:01:11 +02:00
Torkel Ödegaard 302ad5f1f9 Merge branch 'master' of github.com:grafana/grafana 2016-06-21 17:08:16 +02:00
Torkel Ödegaard 257e6c469e feat(collectd): updated collectd config 2016-06-21 17:07:01 +02:00
bergquist aa9e524e73 tech(docker): add node exporter to prometheus 2016-06-21 11:46:08 +02:00
Torkel Ödegaard ca8543348b docker(): added collectd system metrics collector that writes to graphite, just for testing 2016-05-28 10:13:51 +02:00
bergquist 92ac370415 tech(docker): rename fake data writers 2016-05-18 12:29:37 +02:00
bergquist efe6fd154b tech(docker): add default writer for influxdb 2016-05-17 09:03:52 +02:00
bergquist fb8296524e tech(docker): add default fake-data-gen for prometheus 2016-05-17 09:03:52 +02:00
bergquist da68f7d31a feat(docker): fake data writer for opentsdb 2016-05-13 16:53:28 +02:00
bergquist 41ed0e670a feat(docker): fake data writer for graphite 2016-05-13 16:25:03 +02:00
Torkel Ödegaard e6bccc5eff feat(influxdb): Added new functions moving_average and difference to query editor, closes #4698 2016-05-02 09:07:44 +02:00