IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-12 06:05:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,908 Commits 1,241 Branches 722 Tags
ae26f7126fb25901d7de85d1cec9a78e3fb84221
Commit Graph
4173 Commits
Author SHA1 Message Date
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
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
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 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
Zac Coffy 9cce0f553a Adding Cloudwatch AWS/Connect metrics and dimensions 2018-11-05 13:15:03 -05:00
Marcus Efraimsson 26cbc6be81 Merge pull request #13966 from marefr/alert_extractor_refactor 
Refactor dashboard alert extractor
 2018-11-05 17:06:27 +01:00
bergquist 423331dae0 alerting: delete alerts when parent folder is deleted 
closes #13322
 2018-11-05 14:25:26 +01:00
Marcus Efraimsson 9e0da02b6a refactor dashboard alert extractor 2018-11-05 14:25:19 +01:00
bergquist ae2d536740 adds tests for extracting for property 2018-11-05 13:29:33 +01:00