4941 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Al Lefebvre	a921eeb5e2	Merge branch 'master' of github.com:hartfordfive/grafana into issue-3374	2015-11-30 12:20:47 -05:00
Al Lefebvre	f3f34e1835	Merge pull request #1 from grafana/master ... Updating forked copy from official Grafana master	2015-11-30 12:20:32 -05:00
Al Lefebvre	4a29d459da	Added flag to display version number and exit	2015-11-30 12:10:47 -05:00
Torkel Ödegaard	0f867a3484	Merge pull request #3230 from utkarshcmu/time-units ... Added currency units, time units, tests	2015-11-30 17:29:51 +01:00
Torkel Ödegaard	6eeddaa564	Merge pull request #3369 from matschaffer/cw/alias-fix ... Use of `<dimension name>` seems to confuse angular so changing to DIMENSION_NAME	2015-11-30 17:28:41 +01:00
Torkel Ödegaard	d80458ef81	Merge branch 'refresh' of https://github.com/utkarshcmu/grafana into utkarshcmu-refresh	2015-11-30 17:23:50 +01:00
Torkel Ödegaard	ad15df7222	Merge branch 'influxdb_editor_v3'	2015-11-30 16:29:20 +01:00
Torkel Ödegaard	98f7febed1	feat(influxdb): added all functions	2015-11-30 16:28:56 +01:00
Torkel Ödegaard	4f04eaec3a	feat(influxdb): moved query builder tests	2015-11-30 15:27:38 +01:00
Torkel Ödegaard	5a2b9b1f44	feat(influxdb): worked on schema upgrade for new influx query editor	2015-11-30 15:09:18 +01:00
Torkel Ödegaard	721b37a08e	feat(influxdb): new editor now supports field and tag lookup again	2015-11-30 10:14:42 +01:00
Torkel Ödegaard	b3d494d4c8	feat(influxdb): minor fixes to new editor	2015-11-30 08:40:11 +01:00
Mat Schaffer	85ec70e92b	Use of <dimension name> seems to confuse angular so changing to DIMENSION_NAME	2015-11-30 15:55:07 +09:00
Torkel Ödegaard	e2f0ff9e88	Merge pull request #3367 from utkarshcmu/orgs ... Fixed #3357	2015-11-30 07:40:07 +01:00
utkarshcmu	0dbd7d0e17	Fixed #3357	2015-11-29 03:28:07 -08:00
utkarshcmu	8cdaa044e1	Removed repeating test	2015-11-29 03:14:26 -08:00
utkarshcmu	712a420217	Fixed refresh setting for absolute time	2015-11-29 03:12:48 -08:00
Torkel Ödegaard	72d9fcdcb4	feat(influxdb): progress with new influxdb editor	2015-11-27 16:35:40 +01:00
Torkel Ödegaard	aa13a80d83	fix(influxdb): fixed issue with metric segment component that caused double events	2015-11-26 09:28:59 +01:00
Torkel Ödegaard	9e2ef543ed	Merge pull request #3343 from mtanda/cloudwatch_fix_credential_check ... (cloudwatch) fix EC2RoleProvider parameter	2015-11-26 08:20:50 +01:00
Mitsuhiro Tanda	2aabb387b1	fix EC2RoleProvider parameter	2015-11-26 16:01:33 +09:00
Mitsuhiro Tanda	f972863f49	add credential setting to handleDescribeInstances	2015-11-26 13:21:38 +09:00
Torkel Ödegaard	f00320c8b9	feat(influxdb): query editor is starting to work, can now add group by parts	2015-11-25 14:27:22 +01:00
utkarshcmu	0ff5ff5dbe	Enabled refresh interval for absolute time range	2015-11-25 04:05:40 -08:00
Torkel Ödegaard	5ba19144d5	feat(influxdb): more work on query editor	2015-11-25 12:30:56 +01:00
Torkel Ödegaard	c9ba856c52	feat(influxdb): more work on influxdb editor	2015-11-25 10:22:20 +01:00
Torkel Ödegaard	31e2a8b8e9	feat(influxdb): more work onnew influxdb editor	2015-11-24 17:01:18 +01:00
Torkel Ödegaard	9b4150509c	feat(influxdb): minor progress on new editor	2015-11-24 11:02:49 +01:00
Torkel Ödegaard	c68cd7d19a	Merge branch 'master' into influxdb_editor_v3	2015-11-24 10:06:06 +01:00
Torkel Ödegaard	85382dc2e0	fix(table): fixed table height alignment	2015-11-24 10:04:01 +01:00
Torkel Ödegaard	7315a0ecec	Merge pull request #3319 from VibyJocke/master ... Fixed some broken HTML.	2015-11-24 09:45:13 +01:00
Torkel Ödegaard	411bd55cd4	Merge pull request #3318 from utkarshcmu/validated-responses ... Validated HTTP responses	2015-11-24 09:31:23 +01:00
Joakim Lahtinen	9c0141e84e	Fixed some broken HTML. ... Simplified some control flow.	2015-11-24 07:29:52 +01:00
utkarshcmu	ca5d0496ee	Validated HTTP responses	2015-11-23 19:19:26 -08:00
Torkel Ödegaard	24b9bc1e55	fix(missing files): added missing files, oops	2015-11-23 18:20:12 +01:00
Torkel Ödegaard	cf1e167430	feat(table panel): table panel can now show nested object data, closes #3263	2015-11-23 16:10:32 +01:00
Torkel Ödegaard	a1afd2328d	fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241	2015-11-23 14:19:10 +01:00
Torkel Ödegaard	1fa8b74595	Merge pull request #3303 from utkarshcmu/db-update ... Return correct updated+created timestamps to frontend	2015-11-21 14:10:50 +01:00
utkarshcmu	5559ad1238	Return correct updated+created timestamps to frontend	2015-11-21 05:03:00 -08:00
Torkel Ödegaard	396f53d20e	fix(tests): removed it.only accidentally cecked in	2015-11-21 13:48:12 +01:00
Torkel Ödegaard	fc78e42a78	Merge pull request #3297 from utkarshcmu/db-update ... Fixed created & updated columns update in dashboard table	2015-11-21 10:25:29 +01:00
Torkel Ödegaard	9d1906d333	fix(elasticsearch): fixed issue with disabling (hiding) query, fixes #3300	2015-11-21 10:22:59 +01:00
Torkel Ödegaard	4a3f50cef7	fix(docs): minor fix to http docs, fixes #3301	2015-11-21 10:07:33 +01:00
Torkel Ödegaard	4751e4b94e	feat(elasticsearch): a lot of work to support aggregation queries without date_histogram, queries that return metric aggregations now work with the table panel (json data type), #3219	2015-11-20 16:26:44 +01:00
utkarshcmu	1b7f4f31ca	Tired of gofmt	2015-11-20 04:52:50 -08:00
utkarshcmu	ca01604b43	Added statements in constructor	2015-11-20 04:37:24 -08:00
utkarshcmu	93f9a0c39c	Fixed created & updated columns in dashboard table	2015-11-20 03:10:24 -08:00
Torkel Ödegaard	93977316ce	revert #3288 for now since it breaks Elasticsearch 1.7	2015-11-20 10:48:10 +01:00
Torkel Ödegaard	7e49bdf5a8	revert #3288 for now since it breaks Elasticsearch 1.7	2015-11-20 10:45:48 +01:00
Torkel Ödegaard	c0beef7572	Merge pull request #3252 from alechenninger/avg-ignore-null ... Ignore nulls unless 'null as zero' for series.stats.avg	2015-11-20 08:27:45 +01:00