Torkel Ödegaard
1b8a81d4ba
fix(alerting): fixed reducer change issue, fixes #6241
2016-10-12 07:04:53 +02:00
Dan Cech
6b16fcea52
Oauth2 Updates ( #6226 )
...
* break out go and js build commands
* support oauth providers that return errors via redirect
* remove extra call to get grafana.net org membership
* removed GitHub specifics from generic OAuth
* readded ability to name generic source
* revert to a backward-compatible state, refactor and clean up
* streamline oauth user creation, make generic oauth support more generic
2016-10-11 08:51:44 +02:00
Torkel Ödegaard
918481909c
fix(metricsegment): fixed issue with metric segment, fixes #6212
2016-10-08 10:23:30 +02:00
Torkel Ödegaard
dacfa6b978
fixed issue in metric_segment
2016-10-06 15:09:02 +02:00
Torkel Ödegaard
2908c6a80b
fix(metricsegment): added min width for inputs for metric segment and value select components
2016-09-30 13:13:28 +02:00
Torkel Ödegaard
2750c8a801
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
Torkel Ödegaard
34f15d92d0
feat(testdata): worked on testdata app
2016-09-27 14:39:51 +02:00
Torkel Ödegaard
5682520603
feat(graph): more work on graph panel and support for non time series
2016-09-24 13:08:58 +02:00
Torkel Ödegaard
cd270f14a2
feat(graph): more work on graph panel and support for non time series
2016-09-23 17:12:10 +02:00
Torkel Ödegaard
3bbc940b88
Merge branch 'master' into graph-panel-non-timeseries
2016-09-23 14:22:44 +02:00
Torkel Ödegaard
175c651e65
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115 , fixes #5906
2016-09-23 12:29:53 +02:00
Torkel Ödegaard
f2f3115749
feat(graph panel): more progress on graph panel and non time series data support
2016-09-22 16:47:37 +02:00
Torkel Ödegaard
23246605b0
feat(graph panel): working on adding non time series support to graph panel
2016-09-22 16:05:20 +02:00
Torkel Ödegaard
f3d4a97f49
Merge branch 'master' into graph-panel-non-timeseries
2016-09-22 14:03:06 +02:00
Dan Cech
248ed2672f
remove 'Github' from oauth login error messages
2016-09-21 09:42:06 -04:00
Dan Cech
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Torkel Ödegaard
b4111d78e1
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
2016-09-21 15:03:14 +02:00
Torkel Ödegaard
0906312046
Merge branch 'adhoc-filters'
2016-09-20 17:34:57 +02:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
Torkel Ödegaard
5ded88fa4d
feat(templating): progress on variable system refactoring, #6048
2016-09-19 11:34:08 +02:00
Torkel Ödegaard
5ce3e40cc9
feat(templating): more work on new variable handling code, #6048
2016-09-17 15:27:53 +02:00
Torkel Ödegaard
46ebae7304
feat(templating): progress on template system rewrite #6048
2016-09-16 16:50:30 +02:00
cmartin0077
f91f74be04
fix(influxdb) autocomplete measurement while typing, fixes #4278 ( #5931 )
2016-09-15 16:11:38 +02:00
Torkel Ödegaard
83b9db51e3
feat(templating): great progress on adhoc filters, #6038
2016-09-14 17:36:28 +02:00
Torkel Ödegaard
babab7677c
tech(lib upgrade): fixed issue with angular 1.5.8, so can revert revert of upgrade, that is we are no on latest angularjs, #6022
2016-09-14 10:45:56 +02:00
Torkel Ödegaard
649d9f9177
tech(lodash): upraded lodash to 4.15.0, closes #6021
2016-09-14 09:17:10 +02:00
Torkel Ödegaard
0fa0066cd9
tech(lodash): began migration work
2016-09-13 22:10:44 +02:00
Torkel Ödegaard
d60bd77658
feat(annotations): added support to show grafana stored annotations in graphs, #5982
2016-09-08 11:25:45 +02:00
bergquist
4646723cbb
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
2016-09-07 08:15:44 +02:00
Torkel Ödegaard
e2f5bf1666
feat(alerting): fixed confirm delete dashboard issue
2016-09-05 13:38:25 +02:00
Torkel Ödegaard
395213abd7
feat(graph panel): more refactoring of #5917
2016-09-05 11:46:16 +02:00
cmartin0077
9c08d7aef5
fix(influxdb) fix tag value autocomplete with upper case values, fixes #5399 ( #5919 )
2016-08-29 13:03:54 +02:00
bergquist
26c6437846
Merge branch 'master' into alerting
2016-08-22 12:27:08 +02:00
bergquist
6d60d125d3
Merge branch 'Othyus-filter_orgs'
2016-08-18 15:48:47 +02:00
bergquist
e3bbf96b37
Merge branch 'filter_orgs' of https://github.com/Othyus/grafana into Othyus-filter_orgs
2016-08-18 15:48:01 +02:00
Torkel Ödegaard
05697d5ecd
Merge branch 'master' into alerting
...
Conflicts:
conf/sample.ini
2016-08-17 10:03:33 +02:00
Torkel Ödegaard
f9b628ad0e
Merge branch 'v3.1.x'
...
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
2016-08-17 09:53:46 +02:00
Torkel Ödegaard
a5f0f508ea
feat(inspector): fixed error handling, showing response body when data proxy returns text/html body
2016-08-16 22:31:26 +02:00
Torkel Ödegaard
0b7fa3c19d
feat(alerting): minor progress on alert list, #5784
2016-08-16 16:50:36 +02:00
Torkel Ödegaard
f934081bcb
feat(alerting): making progress on alerting list, #5784
2016-08-16 09:52:45 +02:00
Torkel Ödegaard
d8d951c810
feat(alerting): can now change reducer
2016-08-15 17:53:44 +02:00
Torkel Ödegaard
1418cbbd8b
feat(query_part): refactoring query part
2016-08-15 17:20:45 +02:00
Torkel Ödegaard
befca9bb2f
feat(query parts): refactoring query part component to support actions
2016-08-15 13:51:55 +02:00
Torkel Ödegaard
8878a55dc6
Merge branch 'master' into alerting
2016-08-11 10:31:15 +02:00
Torkel Ödegaard
da6ac07b1d
Merge branch 'v3.1.x'
2016-08-11 10:29:48 +02:00
Torkel Ödegaard
0d26bc63ae
fix(graphite): minor fix/improvement to graphite error handling when doing metric exploration in query editor, fixes #5778
2016-08-11 10:29:28 +02:00
Torkel Ödegaard
49abb205a0
Merge branch 'v3.1.x'
...
Conflicts:
public/sass/_variables.light.scss
2016-08-01 12:23:36 +02:00
Torkel Ödegaard
f9ddfb4337
Merge branch 'master' into alerting
2016-07-29 15:07:47 +02:00
