Marcus Efraimsson
369597f7b2
dashboards: return url in response to save dashboard. #7883
2018-01-31 00:09:14 +01:00
Daniel Lee
eb765d288c
alertlist: disable pause button when user does not have permission
2018-01-30 23:35:27 +01:00
Marcus Efraimsson
fd59241e35
dashboards: revert adding api for retrieving uid by slug
...
Since we're already have possibility to get a dashboard by slug
it makes little sense to have a separate endpoint in api for
retrieving uid by slug.
#7883
2018-01-30 23:18:34 +01:00
Marcus Efraimsson
9fb7b887db
dashboards: add url property to dashboard meta and search api responses
...
#7883
2018-01-30 23:18:34 +01:00
Marcus Efraimsson
7ee691dc48
dashboards: api for retrieving uid by slug. #7883
2018-01-30 23:18:34 +01:00
Marcus Efraimsson
13d5db7d19
dashboards: add support for retrieving a dashboard by uid
...
Introduces new url in api /dashboards/<uid> for fetching dashboard by unique id
Leave the old dashboard by slug url /dashboards/db/<slug> for backward
compatibility and for supporting fallback
WIP for #7883
2018-01-30 23:18:34 +01:00
Marcus Efraimsson
46e1296700
dashboards: return uid in response to creating/updating a dashboard. #7883
2018-01-30 23:18:34 +01:00
Daniel Lee
f5107d5023
alerting: add permission check in api for pausing alerts
2018-01-30 14:41:25 +01:00
Daniel Lee
87d6d791d5
dashfolders: adds comment for dashboard api tests
2018-01-30 14:09:30 +01:00
Daniel Lee
2b7984355a
dashfolders: adds comment for dashboard acl test
2018-01-30 13:28:00 +01:00
Daniel Lee
a00a42d9ee
api: extract api test code to common_test.go
2018-01-30 13:17:48 +01:00
Marcus Efraimsson
f08932b78a
WIP: folder api. #10630
2018-01-30 10:53:28 +01:00
Daniel Lee
0fb05bcf59
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-30 09:26:23 +01:00
Daniel Lee
d74a98feff
dashfolders: link to folder for inherited permissions
...
In the permissions view in dashboard settings, this adds a
link to the parent folder for inherited permissions. Which
allows the user to easily navigate to the folder and change
inherited permissions.
2018-01-29 16:10:47 +01:00
Marcus Efraimsson
3d1c624c12
WIP: Protect against brute force (frequent) login attempts ( #10031 )
...
* db: add login attempt migrations
* db: add possibility to create login attempts
* db: add possibility to retrieve login attempt count per username
* auth: validation and update of login attempts for invalid credentials
If login attempt count for user authenticating is 5 or more the last 5 minutes
we temporarily block the user access to login
* db: add possibility to delete expired login attempts
* cleanup: Delete login attempts older than 10 minutes
The cleanup job are running continuously and triggering each 10 minute
* fix typo: rename consequent to consequent
* auth: enable login attempt validation for ldap logins
* auth: disable login attempts validation by configuration
Setting is named DisableLoginAttemptsValidation and is false by default
Config disable_login_attempts_validation is placed under security section
#7616
* auth: don't run cleanup of login attempts if feature is disabled
#7616
* auth: rename settings.go to ldap_settings.go
* auth: refactor AuthenticateUser
Extract grafana login, ldap login and login attemp validation together
with their tests to separate files.
Enables testing of many more aspects when authenticating a user.
#7616
* auth: rename login attempt validation to brute force login protection
Setting DisableLoginAttemptsValidation => DisableBruteForceLoginProtection
Configuration disable_login_attempts_validation => disable_brute_force_login_protection
#7616
2018-01-26 10:41:41 +01:00
Daniel Lee
bc5fae5367
dashfolders: merge conflict
2018-01-25 14:54:50 +01:00
bergquist
67a9e6a71d
provisioing: add lookup table provisioned dashboards
2018-01-23 21:52:55 +01:00
Torkel Ödegaard
dbfaf5dac8
refactor: minor refactoring of PR #10560
2018-01-23 13:03:44 +01:00
Torkel Ödegaard
a24aa3ae28
Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana
2018-01-23 12:44:27 +01:00
Carl Bergquist
184e7046df
Merge pull request #10059 from FunkyM/local-image-store
...
Add support for internal image store
2018-01-22 11:03:00 +01:00
Daniel Lee
94a54248c1
dashfolders: show folders use can save to in picker
...
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
2018-01-20 01:58:28 +01:00
Dan Cech
04e17c145f
support for decoding JWT id tokens
2018-01-18 18:25:58 -05:00
Torkel Ödegaard
2d192f6cc8
Merge branch 'dashboard_permissions' of github.com:grafana/grafana into dashboard_permissions
2018-01-18 18:24:17 +01:00
Torkel Ödegaard
cfa775e012
ds: updated ds nav
2018-01-18 18:17:58 +01:00
Daniel Lee
f64637c2c5
dashfolders: stop user locking themselves out of a folder
2018-01-18 14:30:04 +01:00
bergquist
5eb36e65f2
use context over golang.org/x/net/context
2018-01-16 12:32:58 +01:00
Daniel Lee
a5830c6dbc
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-16 12:02:13 +01:00
m-pavel
dff66559e4
Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded ( #10512 )
2018-01-15 08:49:30 +01:00
Martin Szulecki
c82e23d96e
imguploader: Add support for new internal image store ( #6922 )
2018-01-12 21:40:12 +01:00
Daniel Lee
545d7b9477
dashfolders: convert folder settings to React
2018-01-11 15:42:45 +01:00
Daniel Lee
c27a74bb6b
dashfolders: check permissions for new dashboard
...
ref #10275 . Use the parent folder permissions if new dashboard and
it does not have an id yet.
2018-01-09 14:44:36 +01:00
Daniel Lee
ae69c96518
dashfolders: allow any signed in user to get list of teams
2018-01-09 14:44:36 +01:00
Daniel Lee
b7f023bc26
fix gofmt warning
2018-01-09 14:44:36 +01:00
Daniel Lee
3ae1bf0c16
dashfolders: permissions for saving annotations
...
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
2018-01-09 14:44:36 +01:00
Daniel Lee
61ed0b0381
dashfolders: remove role requirements on dashboard routes
...
and rely on the permission system instead.
2018-01-09 14:44:36 +01:00
Alexander Zobnin
a4972f44ad
fix missing profile icon ( #10469 )
2018-01-09 13:58:03 +01:00
Torkel Ödegaard
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
Torkel Ödegaard
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
bergquist
8a5fe5b0df
renderer: avoid calling Handle twice
2017-12-28 14:37:10 +01:00
Marcus Efraimsson
af34f9977e
Add avatar to team and team members page ( #10305 )
...
* teams: add db migration for email column in teams table
* teams: /teams should render index page with a 200 OK
* teams: additional backend functionality for team and team members
Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.
* teams: display team avatar and team member avatars
Possibility to save and update email for a team
* teams: create team on separate page instead of modal dialog
2017-12-20 21:20:12 +01:00
Torkel Ödegaard
36fe8f5873
menu: fixed create default url
2017-12-15 15:17:05 +01:00
Torkel Ödegaard
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
Torkel Ödegaard
2797e8e2d0
profile: use name or fallback for profile page
2017-12-15 13:06:11 +01:00
Torkel Ödegaard
fdf4bad1b7
fix: sidemenu profile main text is now username instead of name
2017-12-15 13:03:07 +01:00
Torkel Ödegaard
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
Torkel Ödegaard
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
Robin Gustafsson
cf7a49977f
proxyds: delete cookies except those listed in keepCookies
2017-12-14 11:46:44 +01:00
Daniel Lee
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
Marcus Efraimsson
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
Daniel Lee
f1b1dbc6dd
dashboard: fix test after merge conflict
2017-12-14 09:34:00 +01:00
Trent White
e2bbb85daa
new icons created and added to nav
2017-12-13 17:48:44 -05:00
Torkel Ödegaard
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
Torkel Ödegaard
7f0440fded
minor tweaks
2017-12-13 18:00:16 +01:00
Torkel Ödegaard
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
Torkel Ödegaard
22aa1f7e42
ux: change members to users
2017-12-13 11:21:33 +01:00
Torkel Ödegaard
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
Torkel Ödegaard
89db9cc976
fix: fixed dashboard api tests
2017-12-12 16:15:24 +01:00
Torkel Ödegaard
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
bergquist
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
Alexander Zobnin
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
Carl Bergquist
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +01:00
jomenxiao
ad2a69bff4
add encoding param
2017-12-11 16:01:17 +08:00
bergquist
f7ed24475c
wait for all sub routines to finish
...
simple solution for waiting for all go sub routines to
finish before closing Grafana. We would use errGroup
here as well but I dont like spreading context's all
over the place.
closes #10131
2017-12-11 08:53:06 +01:00
Alexander Zobnin
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
Marcus Efraimsson
b03b360414
dashfolders: Create nav model for folder page client side #10083
2017-12-08 14:08:16 +01:00
Marcus Efraimsson
017b337f00
dashfolders: create folder page
...
Fixes #10085
2017-12-07 19:32:38 +01:00
Marcus Efraimsson
2ea663df78
dashfolders: New Dashboard Folder page
...
Fixes #10083 . Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00
bergquist
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
bergquist
f5eac2e91d
dashboards as cfg: expose dashboard service as interface
2017-12-07 15:27:01 +01:00
bergquist
16f072b320
dashboards as cfg: move saving logic for dashboards into its own service
2017-12-07 15:27:01 +01:00
bergquist
9cebb23e01
dashboards as cfg: revert minor changes
2017-12-07 15:27:01 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Torkel Ödegaard
90bcec8178
nav: updated nav item id for manage dashboards
2017-12-05 12:25:59 +01:00
Torkel Ödegaard
90da964a14
refactoring PR #10068
2017-12-05 12:19:01 +01:00
Alexander Zobnin
4d7ff4de15
move import menu item to the original place
2017-12-04 18:00:22 +03:00
Alexander Zobnin
44ea0ff71d
Move import dashboard from modal to the page
2017-12-04 15:55:37 +03:00
bergquist
d6d64c53cd
typo 💥
2017-12-01 16:23:55 +01:00
Torkel Ödegaard
68580f06a3
page header now on 99% of pages
2017-12-01 13:49:15 +01:00
Torkel Ödegaard
6bff416430
navigation: more progress on new page header
2017-12-01 12:51:46 +01:00
Torkel Ödegaard
75bb894485
ux: new page-header design, most pages beside admin done
2017-12-01 11:32:00 +01:00
Torkel Ödegaard
e53b55479a
ux: made plugins page work
2017-12-01 10:47:21 +01:00
Torkel Ödegaard
6f5a9bf768
ux: new page header progress
2017-11-30 17:28:24 +01:00
Torkel Ödegaard
b2add1977a
ux: progress on new page header
2017-11-30 16:35:27 +01:00
Torkel Ödegaard
74ceb76ec0
ux: work on page header
2017-11-30 15:37:03 +01:00
Torkel Ödegaard
645f49eda4
ux: updating header design for pages
2017-11-30 11:31:38 +01:00
jomenxiao
3f95180c98
fix render http[get] params error
2017-11-28 22:20:22 +08:00
Torkel Ödegaard
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
bergquist
3a772c7f7f
allows head requests for /api/health endpoint
...
closes #9955
2017-11-21 15:03:04 +01:00
Torkel Ödegaard
0d12b37dfd
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
2017-11-21 11:28:17 +01:00
Torkel Ödegaard
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Torkel Ödegaard
303e3de488
fix: fix for avatar images when gzip is turned on, fixes #5952
2017-11-17 13:13:58 +01:00
bergquist
0f69e06fcf
removes invalid comment
2017-11-16 16:55:02 +01:00
Marcus Efraimsson
909601d6ab
api: fix so that datasources functions returns Response
2017-11-16 16:29:05 +01:00
Marcus Efraimsson
89b27b35ba
fix: Use Response as return type
2017-11-16 16:19:01 +01:00
Marcus Efraimsson
540d540ea9
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
...
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
2017-11-16 16:19:01 +01:00
bergquist
36676e23c1
datasource as cfg: adds readonly datasources
2017-11-15 14:30:32 +01:00
Daniel Lee
0d85c63fff
middleware: recovery handles panics in all handlers
...
Also, changes the order of the middleware so that recovery is after the
gzip middleware. Otherwise, a 200 OK is returned instead of a 500 error.
2017-11-15 13:57:33 +01:00
Torkel Ödegaard
97cc454ded
ux: minor changes
2017-11-01 14:23:46 +01:00
Torkel Ödegaard
84b10df887
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-31 16:14:40 +01:00
Daniel Lee
752453f204
dashboards: fix link to bulk edit
2017-10-29 20:20:51 +01:00
Torkel Ödegaard
cae852a1a2
updated icons
2017-10-27 08:33:04 +02:00
Torkel Ödegaard
9605ab4475
Merge branch 'master' into develop
2017-10-26 15:59:50 +02:00
Daniel Lee
7f3293ce80
dashfolders: rough draft of bulk edit
2017-10-25 16:12:03 +02:00
Carl Bergquist
c91a1e994b
Merge pull request #9594 from bergquist/datasources_optimistic_concurrency
...
datasources: change to optimistic concurrency
2017-10-25 12:44:36 +02:00
bergquist
d68bfaa8be
datasource as cfg: typo
2017-10-25 12:21:06 +02:00
Torkel Ödegaard
a299118c92
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-24 20:29:53 +02:00
Daniel Lee
f70fb7dbf3
dashboard: fix home dashboard getting started panel
2017-10-24 19:22:56 +02:00
bergquist
9b6535cca1
alerting: only editors can pause rules
...
closes #9640
2017-10-24 11:01:08 +02:00
Torkel Ödegaard
b44daaabf2
Merge branch 'master' into develop
2017-10-24 09:06:09 +02:00
Torkel Ödegaard
9cce5217d0
build: fixed gofmt issue and addd mock response feature
2017-10-23 09:57:28 +02:00
bergquist
139f077453
prometheus: enable gzip for /metrics endpoint
...
closes #9464
2017-10-23 09:35:46 +02:00
Torkel Ödegaard
1fd2270a93
build: split circle test shell scripts
2017-10-23 09:06:50 +02:00
bergquist
89923bf77a
datasources: change to optimisic concurrency
...
prerequisite for #9504
2017-10-23 07:55:16 +02:00
Torkel Ödegaard
fff0fa2aee
Merge branch 'master' into develop
2017-10-22 11:51:14 +02:00
ryan
fb9c714a9a
run go fmt
2017-10-18 23:49:33 +02:00
ryan
4440133f4d
Add a setting to allow DB queries
2017-10-18 23:33:10 +02:00
Alexander Zobnin
74e90d01ec
Fixes for annotations API ( #9577 )
...
* annotations: throw error if no text specified and set default time to Now() if empty, #9571
* annotations: fix saving graphite event with empty string tags
* docs: add /api/annotations/graphite endpoint docs, #9571
2017-10-18 10:13:02 +02:00
Torkel Ödegaard
6f71af449b
ux: new fixes
2017-10-18 09:48:37 +02:00
Daniel Lee
5f6ab1e370
styleguide: fix link in index
2017-10-16 14:11:52 +02:00
Daniel Lee
b866383ec0
api: fix for dashboard version history
2017-10-16 14:09:52 +02:00
Torkel Ödegaard
a3bd761b0c
ux: testing out new icons
2017-10-14 21:17:16 +02:00
Torkel Ödegaard
48c8e4d627
fix: various fixes for new grid
2017-10-12 17:38:49 +02:00
Torkel Ödegaard
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
bergquist
b5727949fd
logging: dont use cli logger in http_server
2017-10-12 15:29:01 +02:00
bergquist
88f55b01d8
oauth: raise error if session state is missing
...
ref #9476
2017-10-12 15:25:27 +02:00
bergquist
0848ba2e9c
oauth: provide more logging for failed oauth requests
2017-10-12 15:25:27 +02:00
Carl Bergquist
ee5f69beb4
metrics: disable gzip for /metrics endpoint ( #9468 )
...
Prometheus client lib support gzip by itself. Which caused the
response to be double gzipped sometimes. We should use the Grafana
middle ware instead.
closes #9464
2017-10-12 12:02:36 +02:00
Carl Bergquist
9d53653647
Merge pull request #9378 from mattbostock/verify_tls
...
Bugfix: Always verify TLS unless explicitly told otherwise
2017-10-12 11:11:02 +02:00
bergquist
4ca3cc90dd
Merge branch 'mattbostock-verify_datasource_tls'
2017-10-12 10:39:07 +02:00
bergquist
c0d257a0ee
Merge branch 'verify_datasource_tls' of https://github.com/mattbostock/grafana into mattbostock-verify_datasource_tls
2017-10-12 10:15:32 +02:00
Alexander Zobnin
04ea7efac9
annotations: add endpoint for writing graphite-like events ( #9495 )
...
* annotations: add endpoint for writing graphite-like events
* annotations: fix new line handling in tooltip
* annotations: support tags in prior to Graphite 0.10.0 format
2017-10-12 10:12:15 +02:00
Torkel Ödegaard
3a089dd04c
newgrid: various fixes
2017-10-11 21:36:03 +02:00
Matt Bostock
a286ffa5f2
Alias macron package in app_routes.go
...
...to make this file compatible with goimports:
https://godoc.org/golang.org/x/tools/cmd/goimports
2017-10-11 08:18:03 +01:00
Torkel Ödegaard
df61558018
grid: fixed geting started panel pos
2017-10-10 19:48:06 +02:00
Torkel Ödegaard
647a3cc5ae
Merge branch 'master' into develop
2017-10-09 16:01:54 +02:00
Daniel Lee
8423260f58
gzip: plugin readme content set explicitly
...
Macaron's gzip middleware tries to automatically figure out the content
type for a file when gzipped and seems to mostly fail with plugin
readmes. This change sets the content type to plain text.
Fixes #9344 . Ref #5952 .
2017-10-09 10:17:45 +02:00
Torkel Ödegaard
25aa9df270
Create annotations ( #8197 )
...
* annotations: add 25px space for events section
* annotations: restored create annotation action
* annotations: able to use fa icons as event markers
* annotations: initial emoji support from twemoji lib
* annotations: adjust fa icon position
* annotations: initial emoji picker
* annotation: include user info into annotation requests
* annotation: add icon info
* annotation: display user info in tooltip
* annotation: fix region saving
* annotation: initial region markers
* annotation: fix region clearing (add flot-temp-elem class)
* annotation: adjust styles a bit
* annotations: minor fixes
* annoations: removed userId look in loop, need a sql join or a user cache for this
* annotation: fix invisible events
* lib: changed twitter emoij lib to be npm dependency
* annotation: add icon picker to Add Annotation dialog
* annotation: save icon to annotation table
* annotation: able to set custom icon for annotation added by user
* annotations: fix emoji after library upgrade (switch to 72px)
* emoji: temporary remove bad code points
* annotations: improve icon picker
* annotations: icon show icon picker at the top
* annotations: use svg for emoji
* annotations: fix region drawing when add annotation editor opened
* annotations: use flot lib for drawing region fill
* annotations: move regions building into event_manager
* annotations: don't draw additional space if no events are got
* annotations: deduplicate events
* annotations: properly render cut regions
* annotations: fix cut region building
* annotations: refactor
* annotations: adjust event section size
* add-annotations: fix undefined default icon
* create-annotations: edit event (frontend part)
* fixed bug causes error when hover event marker
* create-annotations: update event (backend)
* ignore grafana-server debug binary in git (created VS Code)
* create-annotations: use PUT request for updating annotation.
* create-annotations: fixed time format when editing existing event
* create-annotations: support for region update
* create-annotations: fix bug with limit and event type
* create-annotations: delete annotation
* create-annotations: show only selected icon in edit mode
* create-annotations: show event editor only for users with at least Editor role
* create-annotations: handle double-sized emoji codepoints
* create-annotations: refactor
use CP_SEPARATOR from emojiDef
* create-annotations: update emoji list, add categories.
* create-annotations: copy SVG emoji into public/vendor/npm and use it as a base path
* create-annotations: initial tabs for emoji picker
* emoji-picker: adjust styles
* emoji-picker: minor refactor
* emoji-picker: refactor - rename and move into one directory
* emoji-picker: build emoji elements on app load, not on picker open
* emoji-picker: fix emoji searching
* emoji-picker: refactor
* emoji-picker: capitalize category name
* emoji-picker: refactor
move buildEmojiElem() into emoji_converter.ts for future reuse.
* jquery.flot.events: refactor
use buildEmojiElem() for making emojis, remove unused code for font awesome based icons.
* emoji_converter: handle converting error
* tech: updated
* merged with master
* shore: clean up some stuff
* annotation: wip tags
* annotation: filtering by tags
* tags: parse out spaces etc. from a tags string
* annotations: use tagsinput component for tag filtering
* annotation: wip work on how we query alert & panel annotations
* annotations: support for updating tags in an annotation
* linting
* annotations: work on unifying how alert history annotations and manual panel annotations are created
* tslint: fixes
* tags: create tag on blur as well
Currently, the tags directive only creates the tag when the
user presses enter. This change means the tag is created on
blur as well (when the user clicks outside the input field).
* annotations: fix update after refactoring
* annotations: progress on how alert annotations are fetched
* annotations: minor progress
* annotations: progress
* annotation: minor progress
* annotations: move tag parsing from tooltip to ds
Instead of parsing a tag string into an array in the annotation_tooltip
class, this moves the parsing to the datasources. InfluxDB ds already
does that parsing. Graphite now has it.
* annotations: more work on querying
* annotations: change from tags as string to array
when saving in the db and in the api.
* annotations: delete tag link if removed on edit
* annotation: more work on depricating annotation title
* annotations: delete tag links on delete
* annotations: fix for find
* annotation: added user to annotation tooltip and added alertName to annoation dto
* annotations: use id from route instead from cmd for updating
* annotations: http api docs
* create annotation: last edits
* annotations: minor fix for querying annotations before dashboard saved
* annotations: fix for popover placement when legend is on the side (and doubel render pass is causing original marker to be removed)
* annotations: changing how the built in query gets added
* annotation: added time to header in edit mode
* tests: fixed jshint built issue
2017-10-07 10:31:39 +02:00
Matt Bostock
83f1ae4e3e
OAuth: Rename sslcli
...
Rename `sslcli` to the more descriptive `oauthClient`.
2017-10-06 17:10:03 +01:00
Matt Bostock
ccf093da81
OAuth: Separate TLS client auth and CA config
...
It should be specify to either use TLS client authentication or use a
user-supplied CA; previously you had to enable client authentication to
use a custom CA.
2017-10-06 17:10:03 +01:00
Matt Bostock
f2f8ca52d9
OAuth: Check both TLS client cert and key
...
If either is set, try to use them.
This should help avoid a situation where someone has half-configured TLS
client authentication and it doesn't work without raising an obvious
error.
2017-10-06 17:10:03 +01:00
Matt Bostock
16c5d0e4b7
Always verify TLS unless explicitly told otherwise
...
TLS was not being verified in a number of places:
- connections to grafana.com
- connections to OAuth providers when TLS client authentication was
enabled
- connections to self-hosted Grafana installations when using the CLI
tool
TLS should always be verified unless the user explicitly enables an
option to skip verification.
Removes some instances where `InsecureSkipVerify` is explicitly set to
`false`, the default, to help avoid confusion and make it more difficult
to regress on this fix by accident.
Adds a `--insecure` flag to `grafana-cli` to skip TLS verification.
Adds a `tls_skip_verify_insecure` setting for OAuth.
Adds a `app_tls_skip_verify_insecure` setting under a new `[plugins]`
section.
I'm not super happy with the way the global setting is used by
`pkg/api/app_routes.go` but that seems to be the existing pattern used.
2017-10-06 17:09:27 +01:00
Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Mitsuhiro Tanda
fe9fca381c
move cloudwatch crendential related code
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
4f5f38f41b
remove old handler
2017-09-29 13:45:11 +09:00
Mitsuhiro Tanda
1dcc51adce
re-implement dimension_values()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
78e3556e95
remove performEC2DescribeInstances()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
f66e1c02a6
remove obsolete GetMetricStatistics()
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
f590db1b78
move test code
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
feed90c0e2
re-implement get regions
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
0c95148486
move the metric find query code
2017-09-29 13:44:01 +09:00
Mitsuhiro Tanda
d31f264576
cache creds for keys/credentials auth type
2017-09-29 13:44:00 +09:00
Mitsuhiro Tanda
39607d09d7
(cloudwatch) alerting
2017-09-29 13:44:00 +09:00
Carl Bergquist
e9e8ffc769
Merge pull request #9367 from bobrik/dualstack
...
Enable dualstack in every net.Dialer, fixes #9364
2017-09-28 11:15:49 +02:00
Torkel Ödegaard
5849fbf04e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-09-28 10:37:57 +02:00
Ivan Babrou
9a4ae30227
Enable dualstack in every net.Dialer, fixes #9364
...
Default transport enables it:
* https://github.com/golang/go/blob/d2826d3e06/src/net/http/transport.go#L42-L46
```
DialContext: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
}).DialContext,
```
See also: https://github.com/golang/go/issues/15324
2017-09-27 22:29:48 -07:00
bergquist
8175783f93
go fmt
2017-09-24 18:59:21 +02:00
bergquist
c927209447
Merge branch 'master' of https://github.com/BrandonArp/grafana into BrandonArp-master
2017-09-24 18:56:46 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
bergquist
ed661767f8
follow go idiom and return error as second param
2017-09-21 18:04:16 +02:00
bergquist
0229d28d64
remove unused structs
2017-09-21 15:02:17 +02:00
Carl Bergquist
0db678e18f
Merge pull request #9213 from grafana/dist_tracing
...
Add support for distributed tracing with Jaeger
2017-09-21 10:42:25 +02:00
bergquist
4326790bb4
bug: enable HEAD requests again
...
ref #9307
2017-09-20 09:45:00 +02:00
Will Sewell
4a6da233d9
Add DbClusterIdentifier to CloudWatch dimensions ( #9297 )
...
Unfortunately CloudWatch dimensions are case-sensitive and it uses both `DBClusterIdentifier` and `DbClusterIdentifier` (notice the lower case `b`) depending on the metric. All metrics which also have the `Role` dimension appear to use `DBClusterIdentifier`, whereas metric with the `EngineName` dimension use `DbClusterIdentifier`.
2017-09-20 08:31:54 +02:00
Torkel Ödegaard
41e01184aa
Merge branch 'master' into develop
2017-09-18 12:32:29 +02:00
bergquist
e3211f6e48
use route as span name
2017-09-18 11:08:58 +02:00
bergquist
ee2e4c6567
add trace headers for outgoing requests
2017-09-18 11:08:58 +02:00
bergquist
3c8133aa4b
add traces for datasource reverse proxy requests
2017-09-18 11:08:58 +02:00
bergquist
2e350bbb8e
adds basic traces using open traces
2017-09-18 11:08:58 +02:00
Torkel Ödegaard
24d69ca205
fix: jsonData should not be allowed to be null, fixes #9258
2017-09-18 09:38:02 +02:00
bergquist
314bff1b78
adds grafana_ prefix for none standard metrics
2017-09-14 14:26:32 +02:00
bergquist
9c30bf53cf
introduce concept of named middleware
2017-09-14 14:26:32 +02:00
bergquist
4bc6ecb241
adds metric middlware to route register
2017-09-14 14:26:32 +02:00
bergquist
6372e22180
migrate handlers to new register
2017-09-14 14:26:32 +02:00
bergquist
f842265388
add custom route register
2017-09-14 14:26:32 +02:00
bergquist
bf138d1845
adds small docs page metrics
2017-09-14 14:26:32 +02:00
bergquist
6d22a67a30
return /metrics before session middleware
2017-09-14 14:26:32 +02:00
bergquist
2de94d6548
convert old metrics to prom metrics
2017-09-14 14:26:32 +02:00
bergquist
788f677ed7
remove old internal metrics lib
2017-09-14 14:26:32 +02:00
bergquist
d6b8c6a2d2
add graphite bridge that support delta counters
2017-09-14 14:26:32 +02:00
Brandon Arp
cffbcb504d
allow ssl renegotiation for datasources
2017-09-13 16:20:24 -07:00
Torkel Ödegaard
a9e3130ef6
Merge branch 'master' into develop
2017-09-13 16:06:34 +02:00
Torkel Ödegaard
6e344f6eea
api: tsdb api orgId fix
2017-09-12 08:01:34 +02:00
Mitsuhiro Tanda
e13575eaef
add AWS/NATGateway metrics ( #9202 )
2017-09-08 09:04:15 +02:00
Torkel Ödegaard
a38ded9e7e
Merge branch 'master' into develop-newgrid-row-design2
2017-09-07 15:05:41 +02:00
wangguoliang
652fce7e76
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com>
2017-09-07 17:50:11 +08:00
Torkel Ödegaard
2fc67da69a
Merge branch 'metrics-tab-v3'
2017-09-04 13:27:44 +02:00
Marcel Anacker
40c008f870
Cloudwatch Datasource: changed namespace of Web Application Firewall ( #9128 )
2017-09-01 10:43:23 +02:00
Nevins
66441650cd
changing ordering so AWS API is only called if cache has expired ( #9136 )
2017-09-01 07:24:05 +02:00
Torkel Ödegaard
84d4958a3c
plugin change: make interval, cache timeout & max data points options in plugin.json, remove query.options component feature, add help markdown feature and toggle for data sources
2017-08-31 14:05:52 +02:00
Torkel Ödegaard
4819e50441
newgrid: fixes to default home dashboard
2017-08-25 14:47:57 +02:00
Torkel Ödegaard
71c22fdbff
dataproxy: removed some logging, closes #9078
2017-08-24 11:18:06 +02:00
Torkel Ödegaard
71c9582944
data source with token auth is starting to work, #9078
2017-08-24 11:07:37 +02:00
Torkel Ödegaard
3c9798bec9
datasource-proxy: token exchange
2017-08-23 17:18:43 +02:00
Torkel Ödegaard
4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
Torkel Ödegaard
8bf49c51b9
dataproxy: refactoring data source proxy to support route templates and wrote more tests for data proxy code, #9078
2017-08-23 10:52:31 +02:00
Torkel Ödegaard
63d6ab476a
feat: data source proxy refactoring and route handling, #9078
2017-08-22 17:14:15 +02:00
Daniel Lee
5c2958023d
Merge branch 'v4.4.x'
2017-08-21 13:45:04 +02:00
Torkel Ödegaard
e3bd51e38d
fix: remove duplicate set-cookie when logging in, fixes #9013
2017-08-21 11:10:59 +02:00
Torkel Ödegaard
23b0795dcc
ux: minor button changes
2017-08-21 11:08:58 +02:00
Torkel Ödegaard
21a7f57248
ux: changed cta button style
2017-08-20 21:16:40 +02:00
Torkel Ödegaard
011c582ebb
minor user avatar stuff
2017-08-18 14:49:04 +02:00
Torkel Ödegaard
bb7b55277c
users view update
2017-08-18 08:17:35 +02:00
Torkel Ödegaard
a4da0adf38
ux: switching orgs now works through modal
2017-08-16 15:37:13 +02:00
Torkel Ödegaard
95f5c84a57
ux: making org visibile in profile view
2017-08-16 15:03:49 +02:00
Torkel Ödegaard
7f0f0eb617
ux: more nav work
2017-08-16 11:28:52 +02:00
Torkel Ödegaard
5405736321
ux: nav fixes & polish
2017-08-15 23:17:34 +02:00
Torkel Ödegaard
0bc226d760
ux: more nav work
2017-08-15 20:24:16 +02:00
Torkel Ödegaard
1eab771231
ux: navigation work
2017-08-15 17:52:52 +02:00
Torkel Ödegaard
63424f9866
ux: more work on sidemenu
2017-08-15 14:49:12 +02:00
Torkel Ödegaard
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
Daniel Lee
649fe7e462
Merge branch 'v4.4.x'
2017-08-07 10:47:23 +02:00
Daniel Lee
1e5778174c
login: regenerates session id on login
2017-08-07 10:00:29 +02:00
Torkel Ödegaard
c7ca4830a8
Merge branch 'v4.4.x'
2017-08-03 08:56:46 +02:00
Torkel Ödegaard
1372d2e517
fix: update user permissions validation was not working properly, fixes #8977
2017-08-03 08:56:34 +02:00
Torkel Ödegaard
8d7186d40d
Merge branch 'v4.4.x'
2017-08-02 17:33:19 +02:00
Torkel Ödegaard
3dc9d76b38
fix: viewer role fix, fixes #8976
2017-08-02 17:33:06 +02:00
Torkel Ödegaard
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
Torkel Ödegaard
c7c5730c40
Merge branch 'v4.4.x'
2017-07-31 16:04:31 +02:00
Torkel Ödegaard
34cda65998
fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710
2017-07-31 16:04:04 +02:00
Torkel Ödegaard
61d8eb1fac
Merge branch 'v4.4.x'
2017-07-31 15:07:22 +02:00
Torkel Ödegaard
73563d087c
feat: more work on #8768
2017-07-31 14:39:33 +02:00
Mitsuhiro Tanda
b16b649c9b
(cloudwatch) add new elb metrics ( #8894 )
2017-07-20 14:12:56 +02:00
Mitsuhiro Tanda
9d50ab8fb5
(cloudwatch) check auth type before assume role ( #8895 )
2017-07-20 14:11:51 +02:00
gomlgs
228c210379
Cloudwatch: Fix bug with obtaining IAM roles within ECS containers. ( #8766 )
...
Fixes #8750 .
2017-07-12 06:55:59 +02:00
Daniel Lee
74093c700f
api: adds no-cache header for GET requests
...
Fixes #5356 . Internet Explorer aggressively caches GET requests which
means that all API calls fetching data are cached. This fix adds a
Cache-Control header with the value no-cache to all GET requests to
the API.
2017-07-04 21:26:05 +02:00
Daniel Lee
b8aa203707
signup: fix email sent logic for tempuser
...
Fixes #8656 and properly sets the email_sent and email_sent_on fields
for a tempuser (signup user).
2017-06-30 20:21:08 +02:00
Denis Doria
5aac2d2078
Include user Id on the lookup api ( #8698 )
...
Implements feature request #8682
2017-06-25 14:23:03 +02:00
Torkel Ödegaard
3066280216
added code from #8504 , and #8021
2017-06-23 17:13:58 -04:00
Torkel Ödegaard
1833c65559
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-23 16:07:16 -04:00
Torkel Ödegaard
fc69d59cae
dashboard folder search fix
2017-06-23 16:00:26 -04:00
Daniel Lee
01ac3a49bd
dashfolders: fix user group picker + cleanup
2017-06-23 20:56:02 +02:00
Torkel Ödegaard
e854fadb67
Merge branch 'master' into develop
2017-06-23 12:56:59 -04:00
Torkel Ödegaard
be29357d22
fix: added missing url route for annotation state history delete, fixes #8660
2017-06-23 11:48:58 -04:00
Torkel Ödegaard
ff4a79df06
minor update
2017-06-23 11:01:55 -04:00
Torkel Ödegaard
876bb08b05
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-22 19:05:49 -04:00
Torkel Ödegaard
5360303ad4
ux: nav changes
2017-06-22 19:05:33 -04:00
Torkel Ödegaard
12270022e3
added sidemeu stuff
2017-06-22 18:41:39 -04:00
Daniel Lee
6d86afd472
dashfolders: use canadmin permission in settings menu
2017-06-23 00:36:17 +02:00
Torkel Ödegaard
a4910c7aea
merging new-sidenav
2017-06-22 18:11:29 -04:00
Torkel Ödegaard
aa634402d9
dashboard acl fixes
2017-06-22 17:43:55 -04:00
Torkel Ödegaard
545b02139d
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-22 17:11:39 -04:00
Torkel Ödegaard
9c6c8c0f3f
acl fixes
2017-06-22 17:10:43 -04:00
Daniel Lee
1d43bfbf3f
dashfolders: new admin permission needed to view/change acl
2017-06-22 23:01:04 +02:00
Daniel Lee
f68d2816ab
dashfolders: security for png rendering
2017-06-22 01:23:48 +02:00
Torkel Ödegaard
2257c1f874
dashboard acl work
2017-06-21 19:02:03 -04:00
Torkel Ödegaard
fcc8557dbb
dashboard acl work
2017-06-21 14:11:16 -04:00
Torkel Ödegaard
43ffe826fa
dashboard acl work
2017-06-20 17:18:20 -04:00
Torkel Ödegaard
212a66ae5f
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-19 18:55:34 -04:00
Daniel Lee
812112f2f6
WIP: fix acl route
2017-06-20 00:34:25 +02:00
Torkel Ödegaard
e290015887
refactoring: renaming
2017-06-19 18:19:58 -04:00
Torkel Ödegaard
aaf2a897b0
folders: changed api urls for dashboard acls
2017-06-19 18:11:30 -04:00
Torkel Ödegaard
c4a1803060
refactoring more renaming
2017-06-19 17:30:54 -04:00
Torkel Ödegaard
e0b9ba7554
refactoring renaming dashboard folder operations
2017-06-19 17:15:25 -04:00
Torkel Ödegaard
34cf305d2c
Merge branch 'master' into dashboard_folders
2017-06-19 16:40:30 -04:00
Torkel Ödegaard
74840178cf
refactoring dashboard folder security checks
2017-06-19 15:22:42 -04:00
Torkel Ödegaard
f7194878fe
dashboard guardian refactoring starting to work
2017-06-19 13:47:44 -04:00
Torkel Ödegaard
d6341162cb
refactoring dashboad folder acl checks
2017-06-19 11:54:37 -04:00
Torkel Ödegaard
b494fd7689
dashboard folders acl work
2017-06-19 11:03:54 -04:00
Torkel Ödegaard
cbbbccf12a
refactoring dashoard folder guardian
2017-06-17 18:24:38 -04:00
Daniel Lee
0eb297822c
httpserver: fixes #8641
...
Changes to the http_server class meant that the TLS settings were not
getting applied anymore. This fixes so that the minimum TLS version is
1.2 again.
2017-06-17 23:10:12 +02:00
Torkel Ödegaard
3fe031d25d
refactoring: Dashboard guardian
2017-06-16 21:25:24 -04:00
Daniel Lee
5cf40cbd12
WIP: move guardian logic for search into the sql query
2017-06-17 02:34:05 +02:00
Torkel Ödegaard
d9dca72ee4
dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu
2017-06-16 16:57:37 -04:00
Daniel Lee
dd02bf7c9b
WIP: adds API check to stop folders being included in folders
2017-06-16 02:45:47 +02:00
Daniel Lee
699f9095e2
WIP: remove permissions when deleting global user
2017-06-14 23:45:30 +02:00
Daniel Lee
92717ccafb
WIP: permission checking for dash version api methods
2017-06-14 00:28:34 +02:00
Daniel Lee
a861b1b9ba
WIP: check permissions for delete/post dashboard
2017-06-12 23:05:32 +02:00
Torkel Ödegaard
5061b3c691
ux: nav experiments
2017-06-12 21:11:22 +02:00
Daniel Lee
3913f16550
WIP: add permission check for GetDashboard
2017-06-12 16:48:51 +02:00
Daniel Lee
9eccb4e79f
WIP: API - add dash permission
2017-06-12 15:49:09 +02:00
Daniel Lee
2097ed0bb8
WIP: Permission Type as string in permission query
2017-06-12 15:49:09 +02:00
Daniel Lee
5c89c4b2bd
WIP: dashlist in template for new folder
2017-06-12 15:49:09 +02:00
Daniel Lee
c602afb9c6
WIP: dashboard search by folder + toggle for list or tree mode
2017-06-12 15:49:09 +02:00
Daniel Lee
82afe8228f
WIP: add parentid to getdashboard query result
2017-06-12 15:49:09 +02:00
Daniel Lee
68b9342de3
WIP: dashboard search by type (folder or dash)
2017-06-12 15:49:09 +02:00
Daniel Lee
fa18b0053d
WIP: delete permission in API
2017-06-12 15:49:09 +02:00
Daniel Lee
53d11d50fc
WIP: remove browse mode for dashboard search
...
Dashboard folders included in all searches. If a dashboard matches
a search and has a parent folder then the parent folder is appended
to the search result. A hierarchy is then returned in the result
with child dashboards under their parent folders.
2017-06-12 15:49:09 +02:00
Daniel Lee
f1e1da39e3
WIP: get Dashboard Permissions
...
The guardian class checks if the user is allowed to get the
permissions for a dashboard.
2017-06-12 15:49:09 +02:00
Daniel Lee
552935031b
WIP: API methods for add/remove members to user group
2017-06-12 15:49:09 +02:00
Daniel Lee
0a1df0905e
WIP: add update user group command
2017-06-12 15:49:09 +02:00
Daniel Lee
233cd7af4a
WIP: add user group search
2017-06-12 15:49:09 +02:00
Daniel Lee
1248728d7f
WIP: rough prototype of dashboard folders
...
Breaks some stuff like selected dash in the search result.
In dashboard search, if the user is not searching then the result is
returned as a tree structure. No ACL's or user group ux yet.
2017-06-12 15:49:09 +02:00
Mitsuhiro Tanda
922073a357
(cloudwatch) add new metrics ( #8569 )
2017-06-08 07:01:33 +02:00
Torkel Ödegaard
46412c8475
dasboard_history: security fix, added orgId filter to dashboard version lookup
2017-06-07 14:21:40 +02:00
Torkel Ödegaard
8f6c9c5946
dasboard_history: some polish around styles & diff colors, and minor fixes
2017-06-07 12:39:06 +02:00
Torkel Ödegaard
ef1dfed0d8
dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version
2017-06-07 11:50:09 +02:00
Torkel Ödegaard
948e5ae74d
dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components
2017-06-06 23:04:14 +02:00
Torkel Ödegaard
7b5f7ed553
dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0
2017-06-06 15:40:10 +02:00
Torkel Ödegaard
689e366f59
refactoring: updated api url routes so they do not conflict with slug route
2017-06-06 09:51:14 +02:00
Torkel Ödegaard
e2061312f5
refactoring: moved compare dashboard version command out of sqlstore, the code in this command did not use any sql operations and was more high level, could be moved out and use existing queries to get the versions
2017-06-06 00:15:40 +02:00
Torkel Ödegaard
746d6cdc88
refactoring: changed name on compare command to make properties more explainatory
2017-06-05 23:29:25 +02:00
Torkel Ödegaard
cabbfe9adc
refactoring: moved dashboard history item formating (message) and fixed dashboard history migration issue, and removed from frontend tests that where no longer needed
2017-06-05 22:59:04 +02:00
Torkel Ödegaard
c87418d060
refactoring: Dashboard history restore operation is now reusing existing
...
operations instead of duplicating a bunch of get & save logic.
2017-06-05 17:45:27 +02:00
Torkel Ödegaard
e18007153d
refactoring: Renamed dashboard version queries that wrongly had Command suffix, added missing OrgId to dashboard history commands and queries
2017-06-05 16:34:32 +02:00
Torkel Ödegaard
f3980504e2
Merge branch 'master' into walmartlabs-master
2017-06-05 13:43:00 +02:00
Eirik Nygaard
1efdd92ae8
Update oauth2 lib ( #8524 )
...
* Update to latest oauth2 library using govendor
* Follow API changes
2017-06-05 10:09:27 +02:00
Tom Gardiner
4fe9935321
Add support for AWS/VPN metrics ( #8528 )
2017-06-04 14:24:04 +02:00
sanchitraizada
77c046aac6
Implement review feedback
2017-06-01 17:57:09 -04:00
Torkel Ödegaard
5e0b03928e
Merge branch 'v4.3.x'
2017-05-29 10:49:02 +02:00
Torkel Ödegaard
0d39852ef4
fix: fixed test data fake metric query, fixes #8474
2017-05-29 10:48:38 +02:00
Dan Cech
8422697199
centralize oauth http calls, validate response status ( #8470 )
2017-05-26 14:35:32 +02:00
sanchitraizada
e6616cc551
Merge pull request #10 from walmartlabs/version-control
...
History and Version Control for Dashboard Updates
2017-05-25 14:50:47 -07:00
Ben Tranter
b6e46c9eb8
History and Version Control for Dashboard Updates
...
A simple version control system for dashboards. Closes #1504 .
Goals
1. To create a new dashboard version every time a dashboard is saved.
2. To allow users to view all versions of a given dashboard.
3. To allow users to rollback to a previous version of a dashboard.
4. To allow users to compare two versions of a dashboard.
Usage
Navigate to a dashboard, and click the settings cog. From there, click
the "Changelog" button to be brought to the Changelog view. In this
view, a table containing each version of a dashboard can be seen. Each
entry in the table represents a dashboard version. A selectable
checkbox, the version number, date created, name of the user who created
that version, and commit message is shown in the table, along with a
button that allows a user to restore to a previous version of that
dashboard. If a user wants to restore to a previous version of their
dashboard, they can do so by clicking the previously mentioned button.
If a user wants to compare two different versions of a dashboard, they
can do so by clicking the checkbox of two different dashboard versions,
then clicking the "Compare versions" button located below the dashboard.
From there, the user is brought to a view showing a summary of the
dashboard differences. Each summarized change contains a link that can
be clicked to take the user a JSON diff highlighting the changes line by
line.
Overview of Changes
Backend Changes
- A `dashboard_version` table was created to store each dashboard
version, along with a dashboard version model and structs to represent
the queries and commands necessary for the dashboard version API
methods.
- API endpoints were created to support working with dashboard
versions.
- Methods were added to create, update, read, and destroy dashboard
versions in the database.
- Logic was added to compute the diff between two versions, and
display it to the user.
- The dashboard migration logic was updated to save a "Version
1" of each existing dashboard in the database.
Frontend Changes
- New views
- Methods to pull JSON and HTML from endpoints
New API Endpoints
Each endpoint requires the authorization header to be sent in
the format,
```
Authorization: Bearer <jwt>
```
where `<jwt>` is a JSON web token obtained from the Grafana
admin panel.
`GET "/api/dashboards/db/:dashboardId/versions?orderBy=<string>&limit=<int>&start=<int>"`
Get all dashboard versions for the given dashboard ID. Accepts
three URL parameters:
- `orderBy` String to order the results by. Possible values
are `version`, `created`, `created_by`, `message`. Default
is `versions`. Ordering is always in descending order.
- `limit` Maximum number of results to return
- `start` Position in results to start from
`GET "/api/dashboards/db/:dashboardId/versions/:id"`
Get an individual dashboard version by ID, for the given
dashboard ID.
`POST "/api/dashboards/db/:dashboardId/restore"`
Restore to the given dashboard version. Post body is of
content-type `application/json`, and must contain.
```json
{
"dashboardId": <int>,
"version": <int>
}
```
`GET "/api/dashboards/db/:dashboardId/compare/:versionA...:versionB"`
Compare two dashboard versions by ID for the given
dashboard ID, returning a JSON delta formatted
representation of the diff. The URL format follows
what GitHub does. For example, visiting
[/api/dashboards/db/18/compare/22...33](http://ec2-54-80-139-44.compute-1.amazonaws.com:3000/api/dashboards/db/18/compare/22...33 )
will return the diff between versions 22 and 33 for
the dashboard ID 18.
Dependencies Added
- The Go package [gojsondiff](https://github.com/yudai/gojsondiff )
was added and vendored.
2017-05-24 19:14:39 -04:00
Dan Cech
007c08f2a8
remove X-Forwarded-* headers added by nginx when proxying data source & plugin requests ( #8418 )
...
* remove X-Forwarded-* headers added by nginx when proxying data source & plugin requests
* properly handle X-Forwarded-For
2017-05-24 13:39:40 +02:00
Daniel Parks
2d29d7b3d6
Add support for AWS DMS CloudWatch metric ( #8458 )
2017-05-24 13:24:24 +02:00
Torkel Ödegaard
b17a1ed557
playlist: fixed dashboard play ordering, fixes #7688
2017-05-24 13:21:43 +02:00
Torkel Ödegaard
c34db77f04
grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415
2017-05-22 14:56:50 +02:00
Torkel Ödegaard
a0b9dcad4d
alert: alerting annotation improvements, fixes #8421
2017-05-22 13:02:49 +02:00
Torkel Ödegaard
4ce0bf4d16
mysql: improved mysql data source, added test feature when adding data source, fixed cache issue
2017-05-11 10:50:24 +02:00
Daniel Lee
4a35126bf6
api: health check returns 503 if db is failing
...
ref #3302
2017-05-10 15:23:59 +02:00
Torkel Ödegaard
b042c53980
ux: updated heatmap icon
2017-05-03 08:56:51 +02:00
Mitja Z
c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
Torkel Ödegaard
19a04b7e4a
change: minor change to health check api endpoint
2017-04-25 17:24:36 +02:00
Torkel Ödegaard
f6f2d85aa7
change: minor change to health check api endpoint
2017-04-25 17:24:06 +02:00
Torkel Ödegaard
368e847d12
feat: added api health endpoint that does not require auth and never creates sessions, returns db status as well. #3302
2017-04-25 17:17:45 +02:00
Torkel Ödegaard
b780415f25
fix: change to remember me cookie encoding
2017-04-25 15:33:15 +02:00
Daniel Lee
aee4af2148
api: omit unused fields for /api/datasources
...
Fixes #7822
2017-04-25 15:23:36 +02:00
Torkel Ödegaard
87c978ebc9
fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093
2017-04-25 13:16:41 +02:00
Dan Cech
b489e93d94
Config Array Syntax ( #8204 )
...
* refactor util encryption library so it doesn't have to import log
* add util.SplitString to handle space and/or comma-separated config lines
* go fmt
2017-04-25 09:14:29 +02:00
Torkel Ödegaard
c78c460f79
mysql: worked on mysql data soruce
2017-04-20 17:10:23 +02:00
Torkel Ödegaard
dbe5480edc
create annotations work
2017-04-14 11:41:02 +02:00
Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02: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
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
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
1cd632cc43
plugins: added state property to plugins
2017-04-07 12:00:03 +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
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
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
Torkel Ödegaard
970619ed52
Merge branch 'disable-login'
2017-03-20 11:18:41 +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
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
Mitsuhiro Tanda
b387a8759e
use session.NewSession() ( #7745 )
2017-03-06 21:08:16 +01:00
bergquist
03354bc49a
tech: replace context.TODO with background ctx
2017-02-24 09:20:28 +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
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
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
Jan Garaj
79cd48f64c
Cloudwatch AWS/SES metrics ( #7568 )
2017-02-15 08:12:24 +01: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
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
Dan Cech
b22881c717
redirect user to requested url after login via oauth
2017-02-09 14:01:53 -05:00
Daniel Lee
2b2368b189
Merge pull request #7491 from grafana/sorting-datasources
...
Sorting datasources with case insensitive order
2017-02-08 12:01:31 +01:00
Daniel Lee
fbc3c3dd32
api: removes import alias + some unused fields
2017-02-08 11:57:05 +01:00
Daniel Lee
cbd1455c42
fix(api): case insensitive sort for datasources
...
The data source list is case sensitive when sorted. This changes the
sort to be case insensitive. The test only tests the handler, not the
routing or database query.
2017-02-07 22:15:52 +01:00
bergquist
9ece10ef24
style(dataproxy): simplify expression
2017-02-07 11:03:57 +01:00
Mitsuhiro Tanda
69566a23fc
improve security of Prometheus datasource
2017-02-06 23:10:10 +09:00
Alexander Menzhinsky
30c334a2b8
Add common type for oauth authorization errors
2017-02-01 16:42:59 +03:00
Torkel Ödegaard
01f1c1b8dc
feat(): began refactoring PR #5364
2017-01-31 17:10:27 +01:00
Torkel Ödegaard
8a95c563bb
Merge branch 'master' into websocket
2017-01-31 08:56:49 +01:00
Torkel Ödegaard
c400b5cf63
Merge branch 'master' of github.com:grafana/grafana
2017-01-31 07:48:44 +01:00
Torkel Ödegaard
1a9aaa4138
feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264
2017-01-31 07:48:10 +01:00
Torkel Ödegaard
830491fa66
Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image
2017-01-31 06:28:54 +01:00
Pavlos Daoglou
3e741315b4
[3743] Adds support for user search based on login or email ( #7334 )
...
* [3743] Adds support for user search based on login or email
* Use query parameter instead
* Use macaron Query() instead
2017-01-31 06:25:55 +01:00
Oleksandr Kushchenko
edba465a75
add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace ( #7388 )
2017-01-28 08:30:57 +01:00
Torkel Ödegaard
2f4da15264
fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365
2017-01-26 08:54:51 +01:00
Torkel Ödegaard
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
smalik
9862c9ff40
feat(alerting): Show/hide alerting UI using configuration variable
...
Use configuration variable "show_alerting_ui" to show/hide alerting UI
2017-01-20 10:43:29 -05:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
bergquist
d4a96b9741
tech(dataproxy): make the code a little bit more defensive
2017-01-16 12:24:08 +01:00
bergquist
dd84fb563a
style(dataproxy): renames log functions
2017-01-16 12:23:49 +01:00
bergquist
51bca7d84b
tech(dataproxy): moves all parameters to Info call
2017-01-16 12:16:41 +01:00
bergquist
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
Ryuichi Sakai
1bc55a2d38
Enable image rendering to use browser time offset
2017-01-15 22:01:28 +09:00
Carl Bergquist
1efeaafdbf
Merge pull request #7249 from grafana/alerting_test_alertrule
...
Enable error and no_data overrides when testing alerting.
2017-01-13 15:18:02 +01:00
Torkel Ödegaard
d354f3a8af
fix(alerting): fixed evaluation for no_value condition, fixes #7244 ( #7247 )
...
* fix(alerting): fixed evaluation for no_value condition, fixes #7244
* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
bergquist
0873d493c2
feat(alerting): moves getNewState to evalHandler
...
closes #7149
2017-01-13 11:02:24 +01:00
Ricky Niemi
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
Ricky Niemi
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
Ricky Niemi
d9cbb994b8
Clean up audit log formatting and code
2017-01-10 11:42:03 -08:00
Ricky Niemi
d03977ac0e
Add initial audit logging to data proxy
2017-01-09 22:59:43 -08:00
Torkel Ödegaard
31bd725559
Merge branch 'notifier-refactor'
2017-01-06 12:17:34 +01:00
Mitsuhiro Tanda
dfaefe34a4
add cloudwatch region ( #7161 )
2017-01-06 12:05:27 +01:00
Torkel Ödegaard
b8f559aecb
feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162
2017-01-06 12:04:25 +01:00
bergquist
9a3e51894b
tech(alerting): remove unused property
2017-01-03 08:11:17 +01:00
Mitsuhiro Tanda
9855ea8c6c
handle sts error ( #7088 )
2016-12-30 16:59:06 +01:00
Kerim Satirli
48b57afe84
Adds London and Canada AWS Regions
2016-12-27 14:25:12 +01:00
Torkel Ödegaard
fad07f0d15
refactor(http): refactoring http server
2016-12-21 14:36:32 +01:00
Torkel Ödegaard
8bccbdafd2
feat(live): minor progress on stream manager
2016-12-21 09:16:29 +01:00
Torkel Ödegaard
b7827962dc
feat(live): just wanted to checkout how far I got on the websocket data source
2016-12-20 16:09:04 +01:00
Utkarsh Bhatnagar
13c4ce68ee
Added name and id in response of create/update ( #7016 )
2016-12-20 13:02:26 +01:00
bergquist
a230ff65a9
fix(alerting): typo
2016-12-19 16:44:59 +01:00
Carl Bergquist
9135abf3ae
Merge pull request #6996 from bergquist/pause_all_alerts
...
Pause all alerts
2016-12-19 16:38:44 +01:00
bergquist
6c2c3c7e24
Revert "fix(alerting): pause dto can only pause one"
...
This reverts commit b2c5a6a037
2016-12-19 16:07:55 +01:00
bergquist
b2c5a6a037
fix(alerting): pause dto can only pause one
2016-12-19 16:05:24 +01:00
bergquist
a2257ec3d0
tech(alerting): renames pause all method
2016-12-19 15:17:49 +01:00
bergquist
ecdf1888c4
feat(alerting): removes pause per datasource
2016-12-19 13:24:45 +01:00
bergquist
4ef95cfd31
style(api): reduce code complexity
2016-12-16 16:07:23 +01:00
bergquist
1f8f3ed038
style(api): extracts filter logic for mass pause
2016-12-16 15:19:13 +01:00
bergquist
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
Mitsuhiro Tanda
81394fcaa4
add cloudwatch internal metrics ( #6990 )
2016-12-16 10:48:05 +01:00
Mitsuhiro Tanda
f8d6902428
fix cloudwatch percentile ( #6989 )
2016-12-16 10:47:41 +01:00
Torkel Ödegaard
8fc6e4cfb0
fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495 , do not allow user to change email or username depending on what property auth proxy is using, fixes #6903
2016-12-14 22:19:25 +01:00
Torkel Ödegaard
330c1b945e
refactor(datasource): refactoring datasource secure json fields handling, #6697 , #6692
2016-12-14 21:06:10 +01:00
huydx
adb441e5c8
(format) run go fmt in pkg
2016-12-14 12:17:38 +09:00
bergquist
96e8ecfa7b
feat(cli): adds command to reset admin password
...
closes #5479
2016-12-09 15:25:02 +01:00
Torkel Ödegaard
22bf6420f1
Merge branch 'master' of github.com:grafana/grafana
2016-12-08 10:25:26 +01:00
Torkel Ödegaard
05772b30d7
feat(ux): completed work on getting started panel, #6466
2016-12-08 10:25:05 +01:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
bergquist
8ee85626f2
fix(api): return correct json info after updating datasource
...
closes #6869
2016-12-07 18:09:17 +01:00
Carl Bergquist
2c7adccf12
Use cache for http.client in tsdb package. ( #6833 )
...
* datasource: move caching closer to datasource struct
* tsdb: use cached version of datasource http transport
closes #6825
2016-12-07 11:10:42 +01:00
Mitsuhiro Tanda
be26c017f6
(cloudwatch) percentile support ( #6634 )
...
* support extended statistics
* handle different response format for extended statistics
2016-12-06 08:12:30 +01:00
stuart nelson
9ed21c6a16
Add transport cache for reverse proxy ( #6776 )
...
* Add transport cache for reverse proxy
* Use updated at in cache
2016-12-02 15:39:28 +01:00
Carl Bergquist
3c662ade8c
Merge pull request #6698 from grafana/cloudwatch_configurable_keys
...
Cloudwatch configurable keys from config page.
2016-11-29 23:37:13 +01:00
Carl Bergquist
f6557f14b7
Merge pull request #6741 from dpavlos/fix_5443
...
[5443] Check if title is empty before save a new dashboard
2016-11-29 21:22:07 +01:00
Carl Bergquist
5a0fc434f3
Merge pull request #6722 from dpavlos/fix_6679
...
[6679] Check if org exists before delete it
2016-11-29 21:12:02 +01:00
bergquist
360516ed41
feat(metrics): change active alerts to guage
2016-11-29 16:46:25 +01:00
Pavlos Daoglou
7f7f080ad8
[5443] Check if title is empty before save a new dashboard
2016-11-29 12:25:20 +02:00
Pavlos Daoglou
0064331bbf
[6679] Check if org exists before delete it
2016-11-28 00:09:01 +02:00
bergquist
7bc1c3cc1c
feat(cloudwatch): make it possible to reset keys
...
closes #6697
2016-11-24 16:37:33 +01:00
bergquist
3d21f06d5b
tech(cloudwatch): store keys in secure json blob
2016-11-24 14:16:52 +01:00
bergquist
0ea6537916
tech(cloudwatch): refactoring
2016-11-24 14:00:05 +01:00
bergquist
f7e12e5f93
test(cloudwatch): fixes failing tests
2016-11-24 14:00:05 +01:00
bergquist
64784db870
feat(cloudwatch): adds access and secret key to edit config page
2016-11-24 14:00:05 +01:00
Daniel Lee
0618122bcd
feat(httpsettings): add tls auth option
...
- Three text areas where the user can paste
in the CA Cert (optional), Client Cert
and Client Key.
- Tooltips for Auth checkboxes with brief
descriptions of what With Credentials and
With CA Cert are.
- Adds popover for TLS Auth header too.
- Aligns gf-form elements as labels and
checkboxes were not aligned before.
- Makes CA Cert optional as it is only
needed for self-signed certs.
2016-11-24 13:33:28 +01:00
Daniel Lee
b6b53c0f4b
fix(dataproxy): test with CA Cert
2016-11-24 13:22:25 +01:00
Daniel Lee
2893b25a05
feat(datasources): allow updating of tls certs
...
The tls files are stored as a json blob in the
SecureJsonData field. To update one file, the
json has to be fetched from the db first and
then updated with the cert file that has been
changed.
Also, a change to the dto with flags that are
used in the frontend to show if a file has
been uploaded. For example, if tlsClientKeySet
is set to true then means a file for the
client key is saved in the db. This is to
avoid sending any private data to the frontend.
2016-11-24 13:22:25 +01:00
Daniel Lee
387f8cc0c6
feat(dataproxy): TLS CA Cert for self-signed certs
...
For self-signed TLS Certificates, authentication
with InsecureSkipVerify set to false then this
error will occur:
x509: certificate signed by unknown authority
The solution is to allow the user to upload the
CA cert as well.
2016-11-24 13:22:25 +01:00
Daniel Lee
c9b2c694f1
refactor(dataproxy): TLS Client Auth
...
Use a SecureJsonData field for TLS
Client Auth instead of 3 new db
fields. Same model as used for
PluginSettings.
Saves and encrypts the pem file
content rather than just saving
the paths to the cert and key.
This allows for uploading from
the Edit Datasource page in
Grafana.
2016-11-24 13:22:25 +01:00
Joe Lanford
56b7e2dfaf
Added support for TLS client auth for datasource proxies ( #5801 )
2016-11-24 13:22:25 +01:00
Torkel Ödegaard
2233938ba7
Merge branch 'master' into getting-started-panel
2016-11-24 13:17:22 +01:00
bergquist
421c1eed82
fix(dashboard): fixes bug when saving dashboards
2016-11-24 11:22:13 +01:00
Carl Bergquist
df2b2e3058
feat(alerting): validate alerts before saving dashboard ( #6691 )
...
ref #6576
2016-11-24 09:50:35 +01:00
Torkel Ödegaard
773fb5d1ae
fix(alerting): check if dashboard is saved before testing alert rule, fixes #6549
2016-11-23 14:55:10 +01:00
Pavlos Daoglou
c365d52a80
[6486] Fix status code when adding an existing user to org ( #6678 )
2016-11-23 14:38:44 +01:00
Torkel Ödegaard
fd512457d8
Merge remote-tracking branch 'origin/master' into getting-started-panel-css2
2016-11-18 16:31:54 +01:00
Torkel Ödegaard
62e8a039a1
refactor(alerting): refactoring PR for OR conditions, #6579
2016-11-17 15:48:15 +01:00
Torkel Ödegaard
457ae74343
Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting
2016-11-17 14:43:24 +01:00
utkarshcmu
690868c837
Added firingEvalution to Rule test
2016-11-17 01:28:17 -08:00
Torkel Ödegaard
e3564d12a1
fix(404): fixed 404 page
2016-11-16 17:09:00 +01:00
Tom Kozlowski
a353c8d1bb
added explicitly setting token as Bearer Type
2016-11-16 09:55:14 -05:00
Torkel Ödegaard
fb57bf77da
ux(getting started): progress on getting started panel and persited help flag states, #6466
2016-11-09 10:41:39 +01:00
Roger Swingle
69ff13adce
add govcloud
2016-11-07 13:56:29 -05:00
Carl Bergquist
d670f1b959
Merge pull request #6479 from utkarshcmu/playlist_bug
...
Removed playlist item when dashboard is deleted
2016-11-07 08:00:57 +01:00
Torkel Ödegaard
2d19af601a
fix(alerting): various alerting fixes
2016-11-06 15:40:02 +01:00
utkarshcmu
c737704eeb
Removed playlist item when dashboard is deleted
2016-11-06 01:49:43 -08:00
Torkel Ödegaard
2da2d5df56
Merge branch 'master' of github.com:grafana/grafana
2016-11-04 12:15:08 +01:00
utkarshcmu
7490c49f60
Alert un paused to pending state
2016-11-01 07:58:38 -07:00
Torkel Ödegaard
2fbe8cde8a
Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode
2016-10-29 11:50:57 +02:00
Eric Uldall
658fc1a67a
added hosted domain suppport to google oauth login ( #6372 )
2016-10-28 12:00:47 +02:00
seanclerkin
7acdbde8f0
Cloudwatch: add support for Aurora specific RDS metrics ( #6378 )
2016-10-28 12:00:22 +02:00
Torkel Ödegaard
c609586ff0
ux(dashboard): making progress on new add panel experiance
2016-10-26 17:42:39 +02:00
Torkel Ödegaard
b32bbbd1a2
fix(influxdb): enforce database restriction, fixes #6352
2016-10-22 10:03:02 +02:00
Eric Uldall
eda442dbf9
added support to login user oauth user by email only ( #6330 )
...
* added support to login user oauth user by email only
* added sql handler
* fixed model method name from GetUserByEmail to GetUserByEmailQuery
* fixed variable declaration typo
2016-10-20 06:45:10 +02:00
bergquist
b2d5b920f5
feat(alerting): allow editor to modify notifications
...
closes #6314
2016-10-19 08:01:31 +02:00
Torkel Ödegaard
30645a6d3d
refactor(alerting): initial step for seperating alerting and dash model, #6273
2016-10-14 13:06:29 +02:00
Torkel Ödegaard
4c26c55fea
fix(api): minor change to how pause alert was done
2016-10-14 09:58:22 +02:00
Torkel Ödegaard
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
marcv81
150d21800c
Do not pass Authorization header in Grafana.net proxy ( #6243 )
2016-10-12 06:54:33 +02:00
bergquist
446bde2421
Merge branch 'pause_alert_rules'
...
closes #6135
2016-10-11 10:54:58 +02:00
bergquist
c6cf7647ff
feat(alerting): pausing alerts requires alert id
2016-10-11 10:53:24 +02:00
bergquist
8b0c29b104
Merge branch 'master' into pause_alert_rules
2016-10-11 09:46:48 +02:00
bergquist
4bbc2108f9
feat(alerting): add pause button to alert list
2016-10-11 09:45:38 +02:00
Nijanthan Hariharan
2b8404e178
(cloudwatch) Fix UnHealthyHostCount metric of ApplicationELB
...
The UnHealthyHostCount metric of ApplicationELB for cloudwatch datasource did not work because the capitalization was wrong - it was UnhealthyHostCount instead of UnHealthyHostCount.
Here is the AWS documentation listing the metric name - http://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-cloudwatch-metrics.html#load-balancer-metrics-alb
2016-10-11 13:10:57 +05:30
Dan Cech
6b16fcea52
Oauth2 Updates ( #6226 )
...
* break out go and js build commands
* support oauth providers that return errors via redirect
* remove extra call to get grafana.net org membership
* removed GitHub specifics from generic OAuth
* readded ability to name generic source
* revert to a backward-compatible state, refactor and clean up
* streamline oauth user creation, make generic oauth support more generic
2016-10-11 08:51:44 +02:00
bergquist
804797245d
feat(alerting): make it possible to pause from alert tab
2016-10-11 08:40:38 +02:00
Dan Cech
519100f1bd
Merge pull request #6217 from ericpp/oauth_add_state_param
...
Added a state parameter for all OAuth requests
2016-10-10 09:58:35 -04:00
bergquist
f3825263d4
feat(alerting): add pause button in alert list
2016-10-10 15:17:14 +02:00
bergquist
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +02:00
bergquist
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
Eric Perrino
81443bf8b4
Added a state parameter for all OAuth requests
2016-10-08 01:22:32 -05:00
Carl Bergquist
c38f6ff182
Make alerting notifcations sync ( #6158 )
...
* tech(routines): move the async logic from notification to alerting notifier
* tech(notification): reduce code dupe
* fix(notification): dont touch the response unless its an error
* feat(alerting): make alerting exeuction async but flow sync
* tech(alerting): remove commented code
* tech(alerting): remove unused code
* tech(alerting): fix typo
* tech(alerting): implement Context on EvalContext
* tech(alerting): wait for all alerts to return
* feat(alerting): dont allow alert responses to cancel
* Revert "feat(alerting): dont allow alert responses to cancel"
This reverts commit 324b006c96
2016-10-03 09:38:03 +02:00
Torkel Ödegaard
c6cf6d4655
fix(api): fixed issue with api content-type in api success messages, fixes #6160
2016-10-01 16:52:52 +02:00
Torkel Ödegaard
a6918617ff
feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes #6164
2016-10-01 16:41:27 +02:00
Torkel Ödegaard
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
Torkel Ödegaard
2750c8a801
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
Torkel Ödegaard
a4648607bb
feat(testdata): added csv test data scenario
2016-09-28 10:37:30 +02:00
Torkel Ödegaard
63caedb094
Merge branch 'master' of github.com:grafana/grafana
2016-09-28 08:09:51 +02:00
Torkel Ödegaard
3ecd96e682
feat(testdata): lots of work on new test data data source and scenarios
2016-09-27 18:17:39 +02:00
Torkel Ödegaard
34f15d92d0
feat(testdata): worked on testdata app
2016-09-27 14:39:51 +02:00
bergquist
1a32ab64b6
tech(renderer): improve renderOpts names
2016-09-26 11:07:36 +02:00
Torkel Ödegaard
175c651e65
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115 , fixes #5906
2016-09-23 12:29:53 +02:00
Carl Bergquist
d6a0ec85c4
Merge pull request #6111 from grafana/pluginreadme
...
allow non-admin users to view plugin readme
2016-09-22 19:51:47 +02:00
Dan Cech
2c3dd84ebb
allow non-admin users to view plugin readme
2016-09-22 13:46:11 -04:00
Torkel Ödegaard
936146768f
fix(snapshots): fixed issue with viewing embedded/solo/png panel from snapshot without login, fixes #3769
2016-09-22 11:46:58 +02:00
Torkel Ödegaard
39af588a94
fix(playlist): fixed sorting issue with playlist playback, fixes #5467
2016-09-22 10:06:03 +02:00
Dan Cech
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Torkel Ödegaard
b4111d78e1
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
2016-09-21 15:03:14 +02:00
Dan Cech
630a8ed8aa
support setting default org role when adding user via grafana.net auth
2016-09-20 12:36:36 -04:00
Dan Cech
da95a23080
remove 'Github' from oauth login error messages
2016-09-20 11:36:13 -04:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
bergquist
9dd8b3b408
wip
2016-09-14 14:12:19 +02:00
bergquist
d0f9623037
feat(alertlistpanel): support state filter
...
ref #5981
2016-09-14 10:49:05 +02:00
Torkel Ödegaard
9cd517780f
Merge branch 'master' of github.com:grafana/grafana
2016-09-13 16:25:48 +02:00
Torkel Ödegaard
b0c7e61ef8
feat(alerting): removed severity
2016-09-13 15:09:55 +02:00
wvl
a73424d6af
Secure Elasticsearch datasources a bit ( #6031 )
...
Instead of allowing users to access the
entire cluster, apply some sane restrictions.
Change-Id: Ib2e93722bf2e39d700d4afa713ff49ec556f2fdf
2016-09-13 15:04:21 +02:00
Torkel Ödegaard
6375418d8c
Merge branch 'alerting' into grafana-annotations
2016-09-13 09:38:12 +02:00
Mitsuhiro Tanda
1264a1b3a6
(cloudwatch) add metrics/dimensions ( #6020 )
2016-09-13 09:08:33 +02:00
Carl Bergquist
1c7b76cb43
Merge pull request #6013 from mtanda/cloudwatch_kinesis_analytics
...
(cloudwatch) add metrics/dimensions
2016-09-12 17:03:25 +02:00
Mitsuhiro Tanda
f998b86ade
(cloudwatch) add metrics/dimensions
2016-09-12 23:47:31 +09:00
bergquist
e7b56c6389
tech(metrics): move all request counters into one middleware
2016-09-09 13:28:19 +02:00
Torkel Ödegaard
4a2f2fba73
feat(alerting): show panel specific alert annotations, #5694
2016-09-09 11:30:55 +02:00
Torkel Ödegaard
d60bd77658
feat(annotations): added support to show grafana stored annotations in graphs, #5982
2016-09-08 11:25:45 +02:00
bergquist
4646723cbb
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
2016-09-07 08:15:44 +02:00
bergquist
2ca7284a56
tech(notifications): splitt into 3 queries
...
closes #5883
2016-09-06 08:43:15 +02:00
bergquist
c893e5d241
feat(notifications): add support for default notifications
...
ref #5883
2016-09-05 21:35:37 +02:00
bergquist
d11bc57c37
feat(notifications): make it possible to send test alert notifications
...
closes #5847
2016-09-05 14:45:15 +02:00
bergquist
1955defc43
fix(api): add missing jsonData field to dto
...
The field is available on the dto so I guess is should be used.
Otherwise we should remove the field rather then not setting it.
ref #5944
2016-09-01 17:21:13 +02:00
bergquist
11a4ff0f8a
feat(alerting): add basic UI for history in alert tab
...
ref #5850
2016-08-30 13:22:59 +02:00
bergquist
650a87dc05
feat(alerting): add alert history api endpoint
...
ref #5850
2016-08-30 09:32:56 +02:00
chrismartin0077
0050707134
feat(api) HEAD response, fixes #3854
2016-08-29 06:07:44 -07:00
bergquist
0cbedb4473
chore(api): remove commented endpoints
2016-08-22 16:56:28 +02:00
bergquist
7095a9d7e1
Merge branch 'master' into alerting
2016-08-22 15:31:33 +02:00
Mitsuhiro Tanda
6bd2bb04a7
(cloudwatch) add api gateway metrics/dimensions
2016-08-20 21:57:20 +09:00
Torkel Ödegaard
5cf9711862
feat(alerting): added eval match to test results
2016-08-18 11:22:24 +02:00
Nozomi Anzai
157435a61c
Fix to check white list when the frontend tries to connect DB
2016-08-17 14:33:59 +09:00
Torkel Ödegaard
0b7fa3c19d
feat(alerting): minor progress on alert list, #5784
2016-08-16 16:50:36 +02:00
Torkel Ödegaard
f934081bcb
feat(alerting): making progress on alerting list, #5784
2016-08-16 09:52:45 +02:00
bergquist
4d0982a21c
Merge branch 'master' into alerting
2016-08-15 07:58:30 +02:00
Mitsuhiro Tanda
7a1011ac39
(cloudwatch) support ApplicationELB ( #5802 )
2016-08-14 13:21:17 +02:00
bergquist
16e75a3036
feat(alerting): add alert message to slack integration
2016-08-12 10:12:04 +02:00
Torkel Ödegaard
3b69c8f687
feat(alerting): new design for alert tab with sidemenu
2016-07-31 09:31:32 +02:00
Torkel Ödegaard
717cce014b
feat(alerting): refactoring
2016-07-27 17:07:44 +02:00
Torkel Ödegaard
cde1bbff78
Merge branch 'alert_conditions' into alerting
2016-07-27 09:52:42 +02:00
Torkel Ödegaard
c675ffc682
Merge branch 'master' into alerting
2016-07-27 09:45:16 +02:00
Torkel Ödegaard
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
Torkel Ödegaard
a6c6094775
feat(alerting): started reworking notifications
2016-07-22 16:45:17 +02:00
Mitsuhiro Tanda
490ea18638
(cloudwatch) fix, don't block by white list ( #5632 )
2016-07-22 13:15:18 +02:00
Torkel Ödegaard
7eb2d2cf47
feat(alerting): working on state management
2016-07-22 13:14:09 +02:00
Torkel Ödegaard
783d697529
feat(alerting): more output when testing alert
2016-07-21 21:54:12 +02:00
Torkel Ödegaard
3ad38eefd2
feat(alerting): test results look better
2016-07-21 13:57:19 +02:00
Torkel Ödegaard
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
9e91aacd34
feat(alerting): progress on testing alerts
2016-07-21 10:29:11 +02:00
Torkel Ödegaard
fb636344a6
feat(alerting): began work on testing alert rule from UI without having to save it
2016-07-20 16:13:36 +02:00
