17286 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Cech	803b36a059	Update docs/sources/enterprise/index.md ... Co-Authored-By: marefr <marcus.efraimsson@gmail.com>	2018-11-06 15:55:28 +01:00
Dan Cech	5cdd53c5e7	Update docs/sources/enterprise/index.md ... Co-Authored-By: marefr <marcus.efraimsson@gmail.com>	2018-11-06 15:55:05 +01:00
Dan Cech	32e001dba4	Update docs/sources/enterprise/index.md ... Co-Authored-By: marefr <marcus.efraimsson@gmail.com>	2018-11-06 15:54:53 +01:00
Dan Cech	881c73fb93	Update docs/sources/enterprise/index.md ... Co-Authored-By: marefr <marcus.efraimsson@gmail.com>	2018-11-06 15:54:25 +01:00
Dan Cech	044505a213	minor change ... Co-Authored-By: marefr <marcus.efraimsson@gmail.com>	2018-11-06 15:53:49 +01:00
Torkel Ödegaard	4c070bc781	minor doc tweaks	2018-11-01 12:35:51 +01:00
Torkel Ödegaard	5a27df2dc9	updated enterprise page	2018-11-01 12:19:19 +01:00
Marcus Efraimsson	a1b4ebc115	make permission sub items in sidemenu cleaner	2018-11-01 11:00:32 +01:00
Marcus Efraimsson	280c8631f9	docs: enhanced ldap	2018-10-31 18:01:30 +01:00
Marcus Efraimsson	5495072c83	docs: fix datasource permissions keywords	2018-10-31 17:18:31 +01:00
Marcus Efraimsson	fc6d7c9b6b	datasource permission http api	2018-10-30 19:02:12 +01:00
Marcus Efraimsson	621525d10f	restructure administration/permissions page into a section with sub pages	2018-10-30 18:43:54 +01:00
Torkel Ödegaard	a8e2840f15	minor progress	2018-10-30 15:25:10 +01:00
Torkel Ödegaard	e9928f6c52	Merge branch 'master' into enterprise-docs	2018-10-30 15:01:09 +01:00
Torkel Ödegaard	1dc8b898bb	add dashnav responsive rule to hide tv button on smaller screens	2018-10-29 19:17:08 +01:00
Carl Bergquist	c0c2df4da0	Merge pull request #13871 from crab86/patch-2 ... Updated grafana_stats.json	2018-10-29 17:42:44 +01:00
David	a0aaf70060	Merge pull request #13886 from grafana/davkal/explore-fix-cell-click ... Explore: fix copy/paste on table cells	2018-10-29 17:06:54 +01:00
David Kaltschmidt	5a23723f2c	Explore: fix copy/paste on table cells ... When selecting text via mouse, our ReactTable cells' click handler triggers an event. - check event target to be the link, only then handle the event	2018-10-29 16:44:50 +01:00
David	b00e709aee	Merge pull request #13842 from grafana/davkal/explore-error-handling ... Explore: error handling and time fixes	2018-10-29 15:08:14 +01:00
Torkel Ödegaard	befee108c4	Merge pull request #13872 from grafana/css-loading-sync ... Revert to sync loading of css, sometimes js loaded before css which c…	2018-10-29 13:48:39 +01:00
Torkel Ödegaard	2481d19dc8	Merge pull request #13875 from bergquist/branch_param_to_build ... build: adds branch info to binary build	2018-10-29 13:45:27 +01:00
bergquist	c9ac762fb1	build: adds branch info to binary build	2018-10-29 13:27:29 +01:00
Torkel Ödegaard	dc961a8274	Merge pull request #13870 from grafana/davkal/make-node_modules ... Makefile: dependency-driven target to build node_modules	2018-10-29 12:31:23 +01:00
Torkel Ödegaard	2dde2c4f9b	now that css is loaded sync again I can remove some styles from index html body css	2018-10-29 04:26:44 -07:00
Torkel Ödegaard	d06ad98ec9	Revert to sync loading of css, sometimes js loaded before css which caused issues	2018-10-29 04:19:45 -07:00
Sebastian	85aed0276e	Update grafana_stats.json ... The grafana_stats.json used the following prometheus query: "increase(grafana_alerting_result_total[1m])" But a metric called "grafana_alerting_result_total" is currently not there anymore. So i changed the query to "increase(grafana_alerting_active_alerts[1m])" and updated the title as well (Before: "Grafana alert results", Now: "Grafana active alerts").	2018-10-29 12:05:24 +01:00
David Kaltschmidt	a4ef1d6175	Makefile: dependency-driven target to build node_modules ... - added `node_modules` as new target - dependency on `package.json` and `yarn.lock` allows for quick `make node_modules` after a branch change, which noops when the deps have not changed - also added `clean` target	2018-10-29 11:08:30 +01:00
Carl Bergquist	1f6df77a80	Merge pull request #13869 from bergquist/delete_old_deocs ... removes old invalid release guide	2018-10-29 10:47:18 +01:00
bergquist	0e34a6be0f	removes old invalid release guide ... closes #13864	2018-10-29 10:37:30 +01:00
Torkel Ödegaard	e47de5602b	added missing alpha state prop to graph2 panel	2018-10-28 12:46:18 -07:00
Torkel Ödegaard	9f1f5805ec	added switch form component	2018-10-28 12:10:49 -07:00
Torkel Ödegaard	7863d2d882	Merge branch 'master' of github.com:grafana/grafana	2018-10-28 11:34:25 -07:00
Torkel Ödegaard	52669032d0	updated graph tests dashboard	2018-10-28 11:29:55 -07:00
Torkel Ödegaard	d94cd3f2b4	Merge branch 'fix-missing-points' of https://github.com/jsferrei/grafana into jsferrei-fix-missing-points	2018-10-28 11:17:36 -07:00
Torkel Ödegaard	9f35b8a65e	Merge pull request #13827 from grafana/remove-projectname-from-query-response ... stackdriver: Remove redundant project name assignment	2018-10-28 19:08:38 +01:00
David	121ac93d08	Merge pull request #13847 from miqh/fix/multi-line-aggregation ... Fix label suggestions inside multi-line aggregation contexts	2018-10-28 18:05:31 +01:00
David Kaltschmidt	9245dad53e	Fix query hint tests after refactor	2018-10-28 17:48:17 +01:00
David	2ec827f02f	Merge pull request #13774 from miqh/feat/sum-query-suggestion ... Implement sum aggregation suggestion with placeholder support	2018-10-28 17:37:42 +01:00
Torkel Ödegaard	8faf74d441	Merge pull request #13862 from buroa/master ... Fixing issue 13855	2018-10-28 15:38:23 +01:00
Steve Kreitzer	e44dde3f14	Fixing issue 13855	2018-10-28 10:25:42 -04:00
Michael Huynh	d1d5e9f7d3	Add tests to cover PlaceholdersBuffer and sum hint ... Related: #13615	2018-10-28 21:07:40 +08:00
Michael Huynh	c255b5da11	Add sum aggregation query suggestion ... Implements rudimentary support for placeholder values inside a string with the `PlaceholdersBuffer` class. The latter helps the newly added sum aggregation query suggestion to automatically focus on the label so users can easily choose from the available typeahead options. Related: #13615	2018-10-28 21:03:39 +08:00
Torkel Ödegaard	add2e4447e	Merge pull request #13849 from grafana/mode-change-performance-changes ... Reduce re-renderings when changing view modes	2018-10-27 17:43:42 +02:00
Torkel Ödegaard	c5f9d8092f	Reduce re-renderings when changing view modes	2018-10-27 16:54:04 +02:00
Torkel Ödegaard	10e5d725bc	updated singlestat logo	2018-10-27 15:13:57 +02:00
Michael Huynh	61843b58db	Add tests to cover aggregation context cases ... This should cover use cases involving multi-line queries and range vector syntax inside aggregation contexts. Related: #12890	2018-10-27 17:02:03 +08:00
Michael Huynh	2a4a19388f	Fix label suggestions for multi-line aggregation queries ... No label suggestions were being returned for multi-line aggregation contexts because the parsed selector string does not see the full context before a `by` or `without` clause. This solution stitches together all text nodes that comprise the query editor to ensure the selector has sufficient context to generate suggestions. Also, an additional workaround has been included to ensure range vector syntax does not disrupt label suggestions in aggregation contexts. Related: #12890	2018-10-27 16:54:12 +08:00
David Kaltschmidt	bf1af66292	Explore: error handling and time fixes ... - use global range types - add ErrorBoundary around individual Explore components - fix table merge on empty results - fix TimePicker date parsing on ISO dates - fix TimePicker range string after relative move	2018-10-26 18:16:00 +02:00
Leonard Gram	58a567173e	build: builds grafana docker for enterprise at release.	2018-10-26 15:19:53 +02:00
Jon Ferreira	07cb622729	Add code to flot that plots any datapoints which to not have neighbors ... as 0.5 radius points - fixes https://github.com/grafana/grafana/issues/13605	2018-10-26 09:10:07 -04:00