IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
18,053 Commits 5,450 Branches 554 Tags 1.9 GiB
9eea585773
Commit Graph

4196 Commits

Author SHA1 Message Date
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
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)

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.
 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
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
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
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