13461 Commits (7dc36ae2f768618e40d9325b7a16d98512b12a6b)

 

All Branches   

Search

Author	SHA1	Message	Date
Daniel Lee	7dc36ae2f7	Merge pull request #11413 from grafana/cp-5.0.4 ... Cherry-picks for v5.0.4	7 years ago
Daniel Lee	7f21e39511	5.0.4 release	7 years ago
Daniel Lee	d245b056b9	dashboard: allow alerts to be saved for new/provisioned dashboards ... This changes the logic for the alert validation in the extractor. Validation is executed twice, once before attempting to save the alerts and once after saving the dashboard while saving the alerts to the db. The first validation will not require that the alert has a dashboard id which allows new dashboards with alerts to be saved. Fixes #11247 (cherry picked from commit 68833fa978)	7 years ago
bergquist	1d36d20357	alert: fixes broken link back to grafana ... If Grafana was configured to use a subpath it was included twice in the link from the alert notification back to Grafana. closes #11403 (cherry picked from commit 5596707531)	7 years ago
bergquist	03e385df27	alerting: bad default state for notifiers ... when we made image upload optional we didnt show the default value properly in the UI. Which caused confusing. This commit apply the default values to existing notifiers in the edit pages and reverts back to using uploadimage=true as the default value. (cherry picked from commit d29563ff8e)	7 years ago
Alexander Zobnin	18219e81a1	snapshot: fix legend rendering bug ... (cherry picked from commit a472d38fbf)	7 years ago
Alexander Zobnin	2a64835ffb	dashboard: fix phantomjs panel rendering in collapsed row ... (cherry picked from commit 05ac7d8fca)	7 years ago
Alexander Zobnin	c86a2f165d	fix failed tests for dashboard view state ... (cherry picked from commit 205714759e)	7 years ago
Alexander Zobnin	3e22d19a27	dashboard: fix rendering link to panel in collapsed row ... (cherry picked from commit 0e5b790b54)	7 years ago
Daniel Lee	91162f3542	Merge pull request #11279 from grafana/v5.0.x-release ... update package.json to v5.0.3	7 years ago
Daniel Lee	70466c6cec	update package.json to v5.0.3	7 years ago
Daniel Lee	cce7f11c35	Merge pull request #11277 from grafana/v5.0.x-xorm ... mysql: fixes panics when mysql connection times out (#11155)	7 years ago
Daniel Lee	acbd6d44b0	session: fork Macaron mysql session middleware ... This changes forks the mysql part of the Macaron session middleware. In the forked mysql file: - takes in a config setting for SetConnMaxLifetime (this solves wait_timeout problem if it is set to a shorter interval than wait_timeout) - removes the panic when an error is returned in the Exist function. - retries the exist query once - retries the GC query once	7 years ago
Daniel Lee	3c5bf4a0cf	database: expose SetConnMaxLifetime as config setting ... For MySQL, setting this to be shorter than the wait_timeout MySQL setting solves the issue with connection errors after the session has timed out for the connection to the database via xorm.	7 years ago
Daniel Lee	b33ac25f82	database: fixes after xorm update	7 years ago
Daniel Lee	3a8306086b	database: update xorm to v0.6.4 and xorm core to v0.5.7	7 years ago
Carl Bergquist	f14ad7445f	Merge pull request #11248 from bergquist/cp_5.0.2 ... Cherry-picks for 5.0.2	7 years ago
bergquist	946a6c7d59	renderer: avoid redirect render requests ... closes #11180 (cherry picked from commit 6cac7c2de9)	7 years ago
Daniel Lee	990168c2af	teams: removes quota on route ... Got added by mistake a year ago. (cherry picked from commit 3f2c086e6f)	7 years ago
bergquist	95ce4725fb	release 5.0.2	7 years ago
Marcus Efraimsson	7133cc1013	dashboard: fix import dashboard with alert rule ... Importing a dashboard with alert rule(s) should be possible without receiving invalid alert data error. This fix reverts the import logic to how it worked before Grafana v5.0, that is import will allow dashboard with alert rule(s) but no alerts will be created. After an import the user will need to update the dashboard for the alerts to be created. Fixes #11227 (cherry picked from commit 87284d284e)	7 years ago
bergquist	3600f0ec0b	session: recover from panics in session middleware ... backport of 5f511deefcc247677e963e37986b076646a2f080i since 5.0.x diverged from master. ref #11155	7 years ago
bergquist	80c717cf6d	alerting: supports extracting alerts from collapsed panels ... collapsed rows wrap the hidden rows within itself. This caused the extractor to miss the panel and therefore delete the alert accosiated with the graph. closes #11222 (cherry picked from commit be7ec310b1)	7 years ago
Marcus Efraimsson	9d58257be6	folders: should be possible to browse folder using only uid ... That is, the slug part of url should be optional. (cherry picked from commit 91fa076fb3)	7 years ago
Marcus Efraimsson	e1b554c61e	dashboards: should be possible to browse dashboard using only uid ... That is, the slug part of url should be optional. Closes #11231 (cherry picked from commit 5fbfd67b94)	7 years ago
bergquist	a747ec349e	release 5.0.1	7 years ago
Carl Bergquist	d9f3c0931a	Merge pull request #11148 from bergquist/v5.0.x ... Cherry pick #11145 and #11127	7 years ago
Dan Cech	f736e7aeb2	only use jwt token if it contains an email address ... (cherry picked from commit 9d005c50a2)	7 years ago
Daniel Lee	84d6e67e6b	alerting: fixes validation error when saving alerts in dash ... If a panelId in the dashboard json is set to zero then the validation silently fails. Instead of returning an error, it just ignores alerts and saves the dashboard. (cherry picked from commit d96fbb486f)	7 years ago
Daniel Lee	5ad76a29a0	Merge pull request #11142 from daniellee/v5.0.x ... Cherrypick for V5.0.x	7 years ago
bergquist	5c6fd4f202	hide row actions for viewers ... closes #11112 (cherry picked from commit d3b23b01d8)	7 years ago
Patrick O'Carroll	f13ffa3a52	made drop-menu into link ... (cherry picked from commit 42cd462cbf)	7 years ago
Patrick O'Carroll	55809ee92a	changed background for mobile menu background on light theme, increased font size in and added border-right in menu ... (cherry picked from commit 9b3863a150)	7 years ago
Daniel Lee	a1db5561e0	scrolling: faster wheelspeed ... ref #11053 (cherry picked from commit 8e81dc1e79)	7 years ago
Leonard Gram	3591e573f1	Merge pull request #11125 from xlson/cp_11121 ... Cherry pick #11121	7 years ago
Carl Bergquist	b29c2da7ef	Merge pull request #11124 from bergquist/cp_11093 ... Cherry pick #11093	7 years ago
Leonard Gram	0f601dc4b1	alerting: Limits telegram captions to 200 chars. ... The caption for inline images in Telegram is limited to 200 characters. Fixes #10975 (cherry picked from commit 891462b5d9)	7 years ago
Carl Bergquist	5742c4d603	Merge pull request #11117 from grafana/cp-fix-11103 ... cherry pick #11103 to v5.0.x	7 years ago
Carl Bergquist	2226506a1d	Merge pull request #11120 from bergquist/cp_11097 ... Cherry-pick #11097	7 years ago
Sven Klemm	dcafc29bf2	use net/url to generate postgres connection url ... (cherry picked from commit 4904a051cf)	7 years ago
bergquist	1b16a1ae81	fixes invalid link to profile pic when gravatar is disabled ... closes #11097 (cherry picked from commit 5934521137)	7 years ago
Carl Bergquist	45e22da955	Fix Prometheus 2.0 stats (#11048) (#11115) ... Fixes #11016 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> (cherry picked from commit 69c93e6401)	7 years ago
Torkel Ödegaard	bc660ff3d5	fix: restores white resize handle for panels, fixes #11103 ... (cherry picked from commit 0de90accfb)	7 years ago
Carl Bergquist	426ae8bdd3	Merge pull request #11113 from bergquist/cp-11109 ... Cherry-pick #11109	7 years ago
bergquist	5bab016837	ignore iteration property when checking for unsaved changes ... closes #11063 (cherry picked from commit a7d62f44d3)	7 years ago
Daniel Lee	a7fcadd7c9	build: update publish_both with v5.0.0	7 years ago
Torkel Ödegaard	af6e28366b	build: updated version	7 years ago
Marcus Efraimsson	3d4e99d8be	Merge pull request #11040 from grafana/permission-checks ... Add permission check for dashboard diff api route	7 years ago
Laurent Godet	59704ee939	Fix Github OAuth not working with private Organizations (#11028) ... * Fix Github OAuth not working with private organizations * Update documentation	7 years ago
Torkel Ödegaard	e67b1ebf33	Merge branch 'master' of github.com:grafana/grafana	7 years ago