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 |
|
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 |
|
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 |
|
Torkel Ödegaard
|
d1bac6cde0
|
feat(templating): prometheus now works with new template variable formating/escaping, #2918
|
2016-03-01 16:11:05 +01:00 |
|
Torkel Ödegaard
|
3624587f08
|
misc(): added elasticsearch.yml config file to docker test env
|
2016-02-29 13:42:55 +01:00 |
|
bergquist
|
c4d6051477
|
add fig option for opentsdb
|
2016-02-15 07:52:34 +01:00 |
|
bergquist
|
1cac6ecedb
|
tech(docker): update influxdb to use latest
|
2016-01-25 20:46:15 +01:00 |
|
bergquist
|
40088cd4fe
|
tech(docker): add elastic fig
|
2016-01-25 20:30:25 +01:00 |
|
bergquist
|
a85bda13db
|
tech(docker-dev): update dev docker for graphite
|
2016-01-24 18:07:42 +01:00 |
|
Torkel Ödegaard
|
c831369974
|
fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919
|
2015-10-10 11:46:00 -04:00 |
|
Torkel Ödegaard
|
ee85eb2779
|
Updated prometheus config
|
2015-09-29 16:22:41 +02:00 |
|
Torkel Ödegaard
|
866ea7f942
|
added prometheus docker block
|
2015-09-29 08:16:26 +02:00 |
|
Torkel Ödegaard
|
4f3a3329e2
|
added postgres test docker fig block
|
2015-08-10 12:56:11 +02:00 |
|
Torkel Ödegaard
|
14f439f8ba
|
refactor(ldap): refactoring ldap code, #1450
|
2015-07-13 15:37:25 +02:00 |
|
Torkel Ödegaard
|
bfe7b77313
|
More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450
|
2015-07-13 14:23:59 +02:00 |
|
Torkel Ödegaard
|
3f5ab189cd
|
Began work on emailing service #1456
|
2015-06-04 14:29:39 +02:00 |
|
Torkel Ödegaard
|
ea8307f79e
|
Added influxdb docker block, and fixed issue when adding data source
|
2015-02-17 11:44:58 +01:00 |
|
Torkel Ödegaard
|
8bb9126b77
|
added postgres support for db migrations
|
2015-01-20 09:20:44 +01:00 |
|
Torkel Ödegaard
|
68a77c4051
|
More progress on db schema setup and migrations, tricky stuff
|
2015-01-18 13:08:59 +01:00 |
|