public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,677 Commits 655 Branches 650 Tags
c6f80ecec24e48a247a2bc058bcdf63e6c24de58
Commit Graph
19677 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist c6f80ecec2 Merge pull request #14229 from pbakulev/configurable-alert-notification 
Configurable alert notification
 2019-01-28 22:47:12 +01:00
bergquist e218cc7637 docs: updates docs to refer to using uid 2019-01-28 22:03:16 +01:00
bergquist 7c93335d28 gofmt issue 2019-01-28 21:04:08 +01:00
Torkel Ödegaard daab7a5f6e Merge pull request #15099 from grafana/tooling/storybook-poc 
Named colors & storybook
 2019-01-28 20:47:46 +01:00
bergquist 809019d4ee moves test files into testdata folder 2019-01-28 20:44:10 +01:00
bergquist 8f0e65a150 renames alert_notifications -> notifiers 2019-01-28 20:39:09 +01:00
Marcus Efraimsson bc34ccc9b2 changelog: add notes about closing #14711 2019-01-28 20:31:21 +01:00
Marcus Efraimsson fce354875c Merge pull request #14711 from ander26/nanosecond-postgresql 
sql datasources: nanosecond timestamp support
 2019-01-28 20:26:45 +01:00
Marcus Efraimsson 7023c957d7 Merge branch 'master' into nanosecond-postgresql 2019-01-28 20:04:46 +01:00
Marcus Efraimsson 3a53f75ebb update inline documentation 2019-01-28 19:52:35 +01:00
Marcus Efraimsson f09c4608c2 changelog: add notes about closing #13711 2019-01-28 18:35:48 +01:00
Marcus Efraimsson ed6cca61c9 Merge pull request #15051 from ellisvlad/13711_parse_database_config_ipv6_host 
Parse database host correctly when using IPv6
 2019-01-28 18:32:09 +01:00
Marcus Efraimsson 577f35f6ba changelog: add notes about closing #5699 2019-01-28 18:24:13 +01:00
Marcus Efraimsson f701c610fb Merge pull request #15054 from RangerRick/master 
add global datasource proxy timeout setting
 2019-01-28 18:21:27 +01:00
Torkel Ödegaard 8510f0cd11 Merge pull request #15084 from grafana/fix/explore-datasource-change 
Update datasource before the loading has started
 2019-01-28 17:55:33 +01:00
Torkel Ödegaard a7b486d998 Merge pull request #15040 from grafana/14807-enable-webit-scrollbar-styles 
Re-enable webit-prefixed scrollbar styles
 2019-01-28 17:51:39 +01:00
Torkel Ödegaard adf08bf222 Merge pull request #15098 from xlson/build-dont-push-latest 
build: ignore latest
 2019-01-28 17:49:47 +01:00
Dominik Prokop 44a7bd68be Import fix 2019-01-28 17:46:42 +01:00
Torkel Ödegaard 2bed762950 Merge pull request #15097 from benjamingorman/feature/grammar-fixes 
Spelling/grammar fixes in top level markdown files
 2019-01-28 17:37:34 +01:00
Dominik Prokop 7a8eb8c115 Merge branch 'master' into tooling/storybook-poc 2019-01-28 17:36:41 +01:00
Torkel Ödegaard 6d9246d447 Merge pull request #15093 from grafana/fix/explore-do-not-clear-results 
Do not clear query results on transaction start
 2019-01-28 17:17:13 +01:00
Torkel Ödegaard fd06e51776 Merge branch 'master' into fix/explore-do-not-clear-results 2019-01-28 17:16:39 +01:00
Torkel Ödegaard 50b140f6ce Merge pull request #15082 from bergquist/explore_by_default 
enables explore by default
 2019-01-28 17:09:17 +01:00
Leonard Gram 584c97320a build: ignore latest 2019-01-28 17:08:27 +01:00
Torkel Ödegaard ca68a88ee1 Merge pull request #14914 from grafana/named-colors 
Named colors picker
 2019-01-28 17:08:26 +01:00
Torkel Ödegaard 5768593da7 Merge pull request #15095 from grafana/hugoh/bug-inifinite-loop-when-scan-for-older-logs-clicked 
Making sure we do not pass a long invalid queries and save to state
 2019-01-28 17:01:24 +01:00
Ben Gorman d56d9a0c12 Spelling/grammar fixes in top level markdown files 2019-01-28 15:58:32 +00:00
Leonard Gram 55f2495afa build: publishes armv6 to grafana.com. 
Stops using the old publisher completely.

Closes #13008
 2019-01-28 16:33:24 +01:00
Torkel Ödegaard a1a905cbb1 Removed the initial data source as I could not see it being used anywhere 2019-01-28 16:31:38 +01:00
Dominik Prokop 00cb751eab Merge branch 'named-colors' of github.com:grafana/grafana into named-colors 2019-01-28 15:54:58 +01:00
Dominik Prokop 9a08a994f4 Initialize named colors palete lazily 2019-01-28 15:49:59 +01:00
Dominik Prokop 053d4060e8 Fix thresholds default colors not being applied 2019-01-28 15:48:54 +01:00
bergquist 21fff415ed removes unnessecary db request 2019-01-28 15:37:52 +01:00
Hugo Häggmark 08f5a3338a Making sure we do not pass a long invalid queries and save to state 2019-01-28 15:27:35 +01:00
Torkel Ödegaard 91d926f180 single import for types from @grafana/ui 2019-01-28 15:27:23 +01:00
bergquist 935da14f7d tab/spaces formatting 2019-01-28 15:27:02 +01:00
Torkel Ödegaard 2c9a867bde Merge branch 'master' into fix/explore-datasource-change 2019-01-28 15:24:14 +01:00
Torkel Ödegaard 2dc2471b5c Revert "Updated home dashboard, removed home dashboard header" 
This reverts commit 0151846e1e.
 2019-01-28 15:01:42 +01:00
Torkel Ödegaard 994c79b59b Merge branch '15048/navigate-from-not-saved-panel' 2019-01-28 14:45:49 +01:00
Torkel Ödegaard 520756fb4c Fixed wrong line in test 2019-01-28 14:44:35 +01:00
Hugo Häggmark dc125f1e4d Made sure we only resetTypeahead if mounted 2019-01-28 14:43:59 +01:00
bergquist 6a8643b3d1 Merge branch 'master' into configurable-alert-notification 
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
 2019-01-28 14:16:43 +01:00
Dominik Prokop d947748dd4 Delayed explore query loading indicator and implemented minor ux improvements to it 2019-01-28 14:07:45 +01:00
Peter Holmberg d433a4792a fixing test 2019-01-28 14:07:37 +01:00
bergquist 48aa173f67 support both uid and id for showing/removing notifiers 2019-01-28 14:00:55 +01:00
David edfce0893e Merge pull request #15090 from grafana/hugoh/bug-explore-cant-go-from-dashboard-to-explore 
Fixed reinitialise of Explore
 2019-01-28 13:43:32 +01:00
Dominik Prokop 07331b4c07 Revert "Use the same panel loading indicator in explore as on dashboard's panel" 
This reverts commit 05edb3e5ad.
 2019-01-28 13:40:41 +01:00
Hugo Häggmark 6b0400eed2 Firing off an action instead of listening to location changes 2019-01-28 13:27:56 +01:00
Dominik Prokop 957c659291 Handle undefined graph and table results 2019-01-28 13:09:51 +01:00
bergquist 6e672eb291 enable explore by default 
closes #15037
 2019-01-28 13:02:54 +01:00