4943 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	44d377b810	feat(prometheus): refactoring and polish of the prometheus editor removing unused/uneeded code	2015-10-06 14:34:44 +02:00
Torkel Ödegaard	a2bf3e056d	Merge branch 'prometheus'	2015-10-06 14:10:06 +02:00
Torkel Ödegaard	2d722e26de	fix(cloudwatch): fixed test datasource, broken due to some function name changes	2015-10-06 14:08:48 +02:00
Torkel Ödegaard	182e079d25	Merge branch 'master' into cloudwatch	2015-10-06 14:08:10 +02:00
Torkel Ödegaard	318af9b418	small docs structure change, moved build from source into install section and CLA into project, and about into project	2015-10-06 10:38:19 +02:00
Torkel Ödegaard	0bcda4a2eb	minor elasticsearch fix	2015-10-05 11:17:53 +02:00
Ivan Babrou	0dc0e03c4c	Add suggest_tagk() and suggest_tagv() to OpenTSDB datasource (#2840)	2015-10-04 12:54:43 +01:00
Torkel Ödegaard	0db2d07a1a	Merge pull request #2871 from mtanda/prometheus_time_fix ... fix prometheus time conversion	2015-10-03 12:50:05 +02:00
Torkel Ödegaard	3d52095765	feat(cloudwatch): restored dimension keys lookup	2015-10-02 20:25:28 +02:00
Torkel Ödegaard	0912cec0e5	feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684	2015-10-02 11:54:35 +02:00
Torkel Ödegaard	180ba33ac8	feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684	2015-10-02 11:10:21 +02:00
Torkel Ödegaard	04f4454974	feat(cloudwatch): lots of code refactoring and cleanup, #684, dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value	2015-10-02 09:04:46 +02:00
Torkel Ödegaard	91285baea5	feat(cloudwatch): fixed failing unit tests	2015-10-02 07:32:21 +02:00
Torkel Ödegaard	875d80aa72	feat(cloudwatch): refactoring cloudwatch datasource code, #684	2015-10-02 07:25:54 +02:00
Mitsuhiro Tanda	5e19fdb492	fix prometheus time conversion	2015-10-02 12:10:11 +09:00
Torkel Ödegaard	bddcc6491a	Merge pull request #2870 from ctdk/strip-format ... Add config option to strip (most) colors from console logs	2015-10-01 22:31:21 +02:00
ctdk	d37e18fdcf	Add config option to strip (most) colors from console logs	2015-10-01 13:16:23 -07:00
Torkel Ödegaard	af8d12124a	feat(cloudwatch): code refactoring and cleanup, trying to rewrite so the code uses promises instead of ccallbacks, #684	2015-10-01 21:20:52 +02:00
Torkel Ödegaard	5e34823e7c	Merge pull request #2858 from mtanda/prometheus ... fix unmatched tag	2015-10-01 18:47:21 +02:00
Torkel Ödegaard	f44eaae88a	Merge pull request #2867 from juliusv/fix-prometheus-link ... Fix "Link to Prometheus" button for proxied Prometheus sources.	2015-10-01 18:43:19 +02:00
Julius Volz	3cc69112c1	Fix "Link to Prometheus" button for proxied Prometheus sources.	2015-10-01 18:23:29 +02:00
Torkel Ödegaard	205d4232b9	feat(cloudwatch): only support proxy mode, can remove frontend aws-sdk lib	2015-10-01 17:38:55 +02:00
Torkel Ödegaard	3c6a06a327	feat(cloudwatch): moved specs into plugins dir	2015-10-01 17:00:41 +02:00
Torkel Ödegaard	057b533a39	Merge branch 'master' into cloudwatch	2015-10-01 16:46:59 +02:00
Torkel Ödegaard	b774b91b92	Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch ... Conflicts: public/test/specs/cloudwatch-datasource-specs.js	2015-10-01 16:41:54 +02:00
Torkel Ödegaard	7dc923a292	fix(timepicker): fixed displaying of customk time ranges, #2861	2015-10-01 16:36:38 +02:00
Torkel Ödegaard	ef2094f817	feat(influxdb): minor progress on #2802	2015-10-01 15:48:45 +02:00
Torkel Ödegaard	f0f791d226	Merge pull request #2859 from tmonk42/graphite_multiplySeries ... add graphite multiplySeries function	2015-10-01 08:39:22 +02:00
Haneysmith, Nathan	7ca261e33e	add graphite multiplySeries function	2015-09-30 11:18:47 -07:00
Torkel Ödegaard	228aac2d48	Merge pull request #2857 from jimmidyson/prometheus-datasource ... Prometheus fixes	2015-09-30 18:33:55 +02:00
Mitsuhiro Tanda	d0b744387b	fix unmatched tag	2015-10-01 01:33:13 +09:00
Jimmi Dyson	7cadb9012a	Switch to png image	2015-09-30 16:45:38 +01:00
Jimmi Dyson	0c222c4e8c	Fix Prometheus test connection	2015-09-30 16:44:24 +01:00
Torkel Ödegaard	83052352dc	feat(influxdb editor): lots of work on new editor, #2856	2015-09-30 17:16:34 +02:00
Torkel Ödegaard	73516c0c97	Merge pull request #2856 from jimmidyson/prometheus-datasource ... Further Prometheus unit tests	2015-09-30 16:59:45 +02:00
Jimmi Dyson	b90e4057ba	Convert prometheus specs to typescript	2015-09-30 15:52:15 +01:00
Jimmi Dyson	67f253830f	Add Prometheus metricFindQuery unit tests	2015-09-30 14:20:58 +01:00
Jimmi Dyson	59dbe45784	Fix typo in docs	2015-09-30 14:20:58 +01:00
Torkel Ödegaard	f053b41645	feat(influxdb editor): more progress	2015-09-30 14:37:27 +02:00
Torkel Ödegaard	84615ad299	Merge pull request #2855 from jimmidyson/prometheus-datasource ... Prometheus docs & better template queries	2015-09-30 13:50:11 +02:00
Jimmi Dyson	2e291d73aa	jshint fixes	2015-09-30 12:46:44 +01:00
Jimmi Dyson	055efa3904	Add prometheus docs	2015-09-30 12:42:48 +01:00
Jimmi Dyson	daee7970f3	Add label_values query to get labels on a particular metric	2015-09-30 12:29:53 +01:00
Torkel Ödegaard	2dc8fcd3be	poc(influxdb v3 editor): more testing of new influxdb editor approach	2015-09-29 21:32:15 +02:00
Torkel Ödegaard	2f55c18d56	Merge pull request #2847 from jimmidyson/prometheus-datasource ... Add Prometheus datasource	2015-09-29 18:23:12 +02:00
Jimmi Dyson	cf0748895e	Prometheus template params fixes	2015-09-29 17:07:11 +01:00
Jimmi Dyson	6e66b8a0fa	Add prometheus datasource	2015-09-29 17:07:11 +01:00
Torkel Ödegaard	e70b99a706	poc: influxdb editor v3 test	2015-09-29 18:00:15 +02:00
Torkel Ödegaard	42e7a70d99	Merge pull request #2845 from sbouchex/master ... Missing carriage return in init script when displaying usage	2015-09-29 16:43:52 +02:00
Torkel Ödegaard	ee85eb2779	Updated prometheus config	2015-09-29 16:22:41 +02:00