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
14,193 Commits 5,454 Branches 554 Tags 1.9 GiB
c22495b6f8
Commit Graph

3362 Commits

Author SHA1 Message Date
Carl Bergquist
a140296633
Merge pull request #11594 from xginn8/writable_plugins 
Grafana-CLI: mention the plugins directory is not writable on failure
 2018-04-16 09:27:19 +02:00
Daniel Lee
67daa9b058
Merge pull request #11588 from mjtrangoni/fix-codespell-issues 
Fix codespell issues
 2018-04-16 09:12:49 +02:00
Sven Klemm
6d3da9a73d remove postgresversion and convert unix timestamp in go 2018-04-15 22:14:13 +02:00
Kim Christensen
7534f0bff6 Support deleting empty playlist 2018-04-15 21:37:34 +02:00
Matthew McGinn
ee623e2091 Grafana-CLI: mention the plugins directory is not writable on failure 2018-04-15 13:44:59 -04:00
Sven Klemm
9b61ffb48a make timefilter macro aware of pg version 2018-04-15 18:38:20 +02:00
Daniel Lee
d70cacc364
Merge pull request #11532 from ryantxu/sql-uint64 
PostgreSQL should not cast all times to uint64
 2018-04-14 17:56:39 +02:00
Mario Trangoni
91fb2e07ce pkg: fix codespell issues 2018-04-13 20:31:29 +02:00
Daniel Lee
9413ce5ef6
Merge pull request #8096 from ryantxu/influx-db-query2 
let the influxdb API set a database
 2018-04-13 18:22:12 +02:00
Marcus Efraimsson
ff4e38c1d8
provisioned dashboard validation should be made when importing a dashboard 
Had to add the validate before save command before validating provisioned dashboard
so that the import would get a proper dashboard id
 2018-04-13 17:54:41 +02:00
Marcus Efraimsson
79d8937ce5
provisioned dashboard validation should not be made from provisioning service 
Provisioned dashboard validation should not be made when creating/updating a folder or
when provisioning service are trying to provision/create/update dashboard
 2018-04-13 17:45:32 +02:00
Marcus Efraimsson
4f44376564
remove comment/unused variable 2018-04-13 17:11:52 +02:00
Marcus Efraimsson
4a26797cdd
Merge branch 'master' into readonly_dashboards 2018-04-13 17:03:00 +02:00
Patrick O'Carroll
9ad8a77a21 ordered user orgs alphabeticaly fixes #11556 2018-04-13 14:53:36 +02:00
Marcus Efraimsson
a86ee304ff
tsdb: remove unnecessary type casts in sql data sources macro engines 2018-04-12 19:08:35 +02:00
Marcus Efraimsson
f5586b1270
tsdb: sql data sources should handle time ranges before epoch start correctly 2018-04-12 18:53:12 +02:00
Marcus Efraimsson
a3874ce2c7
Merge branch 'master' into sql-uint64 2018-04-12 18:49:27 +02:00
flopp999
74f570fdf4
change annotation limit from 10 to 100 2018-04-12 17:38:10 +02:00
Marcus Efraimsson
b4863002c9
permission: fix user with org viewer save/move permissions 
User with org viewer role should not be able to save/move dashboards
in/to general folder.
 2018-04-11 00:23:50 +02:00
bergquist
93e1546f73 alerting: handle invalid json format 
closes #11003
 2018-04-10 22:22:12 +02:00
Marcus Efraimsson
6cb891dca8
mysql: use a datetime column with microsecond precision in test 2018-04-10 16:37:39 +02:00
Marcus Efraimsson
97f67ddcb8
tsdb: improved floating point support when converting sql time column to epoch (ms) 2018-04-10 16:36:00 +02:00
bergquist
f424d13b53 provisioning: dont override permissions 2018-04-10 12:35:06 +02:00
bergquist
949484b949 provisioning: simplify db query 
the GetProvisionedDashboardQuery wasent used for anything
else than check if a dashboard is provisioned or not. So
we simplified this query to make it more maintainable.
 2018-04-10 12:30:37 +02:00
Marcus Efraimsson
9d84e6f31f
mssql: fix precision for time columns in time series query mode 2018-04-10 11:10:56 +02:00
Marcus Efraimsson
0317ecbf0d
postgres: support running multiple postgres integration tests 
Makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=postgres go test ./pkg/...
 2018-04-10 11:08:30 +02:00
Marcus Efraimsson
1783c534fd
postgres: fix precision for time columns in time series query mode 2018-04-10 11:07:01 +02:00
Marcus Efraimsson
af62646624
mysql: fix precision for time columns in time series query mode 2018-04-10 11:01:43 +02:00
Marcus Efraimsson
5c120c2c11
mysql: mysql tests should use a db server with UTC 
To get rid of issues involving date/time when testing.
Also, makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=mysql go test ./pkg/...
 2018-04-10 10:58:45 +02:00
bergquist
0f9b592428 provisioning: fixes broken tests 2018-04-10 10:48:10 +02:00
Marcus Efraimsson
a314890f89
tsdb: add support for more data types when converting sql time column to epoch (ms) 2018-04-10 10:33:23 +02:00
bergquist
77e7887e5e provisioning: check provisiong before saveCmd 2018-04-10 09:35:54 +02:00
bergquist
7845eab502 provisioning: fixes typo 2018-04-10 09:32:05 +02:00
bergquist
bcbe7a1c55 provisioning: adds error handling 2018-04-10 09:31:35 +02:00
ryan
1c9ebd5bd8 fix test 2018-04-09 14:01:09 +02:00
ryan
920a0c4fec skip mssql fix 2018-04-09 13:49:13 +02:00
ryan
7d6c8aa612 add mssql and mysql 2018-04-09 13:34:35 +02:00
ryan
113bfb3d3e don't convert to uint64 2018-04-09 13:28:32 +02:00
Marcus Efraimsson
f3e1557761
guardian: when updating permissions should verify existing permissions 
Before in CheckPermissionBeforeUpdate, access was verified for updated
permissions. Now access is verified for existing permissions.
Refactored guardian tests to cover more test cases for org admin, editor
and viewer roles
 2018-04-08 15:06:22 +02:00
Marcus Efraimsson
84d034c688
api: allow authenticated users to search current org users and teams 
Any authenticated user of an organization should be able to
- search its organization's users
- search its organization's users
- retrieve a single user of its organization (this how it was
  implemented earlier)
 2018-04-07 10:39:28 +02:00
Marcus Efraimsson
6bbeb723ca Merge branch 'master' into readonly_dashboards 2018-04-05 20:30:27 +02:00
Marcus Efraimsson
8f94cecf0f permissions: return user and team avatar in folder permissions api 2018-04-04 15:51:19 +02:00
Marcus Efraimsson
ebad863f95 permission: generate team avatar url with default 2018-04-04 15:50:45 +02:00
Daniel Lee
533f3a9e8c settings: fixes test 
For some reason, the url parse does not fail anymore for curly
braces. Add a colon in the first segment to make sure the url
parse fails.
 2018-04-03 19:09:49 +02:00
Daniel Lee
32264c61c4 Merge branch 'master' into dashboard-acl-ux2 2018-03-29 11:32:24 +02:00
bergquist
45d9bfca97 print to stderr since logger might not exist 2018-03-28 22:51:21 +02:00
bergquist
2ccbf12d1c settings: return error instead of ignoring it 
closes #11281
 2018-03-28 22:32:58 +02:00
Carl Bergquist
0a1bc53f3a
Merge pull request #11406 from bergquist/gomail 
tech: migrates to none deprecated mail lib
 2018-03-28 14:19:39 +02:00
Carl Bergquist
f009443a6f
Merge pull request #11330 from digineo/auth-ipv6 
Support IPv6 in Auth proxy white list
 2018-03-28 14:17:43 +02:00
Daniel Lee
4b6fd675e2
Merge pull request #11390 from bergquist/notifiers_default_value 
Default value for uploading images in alert notifiers
 2018-03-28 13:06:09 +02:00
Daniel Lee
208cbd1189
Merge pull request #11405 from bergquist/alert_link 
alert: fixes broken link back to grafana
 2018-03-28 13:00:32 +02:00
bergquist
d29563ff8e alerting: bad default state for notifiers 
when we made image upload optional we didnt
show the default value properly in the UI. Which
caused confusing. This commit apply the default
values to existing notifiers in the edit pages
and reverts back to using uploadimage=true as the
default value.
 2018-03-28 12:52:39 +02:00
Daniel Lee
68833fa978 dashboard: allow alerts to be saved for new/provisioned dashboards 
This changes the logic for the alert validation in the extractor. Validation
is executed twice, once before attempting to save the alerts and once after
saving the dashboard while saving the alerts to the db. The first validation
will not require that the alert has a dashboard id which allows new dashboards
with alerts to be saved.

Fixes #11247
 2018-03-28 11:32:05 +02:00
bergquist
9e2e6fc586 add fallback for gravatar in org/admin view 
closes #11095
 2018-03-27 22:52:29 +02:00
bergquist
f2755982c3 tech: migrates to none deprecated mail lib 
gomail is missing a maintainer so we are
switching to an active fork

ref https://github.com/go-gomail/gomail/issues/108

closes #7189
 2018-03-27 21:53:46 +02:00
bergquist
5596707531 alert: fixes broken link back to grafana 
If Grafana was configured to use a subpath it
was included twice in the link from the
alert notification back to Grafana.

closes #11403
 2018-03-27 20:26:51 +02:00
bergquist
627df67992 dashboards: reject updates of provisioned dashboards 2018-03-27 15:12:47 +02:00
Leonard Gram
a40e209a91
Merge pull request #11379 from bergquist/provisioning_override_id 
provisioning: removes id from dashboard.json
 2018-03-27 14:57:00 +02:00
bergquist
d6faa3d06f provisioning: improve UX when saving provisioned dashboards 2018-03-26 15:08:46 +02:00
bergquist
b61bc72e2a provisioning: removes id from dashboard.json 
if dashboard json files contains `id` we
will just remove it form the dashboard model
before importing it into the database.

closes #11138
 2018-03-26 13:17:39 +02:00
Julian Kornberger
391868c5d6 Use net.SplitHostPort to support IPv6 
- Add some tests
- Make error message more helpful
 2018-03-26 02:48:25 +02:00
Carl Bergquist
980e078222
Merge pull request #11326 from bergquist/more_traces 
dataproxy: adds dashboardid and panelid as tags
 2018-03-23 17:13:15 +01:00
Julian Kornberger
6f363153d7 Adjust permissions of unix socket 
fixes #8358
 2018-03-23 16:09:04 +01:00
Daniel Lee
e84f746d1d
Merge pull request #11348 from grafana/11306-sql-table-time 
Postgres, MySQL, MSSQL minor refactoring/unification
 2018-03-23 14:23:31 +01:00
Carl Bergquist
8d7fa644de
Merge pull request #11352 from digineo/golint 
Make golint happier
 2018-03-23 13:35:11 +01:00
Carl Bergquist
8db09d7556
Merge pull request #11290 from Thib17/retry 
Alerting: Add retry mechanism
 2018-03-23 13:17:24 +01:00
Carl Bergquist
f0d77804da
Merge pull request #11329 from alexanderzobnin/fix-11278 
fix dashboard version cleanup on large datasets
 2018-03-23 10:53:51 +01:00
Julian Kornberger
0a415c50d0 Make golint happier 2018-03-22 22:38:44 +01:00
Marcus Efraimsson
b818e9f619 Merge branch 'master' into 11306-sql-table-time 2018-03-22 16:45:33 +01:00
Marcus Efraimsson
f0f41c2a8e mysql: skip tests by default 2018-03-22 16:44:55 +01:00
Gerben Meijer
e722732021 Return actual user ID in UserProfileDTO 
This fixes calls to /api/user where ID is currently always 0
 2018-03-22 16:30:04 +01:00
Marcus Efraimsson
f5654f88e2 mysql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Refactored mysql implementation to make it more similar to postgres
and mssql implementations.
Added $__timeEpoch macro function with same implementation as $__time.
Added possibility to use a time column named time in addition to
the currectly supported time_sec.
Additional tests and update of existing.
Added test dashboard.
 2018-03-22 15:40:46 +01:00
Marcus Efraimsson
66c03f84f5 postgres: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running postgres on UTC and dev environment on non-utc.
Added test dashboard.
 2018-03-22 15:32:33 +01:00
Marcus Efraimsson
b69ebee066 mssql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running MSSQL on UTC and dev environment on non-utc.
Update stored procedures test to handle more parameters.
Update test dashboard.
 2018-03-22 15:23:12 +01:00
Marcus Efraimsson
b0076d4f65 mssql: remove UTC conversion in macro functions 
Removes the macro function . Macro functions should not do UTC/timezone conversion - they should
work in the same way as postgres and mysql datasource implementations.
Grafana and Microsft SQL Server should be run on servers with UTC timezones.
 2018-03-22 14:55:44 +01:00
Marcus Efraimsson
3ccadff800 mssql: fix timeGroup macro so that it properly creates correct groups 
Earlier the division of interval was done using whole numbers resulting in that important information
was lost/too many time series merged to the same group. Now using division of floating point and rounding
up to solve the problem
 2018-03-22 14:49:40 +01:00
Alexander Zobnin
0ffcea08c7 dashboard version cleanup: more tests and refactor 2018-03-22 15:18:05 +03:00
Julian Kornberger
7aab6a8887 Make golint happier 2018-03-22 12:40:21 +01:00
Thibault Chataigner
38bdb8dfb3 Alerting: move getNewState to EvalContext 
This fix alert state update when several evaluation attempts are needed

Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2018-03-21 20:59:39 +01:00
Alexander Zobnin
2ade0881b1 minor refactor of dashboard version cleanup 2018-03-21 22:48:17 +03:00
Alexander Zobnin
3f85fcce2d refactor: dashboard version cleanup 2018-03-21 21:01:15 +03:00
Alexander Zobnin
f976b690ca limit number of rows deleted by dashboard version cleanup 2018-03-21 20:26:27 +03:00
Alexander Zobnin
fc2d1d6ca9 fix dashboard version cleanup on large datasets 2018-03-21 17:23:05 +03:00
bergquist
519fd8b2ba graphite: adds more traces for alerting 2018-03-21 13:16:59 +01:00
Marcus Efraimsson
42299eb328 Merge branch 'master' into 11306-sql-table-time 2018-03-21 12:08:48 +01:00
Marcus Efraimsson
3cb0bc3da1 sql datasource: extract common logic for converting time column to epoch time in ms 2018-03-21 11:20:15 +01:00
bergquist
f142548969 dataproxy: adds dashboardid and panelid as tags 
closes #11315
 2018-03-20 22:23:28 +01:00
Thibault Chataigner
5d23e7710b Alerting: Add retry mechanism and its unitests 
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2018-03-20 21:01:56 +01:00
Daniel Lee
92388f7faf session: update defaults for ConnMaxLifetime 
to be the same as the 5.0.3 release defaults
 2018-03-20 19:31:01 +01:00
Daniel Lee
1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm 2018-03-20 19:21:58 +01:00
Daniel Lee
e5e9d3c2f3 mssql: adds test for time should be ms in table mode 2018-03-20 14:42:29 +01:00
Daniel Lee
ae4c6e4648 mssql: fix precision for time column in table mode 
ref #11306
 2018-03-20 12:59:40 +01:00
Carl Bergquist
f64c6e490a
Merge pull request #11258 from mitjaziv/hide-credentials 
add regex search/replace of username/password in urls
 2018-03-20 09:37:09 +01:00
Marcus Efraimsson
192e913b7b mssql: add integration test to verify stored procedure usage 2018-03-19 19:56:34 +01:00
Marcus Efraimsson
8f6626e805 mssql: encrypt password in database 2018-03-19 17:32:51 +01:00
Marcus Efraimsson
449a307575 mssql: remove dynamic construction of metric column and other columns 
This seems like a niche feature which can be solved by defining multiple queries. In the future
we'll probably add support for defining series name by alias field similar to how other datasources
have solved that, e.g. prometheus.
 2018-03-19 17:14:01 +01:00
Marcus Efraimsson
d14946a135 mssql: cleanup and minor refactor 2018-03-19 13:32:04 +01:00
Marcus Efraimsson
24c0f28f41 mssql: allow host without port and fallback to default port 1433 2018-03-19 13:24:31 +01:00
Marcus Efraimsson
d26d8c713e Merge branch 'master' into mssql_datasource 2018-03-16 15:19:19 +01:00
Marcus Efraimsson
e97b03e930 mssql: additional integration tests 
Metric query of table having multiple value columns
Annotation query
 2018-03-16 14:42:54 +01:00