Alexander Zobnin
7aa992bde4
initial category types
2017-04-17 18:56:39 +03:00
Alexander Zobnin
f0816b37bd
rename annotation_category to category
2017-04-17 18:53:10 +03:00
Torkel Ödegaard
60ef7d8768
Merge branch 'master' into create-annotations
2017-04-14 22:36:34 +02:00
Dan Cech
f490c5f12c
use X-Grafana-Org-Id header to ensure backend uses correct org ( #8122 )
2017-04-14 15:47:39 +02:00
Torkel Ödegaard
dbe5480edc
create annotations work
2017-04-14 11:41:02 +02:00
Torkel Ödegaard
2fce88ee62
ux: popover forms
2017-04-14 10:18:49 +02:00
Dan Cech
3a607f96a3
fix bug in log sprintf calls ( #8124 )
2017-04-14 07:45:36 +02:00
Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02:00
Alexander Zobnin
ab99a7c1c7
graph(create annotation): add initial annotation_category table
2017-04-13 16:57:22 +03:00
Torkel Ödegaard
593b2ef866
annotation: added region support to annoations
2017-04-12 16:26:34 +02:00
Torkel Ödegaard
0156a94a49
annotations: you can now read annoations via manually created annoation query
2017-04-12 15:46:41 +02:00
Torkel Ödegaard
8eb112d119
plugins: refactoring builtIn data source concept, now means data source plugins that you do not need to add via data sources page, that is automatically added as selectable data source, #8095
2017-04-12 08:23:44 +02:00
Torkel Ödegaard
e80494390a
Merge branch 'always_displayed_datasources' of https://github.com/ctide/grafana into ctide-always_displayed_datasources
2017-04-12 07:44:59 +02:00
Torkel Ödegaard
b3df1aa9bd
org: fixed issue with orgId query param redirect handling when grafana is under subpath and reverse proxy, fixes #8089
2017-04-12 07:11:08 +02:00
Mitsuhiro Tanda
d2bf2e86ed
upgrade to aws-sdk-go v1.8.11 ( #8091 )
...
* upgrade to aws-sdk-go v1.8.11
* fix test
2017-04-12 06:40:44 +02:00
Chris Burkhart
d12dc2bfa7
Add alwaysDisplayed option to datasource plugins, this will allow it to show up as an option to select when adding queries to a panel without actually adding it as a datasource.
2017-04-11 13:47:53 -07:00
Torkel Ödegaard
07466b6725
security: fixed returning info on weither user exists or not in password reset call, fixes #7619
2017-04-11 16:50:16 +02:00
Torkel Ödegaard
83e0f69cde
Merge branch 'master' of github.com:grafana/grafana
2017-04-11 14:43:40 +02:00
Torkel Ödegaard
9bdcc4ec5f
influxdb: holt winters edits
2017-04-11 14:40:08 +02:00
Daniel Lee
3ca3c96226
profiling: adds profiling and tracing
...
If grafana-server binary is started with the -profile flag then
tracing will create a trace.out file and pprof data can be accessed
on the 6060 port.
A custom port for pprof profiling can be set with the -profile-port
flag.
2017-04-11 10:32:18 +02:00
Alexander Zobnin
f42202e665
Merge branch 'master' into graph-annotations
2017-04-11 10:27:37 +03:00
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
0384eecf5c
fix: minor fix for bug when saving alert with empty message, fixes #7927
2017-04-10 15:26:05 +02:00
Alfred Krohmer
41171f8a5c
Add a link to a graph image in Pushover notifications ( #8075 )
2017-04-10 09:17:37 +02:00
Torkel Ödegaard
1cd632cc43
plugins: added state property to plugins
2017-04-07 12:00:03 +02:00
Torkel Ödegaard
26804d630f
Merge branch 'master' into sql-proxy
2017-04-07 10:34:51 +02:00
Torkel Ödegaard
f5f0d94ad4
fix: temp/testing fix for hanging issue, #8033
2017-04-06 13:18:50 +02:00
Alexander Zobnin
2b81bfe9bf
alerting: fix $timeFilter cannot be used twice ( #7969 ) ( #8037 )
2017-04-05 17:17:55 +02:00
Torkel Ödegaard
95e0010a5b
fix: sqlite3 and concurrent write requests caused database locked error some times, depending on how many concurrent requests and speed of disk drive. Fixed by reducign the number of concurrent db connections to 1 for sqlite3, fixes #7992
2017-04-03 09:42:11 +02:00
Torkel Ödegaard
5af81b974e
mysql: graph showing
2017-03-31 13:57:10 +02:00
Torkel Ödegaard
a7babfb7cf
tech: updated xorm libs
2017-03-31 12:54:39 +02:00
Torkel Ödegaard
e5a5bef200
mysql: minor update
2017-03-31 12:49:05 +02:00
Torkel Ödegaard
d6d2080f11
mysql: minor progress on response processing
2017-03-31 11:45:25 +02:00
Torkel Ödegaard
bd4f073425
mysql: minor update
2017-03-30 20:23:40 +02:00
Torkel Ödegaard
998f04e1e8
mysql: testdata
2017-03-30 20:01:04 +02:00
Torkel Ödegaard
34d92b0e79
mysql: starting work on test data
2017-03-30 18:03:50 +02:00
Torkel Ödegaard
080d2a2054
mysql: reading arbitrary SQL data in go is really strange, data is only in strings?
2017-03-30 13:46:46 +02:00
Torkel Ödegaard
00fcaaf171
mysql: commented out old code from old PR
2017-03-29 22:55:37 +02:00
Torkel Ödegaard
8f90c6115d
mysql: progress on mysql data source
2017-03-29 22:54:18 +02:00
Torkel Ödegaard
6965064ea9
Merge branch 'master' into sql-proxy
2017-03-29 16:40:14 +02:00
Seuf
319b8d8fca
Configurable signout menu activation ( #7968 )
2017-03-29 11:33:28 +02:00
Dan Cech
24d4e50343
utf8mb4 encoding ( #7959 )
...
* use utf8mb4 character set for connections to mysql
* use utf8mb4 character set for tables, shorten varchar fields used in unique indexes
* migration type to update table character set
* update table character sets
* set charset for temp_user.status
* gofmt
2017-03-28 14:34:53 +02:00
Jaroslav Hanslík
e91a078105
Slack notification should contain fallback text ( #7961 )
2017-03-28 10:05:44 +02:00
Dan Cech
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
Daniel Lee
f45d637025
auth: fix warning in test
2017-03-23 15:52:08 +01:00
Daniel Lee
beb85f413a
oauth: delete session key instead of set to empty
...
Adds the Delete function to the Session wrapper so that the Macaron
function for deleting keys from a Session can be used.
https://go-macaron.com/docs/middlewares/session#implement-provider-interface
2017-03-23 15:26:13 +01:00
Daniel Lee
79cef75fed
Merge pull request #7426 from Altoros/altoros/authorization-errors
...
Add common type for oauth authorization errors
2017-03-23 15:25:35 +01:00
gomlgs
e99137598e
Cloudwatch: Correctly obtain IAM roles within ECS container tasks. ( #7892 )
...
We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.
Fixes #6700 .
2017-03-22 07:15:19 +01:00
Daniel Lee
69bec98962
chore: update all grafana.org urls to .com
2017-03-21 15:37:55 +01:00
Torkel Ödegaard
be5c4f47a6
s3: support for alternative s3 bucket url syntax, closes #7871
2017-03-20 14:10:44 +01:00
Torkel Ödegaard
970619ed52
Merge branch 'disable-login'
2017-03-20 11:18:41 +01:00
Torkel Ödegaard
4d4e165be7
links: updated links from grafana.net to grafana.com
2017-03-20 10:20:32 +01:00
Mitsuhiro Tanda
a67497e679
add new s3 metrics ( #7846 )
2017-03-20 09:09:08 +01:00
Dan Cech
737c29ec8c
disable inviting new users to orgs if login form is disabled
2017-03-17 16:35:05 -04:00
Pandurang Waghulde
f3cce7efc9
typo fix for OpsGenie
2017-03-17 12:57:52 +05:30
Daniel Lee
9efb6e76e9
users: adds search and pagination ( #7753 )
...
ref #7469 . Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
2017-03-07 16:03:54 +01:00
Wouter Smit
125ee865b6
Spelling mistake ( #7739 )
2017-03-06 21:08:45 +01:00
Mitsuhiro Tanda
b387a8759e
use session.NewSession() ( #7745 )
2017-03-06 21:08:16 +01:00
Pranay Kanwar
6ab90425c4
Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified ( #7743 )
2017-03-06 16:19:37 +01:00
Torkel Ödegaard
c3202d3f99
sessions: start session gc at startup but only after between 10 - 180 seconds
2017-03-06 12:23:28 +01:00
Torkel Ödegaard
9f1c6a73f0
tech: added sql logger to log all sql statements sent to sql server
2017-03-06 11:51:35 +01:00
Carl Bergquist
f185c2c953
Merge pull request #7676 from dbrgn/threema-emoji
...
feat(alerting): Add emoji to Threema alert notifications
2017-03-03 11:04:49 +01:00
bergquist
412b8998a8
webhooks: get proxy settings from ini file
...
closes #7710
2017-03-02 13:57:28 +01:00
Danilo Bargen
1422655e97
feat(alerting): Add emoji to Threema alert notifications
...
This commit prepends emoji to Threema alert notifications to make it
easier to discern various notification types (e.g. alert, no data, ok).
2017-02-27 17:10:52 +01:00
bergquist
05952688c5
tech: avoid using http.DefaultClient
2017-02-24 17:22:12 +01:00
bergquist
03354bc49a
tech: replace context.TODO with background ctx
2017-02-24 09:20:28 +01:00
Carl Bergquist
5d3da99806
Merge pull request #7482 from dbrgn/master
...
Alerting: Add Threema Gateway integration
2017-02-24 07:40:36 +01:00
Carl Bergquist
bef216b6f4
Merge pull request #7526 from Mic92/master
...
Add Pushover alert notifications
2017-02-24 07:32:59 +01:00
Carl Bergquist
b4fd6f2d45
Merge pull request #7632 from grafana/alerting_notification_dedupe
...
alerting: dedupe alert notifications when running multiple servers
2017-02-22 10:48:41 +01:00
bergquist
00dddca26a
alerting: dedupe alert notifications when running multiple servers
...
alert notifications will only be sent if the database value
is updated.
ref #6957
2017-02-21 16:54:49 +01:00
Daniel Lee
96a3ed0ac3
docs: new /api/users/search route
...
ref #7469 . Description of new route that
adds paging for the users list.
2017-02-21 16:09:15 +01:00
bergquist
70b36a02af
Revert "tech: use context package over xperimental version"
...
This reverts commit 99f1c30071
2017-02-20 22:04:51 +01:00
bergquist
99f1c30071
tech: use context package over xperimental version
2017-02-20 21:44:15 +01:00
bergquist
072c1559ba
middlware: prevent orgredirect to open body stream
...
the org redirecter opened the body stream by misstake. Causing
downstream code to start reading from an empty stream and raise errors.
2017-02-20 11:38:29 +01:00
bergquist
6115941df0
middleware: rename org-id -> orgId
2017-02-17 15:18:40 +01:00
bergquist
5174d050f2
middlware: change org when url contains orgid
...
closes #6948
ref #1613
2017-02-17 15:02:14 +01:00
bergquist
12f1ea71fd
chore: delete empty test
2017-02-17 12:07:46 +01:00
bergquist
cf871b1284
http: close http server gracefully.
2017-02-17 10:33:47 +01:00
bergquist
52566376b2
tech(server): remove unused code
2017-02-17 10:18:11 +01:00
Roman Vynar
4fcd5eab29
Add advanced TLS settings to harden setup. ( #7347 )
...
* Hardcoded the most secured TLS options.
2017-02-15 14:29:20 +01:00
Torkel Ödegaard
902cf5f889
fix(): google analytics fix
2017-02-15 14:26:57 +01:00
bergquist
bd010289b2
alerting: images in alert notifications is now optional
...
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.
closes #7419
2017-02-15 14:17:36 +01:00
bergquist
f14e25612e
annotations: go vet fixes
2017-02-15 14:15:42 +01:00
Daniel Lee
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
Daniel Lee
5fca4c7304
Merge pull request #7569 from jacobbednarz/add-sender-name-to-email
...
Updates mailer to include `from_name` value
2017-02-15 10:32:06 +01:00
Jan Garaj
79cd48f64c
Cloudwatch AWS/SES metrics ( #7568 )
2017-02-15 08:12:24 +01:00
Jacob Bednarz
796957c8c6
Update mailer tests to include FromName
2017-02-15 08:04:21 +11:00
Jacob Bednarz
66445faeb5
Format mailer From field to include name
...
Updates the messafe `From` field to include the name and email of the
sender.
2017-02-15 07:51:41 +11:00
Jacob Bednarz
90cbfacacf
Add FromName to SmtpSettings struct
...
Updates the `SmtpSettings` struct to include a value for setting the
name of the email sender.
2017-02-15 07:45:28 +11:00
Jacob Bednarz
7dc6b69c8b
s/smpt/SMTP
2017-02-15 07:43:59 +11:00
Jacob Bednarz
c9d4654592
s/from_adress/from_address
2017-02-15 07:43:16 +11:00
Daniel Lee
193d468ed3
admin: adds paging to global user list
...
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.
Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.
Fixes #7469
2017-02-13 12:59:36 +01:00
Jörg Thalheim
f069aae576
Add Pushover alert notifications
...
Pushover is a service for getting real-time
notifications on your mobile devices and desktop
computers: https://pushover.net
2017-02-10 22:44:33 +01:00
Carl Bergquist
7f4f38e773
Merge pull request #7519 from huydx/master
...
(feat) support datasource delete by name api
2017-02-10 15:53:34 +01:00
huydx
143cbe921f
(feat) support datasource delete by name api
2017-02-10 23:30:14 +09:00
huydx
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
Carl Bergquist
73d441450b
Merge pull request #7516 from grafana/oauth-login-redirect
...
redirect user to requested url after login via oauth
2017-02-10 08:27:41 +01:00
bergquist
5dd961c0f5
settings: remove commented code
2017-02-10 07:39:26 +01:00
Dan Cech
b22881c717
redirect user to requested url after login via oauth
2017-02-09 14:01:53 -05:00
bergquist
c7febca447
mqe: fixes broken test for indexalias
2017-02-09 16:43:57 +01:00
