124 Commits

Author	SHA1	Message	Date
Dan Cech	29c9d3f74c	fix root_url in docs & comments (#11819) ... * fix root_url in docs & comments * include ports in docker-compose config	2018-05-07 14:18:21 +02:00
Leonard Gram	1290087b78	dev: Mac compatible prometheus block. (#11718)	2018-04-25 11:01:33 +02:00
Daniel Lee	ee303c03e9	Merge pull request #11550 from grafana/sql_ts_precision ... sql tsdb: fix precision and data type support for time columns	2018-04-16 11:04:46 +02:00
Mario Trangoni	9a11b574ca	blocks: fix codespell issues	2018-04-13 20:31:29 +02:00
Marcus Efraimsson	be4b715aad	docker: change mysql container so that it uses utc	2018-04-10 16:59:48 +02:00
Marcus Efraimsson	9d84e6f31f	mssql: fix precision for time columns in time series query mode	2018-04-10 11:10:56 +02:00
Marcus Efraimsson	0317ecbf0d	postgres: support running multiple postgres integration tests ... Makes it possible to run mysql integration tests for both grafana config db and tsdb at the same time using GRAFANA_TEST_DB=postgres go test ./pkg/...	2018-04-10 11:08:30 +02:00
Marcus Efraimsson	5c120c2c11	mysql: mysql tests should use a db server with UTC ... To get rid of issues involving date/time when testing. Also, makes it possible to run mysql integration tests for both grafana config db and tsdb at the same time using GRAFANA_TEST_DB=mysql go test ./pkg/...	2018-04-10 10:58:45 +02:00
Daniel Lee	de6cd7ed0b	docker: add users and groups to ldap block	2018-03-30 10:09:36 +02:00
Marcus Efraimsson	f5654f88e2	mysql: fix precision for the time column in table/annotation query mode ... Use the ConvertSqlTimeColumnToEpochMs function to convert any native datetime data type or epoch time (millisecond precision). Refactored mysql implementation to make it more similar to postgres and mssql implementations. Added $__timeEpoch macro function with same implementation as $__time. Added possibility to use a time column named time in addition to the currectly supported time_sec. Additional tests and update of existing. Added test dashboard.	2018-03-22 15:40:46 +01:00
Marcus Efraimsson	66c03f84f5	postgres: fix precision for the time column in table/annotation query mode ... Use the ConvertSqlTimeColumnToEpochMs function to convert any native datetime data type or epoch time (millisecond precision). Additional tests and update of existing due to timezone issues running postgres on UTC and dev environment on non-utc. Added test dashboard.	2018-03-22 15:32:33 +01:00
Marcus Efraimsson	b69ebee066	mssql: fix precision for the time column in table/annotation query mode ... Use the ConvertSqlTimeColumnToEpochMs function to convert any native datetime data type or epoch time (millisecond precision). Additional tests and update of existing due to timezone issues running MSSQL on UTC and dev environment on non-utc. Update stored procedures test to handle more parameters. Update test dashboard.	2018-03-22 15:23:12 +01:00
Marcus Efraimsson	192e913b7b	mssql: add integration test to verify stored procedure usage	2018-03-19 19:56:34 +01:00
Marcus Efraimsson	449a307575	mssql: remove dynamic construction of metric column and other columns ... This seems like a niche feature which can be solved by defining multiple queries. In the future we'll probably add support for defining series name by alias field similar to how other datasources have solved that, e.g. prometheus.	2018-03-19 17:14:01 +01:00
Marcus Efraimsson	b8e2414e46	docker: pin microsoft/mssql-server-linux to 2017-CU4 tag	2018-03-19 16:39:50 +01:00
Marcus Efraimsson	2802fe3f3e	docker: update test dashboard for mssql tests	2018-03-19 13:07:26 +01:00
Marcus Efraimsson	03d15f7955	mssql: update test dashboard	2018-03-19 11:08:53 +01:00
Marcus Efraimsson	673c8290fb	docker: add test dashboard for mssql tests based on test data generated by integration test	2018-03-16 14:44:26 +01:00
Marcus Efraimsson	d2267643ed	Merge branch 'master' into mssql_datasource	2018-03-15 09:53:19 +01:00
Marcus Efraimsson	eef01e3703	docker: change port for prom random data scrape target	2018-03-15 09:52:53 +01:00
Marcus Efraimsson	ef3588c1f8	docker: mssql and mssql tests blocks with common build context	2018-03-15 09:49:53 +01:00
Marcus Efraimsson	61e1c12fee	docker: fake-data-gen:latest updates ... fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block. added big dashboard for graphite 1 and 1.1+ that can be imported to grafana	2018-03-14 20:47:52 +01:00
Marcus Efraimsson	6503e482e3	docker: add test dashboard for mssql for visualizing data generated by fake-data-gen	2018-03-13 23:07:40 +01:00
Marcus Efraimsson	e7b790316e	docker: add mssql block	2018-03-13 17:03:10 +01:00
Alexander Zobnin	94cf560304	Merge remote-tracking branch 'upstream/master' into prometheus-heatmap	2018-03-12 17:16:02 +03:00
bergquist	e5b9219f13	dev: update dev prometheus2 to 2.2.0	2018-03-08 23:01:03 +01:00
Alexander Zobnin	425d2cfd3a	docker: add prometheus/example-golang-random to docker-compose blocks	2018-03-07 21:20:22 +03:00
Leonard Gram	f00a7e4dd7	dev: docker-compose setup for prom2. ... Copy of prometheus1 docker-compose config.	2018-02-21 11:25:14 +01:00
Marcus Efraimsson	4c073e1cf0	docker: add test dashboards for mysql and postgres for visualizing data generated by fake-data-gen	2018-02-16 10:18:40 +01:00
Leonard Gram	d85b9c28c1	Locks down prometheus1 to v1.8.2 in live-test.	2018-01-26 14:32:20 +01:00
Marcus Efraimsson	39dd4799f0	docker: sync local time and timezone to mysql_tests block	2018-01-24 11:43:56 +01:00
Marcus Efraimsson	1ce6a420cb	docker: use mysql and postgres from latest fake-data-gen	2018-01-23 10:51:48 +01:00
Marcus Efraimsson	3ecec8e0d2	More fixes for relative urls when running Grafana under a different sub path (#10470) ... * Add nginx proxy docker container Ease test/verification of running Grafana thru a reverse proxy * Add apache proxy docker container Ease test/verification of running Grafana thru a reverse proxy * Fix relative urls for reset password page * Fix relative urls for signup page * Fix relative urls for login page * Fix relative urls edit plugin page	2018-01-09 13:56:41 +01:00
Torkel Ödegaard	a02086814e	graphite: remove check so that query is sent even for possible non leaf nodes	2017-12-12 17:00:00 +01:00
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