Marcus Efraimsson
e82b3632f6
fix signed in user for orgId=0 result should return active org id
2018-12-18 20:02:27 +01:00
Dan Cech
3f85901c4a
only update session in mysql database when required
2018-12-18 11:19:32 -05:00
Baokun Lee
f51222027d
Raise datasources number to 5000
2018-12-18 23:59:14 +08:00
Victor Cinaglia
48fe92a945
snapshots: Close response body after error check
2018-12-18 08:32:49 -05:00
Tomas Dabasinskas
54b73025dc
Add OAuth provider flag to indicate if it's broken
2018-12-18 13:50:37 +02:00
Tomas Dabasinskas
052772ea2e
Register BrokenAuthHeaderProviders if needed
2018-12-18 13:48:25 +02:00
Torkel Ödegaard
a4091813bf
Merge pull request #14534 from grafana/14409/threshold-ux-changes
...
14409/threshold ux changes
2018-12-18 11:30:48 +01:00
Carl Bergquist
ac458a4e4b
Merge pull request #14511 from grafana/go-ldap-v3
...
ldap: upgrades go-ldap to v3
2018-12-18 08:18:40 +01:00
Jacob Richard
0b50582b56
Adding CIDR capability to auth_proxy whitelist
2018-12-17 23:43:14 -06:00
Torkel Ödegaard
1ee1247912
Gauge option form markup fixes
2018-12-17 17:54:40 +01:00
bergquist
7aa84aeb61
moves migrations to /sqlstore/migrations
2018-12-17 16:36:57 +01:00
bergquist
dbcc2e868d
adds integration tests to ci build
2018-12-17 16:36:57 +01:00
bergquist
11cde7ed71
renames main lock function
2018-12-17 16:36:57 +01:00
bergquist
c565b018c5
clean up integration tests
2018-12-17 16:36:57 +01:00
bergquist
823bba8d98
change from db_text to nvarchar
2018-12-17 16:36:57 +01:00
bergquist
dc49bebb00
adds server lock package
2018-12-17 16:36:57 +01:00
bergquist
ff136b6ba8
initial verison of server lock
2018-12-17 16:36:57 +01:00
Daniel Lee
167e8815d3
ldap: upgrades go-ldap to v3
2018-12-16 01:05:14 +01:00
Torkel Ödegaard
b15bb4fb95
Merge remote-tracking branch 'origin/master' into develop
2018-12-14 17:02:08 +01:00
Joesis
92a8c5b81b
log error when resolvePath
2018-12-13 02:10:29 -08:00
Daniel Lee
90e2175716
migration: renames logging ds to loki ds in data_source table
2018-12-12 20:54:05 +01:00
Marcus Efraimsson
c46d01dc83
Merge pull request #14090 from marefr/8843_pipeline_doc_count
...
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Torkel Ödegaard
f9110f7902
Merge branch 'master' into develop
2018-12-11 10:00:29 +01:00
Victor Cinaglia
411d67cae7
snapshots: Add support for deleting external snapshots
2018-12-10 18:47:23 -05:00
Victor Cinaglia
9d6da10e82
snapshots: Move external snapshot creation to backend
2018-12-10 16:36:32 -05:00
Victor Cinaglia
d9d6a4481f
snapshots: Add external_delete_url column
2018-12-10 16:25:02 -05:00
Scott Glajch
62a5cd27ba
Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399
2018-12-07 16:42:29 -05:00
Torkel Ödegaard
efede26eea
Merge pull request #14382 from grafana/davkal/remove-explore-tab
...
Remove Explore > "New tab" from sidebar
2018-12-07 20:24:13 +01:00
Torkel Ödegaard
eb6d0e9f51
Merge branch 'master' into develop
2018-12-07 14:59:38 +01:00
bergquist
9eea585773
removes unused code
2018-12-07 14:39:44 +01:00
bergquist
5d720674e3
Merge branch 'master' into add_google_hangouts_chat_notifier
...
* master: (322 commits)
graphInterval needs to update after query execution, fixes #14364
Explore: Parse initial dates
Aligned styling of stats popover/box with rest of grafana & minor css refactoring
Prometheus: Make result transformer more robust for empty responses
Rebase fixes
Explore: Logging line parsing and field stats
fixed unit tests
made unknown color theme aware and sync with graph color, some minor cleanup
Explore: improve error handling
use render props instead of cloneElement
sort of a hacky way to figure if the small variation should be used for the label
add basic button group component, using the the same label style as is
explore logs styling
wip: alternative level styling & hover effect
wip: explore logs styling
more detailed error message for loki
If user login equals user email, only show the email once #14341
UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341
wip: explore logs styling
restoring monospace & making sure width are correct when hiding columns
...
2018-12-07 14:31:13 +01:00
bergquist
a90bba859a
fixes merge error
2018-12-07 14:17:09 +01:00
David Kaltschmidt
80d62013b2
Remove Explore > "New tab" from sidebar
...
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +01:00
moznion
4397ee61d0
Put issue number to test code
2018-12-05 22:47:41 +09:00
moznion
d1e1cde00e
Fix bug what updating user quota doesn't work
...
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion
061e06c226
Fix bug what updating org quota doesn't work
...
3c330c8e4c/pkg/services/sqlstore/quota.go (L106)
2018-12-05 22:19:40 +09:00
Carl Bergquist
3c330c8e4c
Merge pull request #14317 from mjtrangoni/fix-misspell-issues
...
pkg/*: Fix misspelling issues using locale US
2018-12-05 10:34:28 +01:00
Torkel Ödegaard
180ca021b5
Merge branch 'master' into develop
2018-12-05 10:17:22 +01:00
Torkel Ödegaard
769407cd34
Merge pull request #14314 from nitti/add_influxdb_cumulative_sum
...
added support for influxdb cumulative_sum function in tsdb
2018-12-05 09:29:04 +01:00
Brian Gann
02365514f9
redact value for plugin proxy routes
2018-12-04 22:35:00 -06:00
Mario Trangoni
fadd816d89
pkg/*: Fix misspell issues
...
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
Tom Nitti
1e53c12921
added support for influxdb cumulative_sum function in tsdb
2018-12-04 12:46:50 -06:00
danielbh
d1b8f13c66
feat: #11067 prevent removing last grafana admin permissions
2018-12-03 20:05:52 -05:00
Marcus Efraimsson
95218c13ce
Merge pull request #14262 from kornholi/fix/dataproxy-auth
...
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
Marcus Efraimsson
ffec795fab
Merge pull request #14232 from SilverFire/security-password-reset
...
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 06:02:29 -08:00
Marcus Efraimsson
acb45867f8
Merge pull request #14179 from mattiarossi/master
...
Add support for offset in date histogram aggregation
2018-12-03 05:43:42 -08:00
SilverFire - Dmitry Naumenko
474197269e
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 15:32:26 +02:00
Kornelijus Survila
0cafd9a663
dataproxy: Override incoming Authorization header
2018-11-30 12:12:55 -07:00
Marcus Efraimsson
624e5e5b3d
let each sql datasource handle timeFrom and timeTo macros
2018-11-30 14:30:02 +01:00
Matthew Coltman
bbd0ec3a8b
Add AWS/CodeBuild namespace for CloudWatch datasource
2018-11-29 21:02:44 +01:00
Erik Sundell
6f85fa6b35
add new flag in order to be able to indicate whether the datasource has native support for tables
2018-11-28 15:06:22 +01:00
Mattia Rossi
ce74b1ddc2
Requested Backend changes, removed link in popover description for the offset field
2018-11-27 03:42:20 -05:00
Marcus Efraimsson
c0bf7c5f13
Merge pull request #14140 from grafana/fix_dashboard_service_log
...
log the actual error if failing to update alert data
2018-11-26 06:49:19 -08:00
Mattia Rossi
f6fc7f7b64
Requested Backend changes, added details to popover description for the offset field
2018-11-26 08:58:25 -05:00
Marcus Efraimsson
a022284cb0
fix handle of elasticsearch 6.0+ version
2018-11-23 15:24:16 +01:00
Marcus Efraimsson
36aec52c08
return actual error if failing to update alert data
2018-11-22 11:19:08 +01:00
Marcus Efraimsson
40a38552a9
Merge pull request #14151 from grafana/14150_cloudwatch
...
Fix invalid time range causes panic in Cloudwatch datasources
2018-11-21 09:23:51 -08:00
Marcus Efraimsson
a6a1362ad1
temporary fix for starting grafana not running systemd
2018-11-21 18:15:28 +01:00
Marcus Efraimsson
3534762f49
cloudwatch: handle invalid time ranges
2018-11-21 17:51:02 +01:00
Marcus Efraimsson
879aed7d06
cloudwatch: recover/handle panics when executing queries
2018-11-21 17:49:17 +01:00
Carl Bergquist
acf8d43682
Merge pull request #14056 from mjtrangoni/fix-errcheck-issues
...
Fix errcheck issues
2018-11-21 17:23:56 +01:00
Marcus Efraimsson
0b3e5ec4a7
Merge pull request #14137 from grafana/webpack-error-template-fix
...
fix for issue with error view in production builds
2018-11-20 04:59:12 -08:00
Torkel Ödegaard
34c70ca7ce
fix for issue with error view in production builds
2018-11-20 13:47:45 +01:00
Carl Bergquist
db8bd8298a
Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth
...
Add basic authentication support to metrics endpoint
2018-11-20 11:19:55 +01:00
Marcus Efraimsson
9cc6c2128a
Merge pull request #14120 from supercharlesliu/user-teams
...
Add API GET /api/users/:id/teams for GrafanaAdmin
2018-11-20 00:56:35 -08:00
Marcus Efraimsson
cab2c5189a
Merge pull request #14129 from daktari/master
...
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
2018-11-20 00:42:22 -08:00
Bob Shannon
16ff8a182b
Re-organize packages and add basic auth test
2018-11-19 13:54:13 -05:00
Javier
0900470dda
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
2018-11-19 18:10:34 +01:00
bergquist
862815d18d
go meta lint errors
2018-11-19 14:00:20 +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
Marcus Efraimsson
60fd8ee9d4
fix id returned from google is a string
2018-11-19 11:11:13 +01:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
...
Introduce alert debouncing
2018-11-19 10:38:02 +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
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
supercharlesliu
215242128b
Fix param
2018-11-19 17:09:45 +08:00
supercharlesliu
fb5c59c611
Add GET /api/users/:id/teams for orgAdmin
2018-11-19 17:08:10 +08:00
Patrick
2de5a7119b
Merge branch 'master' into add_google_hangouts_chat_notifier
2018-11-18 22:00:53 +01:00
Vinicyus Macedo
152261413d
Added Id to BasicUserInfo returns
2018-11-17 12:05:06 -02:00
Vinicyus Macedo
057f611194
Added google oauth account id
2018-11-17 00:48:54 -02:00
Marcus Efraimsson
9a8ad70013
fix pipeline aggregations on doc count
2018-11-15 19:06:47 +01:00
Marcus Efraimsson
f560c3297e
Merge pull request #14034 from grafana/12550_team_preferences
...
Team preferences support
2018-11-15 07:35:10 -08:00
bergquist
caec36e7ec
alert rule have to be pending before alerting is for is specified
2018-11-15 15:37:46 +01:00
Leonard Gram
2e8c4699b0
build: internal metrics for packaging.
2018-11-15 14:42:09 +01:00
bergquist
a70ea2101c
alertmanager: adds tests for should notify
2018-11-15 12:36:11 +01:00
Torkel Ödegaard
480da34279
filter out alpha plugins in api call, fixes #14030
2018-11-15 11:10:47 +01:00
bergquist
28029ce4a7
alerting: support for on execution errors and notdata
2018-11-15 11:04:16 +01:00
bergquist
84eb3bd095
tests for supporting for with all alerting scenarios
2018-11-14 23:43:09 +01:00
bergquist
8fb997d935
should not notify when going from unknown to pending
2018-11-14 23:43:09 +01:00
Bob Shannon
dcc48860b8
Fix formatting and remove enabled toggle
2018-11-14 17:37:32 -05:00
Bob Shannon
362b3740ed
Add basic authentication support to metrics endpoint
2018-11-14 16:27:41 -05:00
Mario Trangoni
774ad3ff39
pkg/cmd/grafana-server/server.go: Check sendSystemdNotification return value.
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
server.go:165:25⚠️ error return value not checked (sendSystemdNotification("READY=1")) (errcheck)
2018-11-13 21:21:18 +01:00
Mario Trangoni
dae7c11a5f
pkg/cmd/grafana-server/server.go: check serviceGraph.Provide() errors
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/server.go:77:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: bus.GetBus()})) (errcheck)
pkg/cmd/grafana-server/server.go:78:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g.cfg})) (errcheck)
pkg/cmd/grafana-server/server.go:79:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: routing.NewRouteRegister(middleware.RequestMetrics, middleware.RequestTracing)})) (errcheck)
pkg/cmd/grafana-server/server.go:80:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: cache.New(5*time.Minute, 10*time.Minute)})) (errcheck)
pkg/cmd/grafana-server/server.go:87:23⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: service.Instance})) (errcheck)
pkg/cmd/grafana-server/server.go:90:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g})) (errcheck)
2018-11-13 20:02:55 +01:00
Mario Trangoni
a6d54d5d9f
pkg/cmd/grafana-server/main.go: Fix error value not checked
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/main.go:56:23⚠️ error return value not checked (http.ListenAndServe(fmt.Sprintf("localhost:%d", *profilePort), nil)) (errcheck)
2018-11-13 19:51:32 +01:00
Marcus Efraimsson
5f9fecd254
feat: team preferences
2018-11-12 20:01:53 +01:00
bergquist
2fb78a50d6
minor fixes based on code review
2018-11-12 10:50:56 +01:00
Torkel Ödegaard
46ebe245ab
Merge pull request #13999 from roidelapluie/originreferer
...
Remove Origin and Referer while proxying requests
2018-11-11 17:49:15 +01:00
Mario Trangoni
e351e6e211
pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated.
...
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/influxdb/influxdb.go:106:3⚠️ the surrounding loop is unconditionally terminated (SA4004) (megacheck)
2018-11-09 19:40:07 +01:00
Julien Pivotto
62417ca69f
Remove Origin and Referer headers while proxying requests
...
Fix #13949
Fix #13328
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-11-08 14:57:47 +01:00
Andrey Kaipov
63fdffe8c0
Fixes #13993 - adds more options for Slack notifications
2018-11-07 22:08:26 -05:00
Torkel Ödegaard
dcb5015022
Merge pull request #13951 from marefr/11977_6x_terms
...
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
