IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-11 13:44:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,690 Commits 1,226 Branches 722 Tags
a77c86169e012b5c98e2cc65361ae77d0111abe7
Commit Graph
17690 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson a77c86169e changelog: add notes about closing #13555 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 1a64b44c91 changelog: add notes about closing #13425 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 3c91e4de56 changelog: add notes about closing #13655 
[skip ci]
 2018-11-19 14:50:39 +01:00
Leonard Gram abd796c65f Merge pull request #14122 from xlson/publisher-rhel-final-aware 
Corrects an issue where nightly rpms would be misstagged.
 2018-11-19 14:43:02 +01:00
Torkel Ödegaard c67b55776c Merge pull request #14123 from grafana/switch-back-from-mixed 
fixed issue switching back from mixed data source
 2018-11-19 14:40:37 +01:00
Leonard Gram b041ad4134 linter. 2018-11-19 14:32:39 +01:00
Torkel Ödegaard 0053bee886 Merge pull request #14121 from grafana/panel-size-in-edit-mode-fix 
fixed issue with panel size when going into edit mode
 2018-11-19 14:21:37 +01:00
Torkel Ödegaard 1157a62375 fixed issue switching back from mixed data source, introduced by react panels changes 2018-11-19 14:20:19 +01:00
Leonard Gram ac55aeff95 build: minor refactor. 2018-11-19 14:12:04 +01:00
Leonard Gram 8f0d3ff7ea build: fixes a bug where nightly rpm builds would be handled as stable. 2018-11-19 14:06:18 +01:00
bergquist 862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Marcus Efraimsson 638eca3cdb update changelog 
[skip ci]
 2018-11-19 13:59:20 +01:00
Leonard Gram 2d361eeabf builds: introduces enum for relase type. 2018-11-19 13:26:35 +01:00
Marcus Efraimsson c22e7f4263 fix group sync cta link 2018-11-19 13:23:17 +01:00
Torkel Ödegaard d81d2f00f6 fixed issue with panel size when going into edit mode 2018-11-19 12:26:15 +01:00
Marcus Efraimsson 6c68976cab changelog: add notes about closing #13924 
[skip ci]
 2018-11-19 11:29:03 +01:00
Marcus Efraimsson 05a32d19be Merge pull request #14110 from vinicyusmacedo/master 
Added google oauth account id
 2018-11-19 02:21:11 -08:00
Leonard Gram e2007733f4 build: table-driven tests for publisher. 2018-11-19 11:20:44 +01:00
Marcus Efraimsson 60fd8ee9d4 fix id returned from google is a string 2018-11-19 11:11:13 +01:00
bergquist 8130067fd1 changelog: adds note about closing #7886 & #6202 2018-11-19 10:47:37 +01:00
Carl Bergquist 6049855dc7 Merge pull request #13947 from bergquist/alerting_for 
Introduce alert debouncing
 2018-11-19 10:38:02 +01:00
Torkel Ödegaard c856c21b77 Merge pull request #14116 from cinaglia/fix-singlestat-xss 
Mitigate XSS vulnerabilities in Singlestat panel
 2018-11-19 10:36:44 +01:00
Marcus Efraimsson 959d7036a7 Merge pull request #14084 from xlson/internal-metrics-packaging 
build: internal metrics for packaging.
 2018-11-19 01:25:33 -08:00
bergquist 23b1fbcf48 changelog: adds note about closing #11893 2018-11-19 10:22:26 +01:00
Carl Bergquist 03ac9c5256 Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login 
11893 oauth auto login
 2018-11-19 10:21:33 +01:00
bergquist 76cbd7f0de alerting: reduce the length of range queries 
since we introduce deboucing the length should matter less.
But going below 5m as default might be weird depending on datasource.
 2018-11-19 09:10:19 +01:00
Victor Cinaglia ba5a002323 Mitigate XSS vulnerabilities in Singlestat panel 
Sanitize `prefix` and `postfix` fields. Re-arrange code slightly in order to handle variable
interpolation.
 2018-11-18 20:33:36 -05:00
Vinicyus Macedo 152261413d Added Id to BasicUserInfo returns 2018-11-17 12:05:06 -02:00
Torkel Ödegaard 435079c6e7 Merge pull request #14102 from grafana/change-tab-in-edit-modefix 
fix: dont setViewMode when nothing has changed
 2018-11-17 14:46:16 +01:00
Vinicyus Macedo 057f611194 Added google oauth account id 2018-11-17 00:48:54 -02:00
David 634d71a657 Merge pull request #14052 from grafana/davkal/explore-query-importer 
Explore: POC for datasource query importers
 2018-11-16 14:55:19 +00:00
David Kaltschmidt 411719bc70 Explore: POC for datasource query importers 
Explore is about keeping context between datasources if possible. When
changing from metrics to logging, some of the filtering can be kept to
narrow down logging streams relevant to the metrics.

- adds `importQueries` function in language providers
- query import dependent on origin datasource
- implemented  prometheus-to-logging import: keeping label selectors
  that are common to both datasources
- added types
 2018-11-16 13:52:58 +00:00
Leonard Gram ac8731b9fb build: enabled darwin build. 2018-11-16 14:50:27 +01:00
Leonard Gram ce63f5c0ee Merge pull request #14103 from xlson/darwin-compatible-build 
build: darwin compatible build env.

Fixes #13763
 2018-11-16 14:48:24 +01:00
Leonard Gram badb36b3c8 build: darwin compatible build env. 2018-11-16 14:29:35 +01:00
Marcus Efraimsson 2c7dfd74b4 Merge pull request #14100 from grafana/fix-save-redirect-issue 
fix for save dashboard redirect issue
 2018-11-16 04:03:47 -08:00
Marcus Efraimsson f528142655 Merge pull request #14089 from grafana/fixed-alert-tab-location 
fixed alert tab order and fixed some console logging issues
 2018-11-16 03:58:13 -08:00
Torkel Ödegaard 96104e4372 fix: dont setViewMode when nothing has changed 2018-11-16 12:39:26 +01:00
Torkel Ödegaard 907c84f7d8 Merge pull request #14099 from alexanderzobnin/fix-14098 
fix datasource testing
 2018-11-16 11:34:30 +01:00
Torkel Ödegaard e85a3f1d04 fix redirect issue, caused by timing of events between angular location change and redux state changes 2018-11-16 11:29:32 +01:00
Alexander Zobnin 8c7f4ac188 fix datasource testing 2018-11-16 13:17:41 +03:00
Leonard Gram 438f7d0332 build: refactoring. 2018-11-16 09:03:46 +01:00
Torkel Ödegaard 4822c02534 Merge pull request #14092 from cloudshapes/record-full-url-in-google-analytics 
Update google analytics code to submit full URL not just path
 2018-11-16 07:58:55 +01:00
Torkel Ödegaard 905ef22075 fixed order of time range tab 2018-11-16 06:53:54 +01:00
Roland Dunn 242ceb6d95 Update google analytics code to submit full URL not just path 2018-11-15 20:12:48 +00:00
Marcus Efraimsson cbd4125e69 changelog: add notes about closing #5930 
[skip ci]
 2018-11-15 17:50:18 +01:00
Marcus Efraimsson 0810aa2e60 Merge pull request #12371 from marefr/xaxis_thresholds 
Time regions support in graph panel
 2018-11-15 08:46:39 -08:00
David fe45cb9aa1 Merge pull request #14032 from grafana/davkal/explore-prevent-term-completion 
Explore: Don't suggest term items when text follows
 2018-11-15 16:43:15 +00:00
Torkel Ödegaard 8ce1cc2d52 fixed alert tab order and fixed some console logging issues 2018-11-15 17:33:55 +01:00
Marcus Efraimsson 3b4a224a57 Add tooltip 2018-11-15 17:25:58 +01:00