IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,866 Commits 5,454 Branches 554 Tags 1.9 GiB
ae5ec44171
Commit Graph

17866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David
758ec4bc70
Merge pull request #13844 from grafana/davkal/explore-empty-page 
Explore: Pluggable components from datasource plugins
 2018-10-30 14:54:34 +01:00
David Kaltschmidt
cf19ecc8f5 Make Explore plugin exports explicit 2018-10-30 14:38:34 +01:00
David
45d7516408
Merge pull request #13901 from grafana/davkal/grunt-newer 
JS tooling: run TS grunt tasks only when files changed
 2018-10-30 14:35:19 +01:00
Marcus Efraimsson
d0c00388e6
add functionality to override service in registry 2018-10-30 13:37:30 +01:00
Peter Holmberg
58e94fc0fa moved state 2018-10-30 13:09:59 +01:00
Marcus Efraimsson
6f9c0241af
register datasource cache service with proper name 2018-10-30 12:32:14 +01:00
Marcus Efraimsson
5d4dc18bbc
revert application lifecycle event support 2018-10-30 12:31:28 +01:00
bergquist
b58b4ef128 changelog: adds note about closing #13876 2018-10-30 11:20:49 +01:00
Carl Bergquist
42d902b07d
Add new build info metrics that contains more info (#13876) 
* Add new build info metrics that contains more info

The goal was to add more information about Grafana. But rather than
just adding those to the current metrics I created a new metric
since its a common pattern in the prometheus community to expose that
info in a metric named `*_build_info`.

We keep the old metric to avoid introducing any breaking changes but
we should be able to remove it the next breaking change
 2018-10-30 11:18:43 +01:00
David Kaltschmidt
e8a895d58b JS tooling: run TS grunt tasks only when files changed 
- using grunt-newer to prefix precommit tasks
- only got it to work for tslint and tsc

Not applied to:

- sasslint does not take the file arguments in a way that grunt-newer
  recognizes
- no-only-tests throws an error when used with `newer`, but it's
  sub-second runtime
 2018-10-30 10:25:53 +01:00
Peter Holmberg
7a10bf0141 revert file name change 2018-10-30 09:45:47 +01:00
Marcus Efraimsson
2332b3e205
remove unused code 2018-10-30 09:34:09 +01:00
Marcus Efraimsson
52d825f535
log error on datasource access denied 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
70ddf93688
include teams on signed in user 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
9edaa3fa8c
application lifecycle event support 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
cfb061ddab
refactor datasource caching 2018-10-30 09:31:56 +01:00
Anton
355e76a48e Fix cell coloring 2018-10-29 23:26:29 +03:00
Anton
6092fa4dc3 Fix bug with background color in table cell with link 2018-10-29 23:13:07 +03:00
Torkel Ödegaard
1dc8b898bb add dashnav responsive rule to hide tv button on smaller screens 2018-10-29 19:17:08 +01:00
Nick Triller
3414be18bc Implement oauth_auto_login setting 
Redirect in backend
 2018-10-29 18:46:52 +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
Peter Holmberg
12a63b605f rename type 2018-10-29 16:01:14 +01:00
Peter Holmberg
12336e1548 using label component 2018-10-29 15:59:16 +01:00
David Kaltschmidt
d0776937b5 Pluggable components from datasource plugins 
- when instantiating a datasource, the datasource service checks if the
  plugin module exports Explore components, and if so, attaches them to
  the datasource
- Explore component makes all major internal pluggable from a datasource
  `exploreComponents` property
- Moved Prometheus query field to promehteus datasource and registered
  it as an exported Explore component
- Added new Start page for Explore, also exported from the datasource
 2018-10-29 15:14:36 +01:00
Peter Holmberg
70f6100d53 fixed type 2018-10-29 15:08:36 +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
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Peter Holmberg
7dc5173a9b removed angular code 2018-10-29 14:21:11 +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
Peter Holmberg
026588cbf1 test and some refactoring 2018-10-29 13:46:12 +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
1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +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