IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
25,397 Commits 5,454 Branches 554 Tags 1.9 GiB
07582a8e85
Commit Graph

1876 Commits

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

* feat(alerting): give alerts some time to finish before closing down
 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
Torkel Ödegaard
b0fe69822a Merge branch 'master' into alerting 
Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html
 2016-07-18 18:22:35 +02:00
Torkel Ödegaard
f13b869aa4 feat(alerting): work on alerting 2016-07-14 13:32:16 +02:00
Torkel Ödegaard
624cd6fc0a feat(alerting): cleanup, removed alert changes table and code 2016-07-13 11:58:55 +02:00
Torkel Ödegaard
4bb4d7f7d3 Merge branch 'v3.1.x' 2016-07-12 15:54:31 +02:00
Torkel Ödegaard
b2acac3a41 feat(apps): more polish on app dashboard save warning, #5529 2016-07-12 08:41:56 +02:00
Torkel Ödegaard
d9096110f8 Merge branch 'master' into alerting 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
 2016-07-11 18:28:07 +02:00
Torkel Ödegaard
08202dcb83 Merge branch 'v3.1.x' 2016-07-11 09:39:17 +02:00
Torkel Ödegaard
68a8d9bc91 feat(apps): more work on plugin dashboard sync 2016-07-08 13:41:46 +02:00
Torkel Ödegaard
d44325affd feat(apps): progress on app dashboard imports 2016-07-08 09:35:06 +02:00
Torkel Ödegaard
5595fc2683 refactor(): refactored date handling and locale handling in #5517 2016-07-05 17:59:43 +02:00
Kevin Fitzpatrick
b4646b6c3a Allow users to use a generic oauth that conforms to the github style. 
Enables users to set their own link text.
 2016-06-30 15:07:55 -07:00
Nozomi Anzai
bdf68b2183 Fix wrong overwrite of commit:711992c8e2e811abd450cb665008bb0a1b3e29a9 2016-06-30 10:48:39 +09:00
Mitsuhiro Tanda
9ca5ba96be reorder metrics/dimensions 2016-06-29 14:11:01 +09:00
Mitsuhiro Tanda
511f8d3213 add cloudwatch metrics and dimensions 2016-06-29 13:55:16 +09:00
Carl Bergquist
c223994155 Merge pull request #5411 from mtanda/pr_dynamodb_add_metrics 
add cloudwatch metrics
 2016-06-25 17:36:50 +02:00
bergquist
690a74c6b7 feat(login): invert naming for dissallow user pass login 2016-06-25 16:30:41 +02:00
Kevin Fitzpatrick
040586604b Allow configuration to disable the username and password login interface. 
Used for when admins only want users to login via OAuth.
 2016-06-23 10:09:13 -07:00
bergquist
48e1a17ac2 feat(alerting): remove dummie values from email notifier 2016-06-23 16:30:12 +02:00
bergquist
488b42377b feat(alerting): update state if not been updated for 15min 2016-06-23 11:03:27 +02:00
Mitsuhiro Tanda
09f7222e79 add cloudwatch metrics 2016-06-23 11:24:21 +09:00
bergquist
a18506e2e4 feat(alerting): changing notifications should require org admin 2016-06-20 11:32:55 +02:00
bergquist
0c5da9155f feat(alerting): only expose DTO info when requesting all notifications 2016-06-20 11:31:20 +02:00
bergquist
96e5ad3f5c Merge branch 'alerting' into alerting_notifications 2016-06-20 10:45:05 +02:00
bergquist
dd8c3d0355 Merge branch 'master' into alerting 2016-06-20 10:44:48 +02:00
Torkel Ödegaard
9f9fca1e76 feat(datasource): added suggest urls for each data source, #4577 2016-06-17 13:35:29 +02:00
Torkel Ödegaard
5c35fac8fe fix(dataproxy): removed accidental debug code 2016-06-17 08:11:37 +02:00
bergquist
b035074613 tech(alerting): disable update state api 2016-06-16 17:02:45 +02:00
bergquist
a0418da160 Merge branch 'alerting' into alerting_notifications 2016-06-16 16:49:16 +02:00
bergquist
8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
bergquist
b907ce341c feat(alerting): enables deletes for alert notifications 2016-06-16 15:21:44 +02:00
bergquist
149c2ae913 feat(alerting): add submenu for alerting 2016-06-16 15:21:23 +02:00
bergquist
7f767224af feat(alerting): basic support for creating and updating notifications 2016-06-16 14:29:20 +02:00
Torkel Ödegaard
81e9aa4de4 feat(datasource): cancel in flight data source requests, refeatoring #5321 2016-06-16 10:48:26 +02:00
Torkel Ödegaard
23e0240410 fix(build): removed logging call that caused wrong dependency to be used 2016-06-16 08:55:36 +02:00
bergquist
a3b7ea7704 feat(alerting): skeleton for alert notification configuration page 2016-06-16 08:16:16 +02:00
Torkel Ödegaard
ec0b09450c Merge branch 'export-dashboard' 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
 2016-06-16 08:06:43 +02:00
Nozomi Anzai
6586cc4029 Add the datasource of RDBMS (PostgreSQL and MySQL) 2016-06-13 18:24:18 +09:00
Torkel Ödegaard
0ef6801117 Merge branch 'master' into alert_ui_take2 2016-06-11 12:17:14 +02:00
Torkel Ödegaard
bf1ea560e9 feat(logging): error logging improvements 2016-06-11 12:16:33 +02:00
Torkel Ödegaard
a362984c57 feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part 2016-06-11 10:26:48 +02:00
Torkel Ödegaard
2b4a9954b1 feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package 2016-06-11 10:13:33 +02:00
bergquist
fdf051ad5a feat(alerting): begin alert rule storage refactoring 2016-06-09 22:21:28 +02:00
Torkel Ödegaard
26d93d7130 Merge branch 'master' into alerting_definitions 2016-06-08 09:36:50 +02:00
Torkel Ödegaard
b25cb60259 Merge branch 'new-logger' 
Conflicts:
	CHANGELOG.md
 2016-06-08 08:09:59 +02:00
Torkel Ödegaard
67ad903556 feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299 2016-06-08 05:45:13 +02:00
Torkel Ödegaard
0667d73660 Merge branch 'new-logger' into alerting_definitions 
Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go
 2016-06-07 13:31:56 +02:00
Torkel Ödegaard
3dc7706c45 feat(loggin): improved http request panic handling 2016-06-07 10:05:10 +02:00
Torkel Ödegaard
9741af2031 feat(logging): progress on new logging #4590 2016-06-07 09:29:47 +02:00
Torkel Ödegaard
22778e6efd feat(logging): a lot of progress on moving to new logging lib, #4590 2016-06-06 23:06:44 +02:00
Torkel Ödegaard
34e17f7282 feat(alerting): requests looks to be working again 2016-06-06 17:11:46 +02:00
Torkel Ödegaard
70cb8400c3 feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting 2016-06-06 09:17:29 +02:00
Torkel Ödegaard
f36a44c49a Merge branch 'master' into alerting_definitions 
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
 2016-06-06 08:43:01 +02:00
Torkel Ödegaard
7cbaf06097 feat(instrumentation): check if enabled in http api metrics route 2016-06-03 21:22:34 +02:00
Torkel Ödegaard
aef2b6b45f feat(instrumentation): finial polish 2016-06-03 17:15:17 +02:00
Torkel Ödegaard
35a7a3a52b feat(instrumentation): added some more timers 2016-06-03 17:00:39 +02:00
Torkel Ödegaard
e0c6048820 feat(instrumentation): added gauge and http endpoint 2016-06-03 16:15:36 +02:00
Torkel Ödegaard
1a05ae2eaa feat(instrumentation): more work 2016-06-03 15:06:57 +02:00
Torkel Ödegaard
eee49a4995 feat(instrumentation): added meter, histogram and new timer, timer now send p25, p75, p90, p99 percentiles in 1000 sample exp decaying sample 2016-06-03 12:50:51 +02:00
Torkel Ödegaard
3065d10931 feat(timing): timing is now working with graphite and influxdb 2016-06-03 09:17:36 +02:00
Torkel Ödegaard
e2c794ff31 feat(instrumentation): lots of refactoring to support tag based backend, #4696 2016-06-02 21:06:49 +02:00
bergquist
a8ac37f517 feat(usage_metrics): add timer metrics 2016-06-01 15:04:58 +02:00
bergquist
7224ea5229 chore(alerting): convert alert levels to float 2016-05-31 14:18:12 +02:00
bergquist
077be210da tech(alerting): change interval -> frequency 2016-05-30 09:31:05 +02:00
bergquist
16a9e56eca tech(alerting): change queryrange to int from str 2016-05-30 09:18:22 +02:00
bergquist
1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +02:00
Torkel Ödegaard
c3708b3096 feat(import): import directly from grafana.net id/url now works 2016-05-27 16:11:05 +02:00
Torkel Ödegaard
540def2c39 feat(import): working on unit tests for import ctrl 2016-05-27 13:52:19 +02:00
Mat Schaffer
18f704533f Add enhanced elasticbeanstalk metrics 2016-05-27 11:47:53 +09:00
Mat Schaffer
aedba5411c Add basic metrics for AWS/ElasticBeanstalk 2016-05-27 11:30:16 +09:00
Torkel Ödegaard
e83d13848e Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-26 14:22:22 +02:00
Jared Wiltshire
c9d6321f38 Allow for proxying Authorization header and automatically convert (#4832) 
Authorization header to X-DS-Authorization in backend_srv.js
 2016-05-26 07:13:29 +02:00
Mukesh
4038b4d17e Set active org through admin api (#5179) 2016-05-26 06:51:23 +02:00
bergquist
b2a4d8083e feat(alerting): add datasource ref to alert rule 2016-05-25 12:57:49 +02:00
Torkel Ödegaard
ba6573af61 Merge branch 'master' into export-dashboard 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
 2016-05-25 12:32:56 +02:00
Torkel Ödegaard
2cd6c2e7e0 Merge branch 'v3.0.x' 2016-05-25 11:04:12 +02:00
bergquist
8c2b6b532d fix(preferences): fixes broken default home dashboard 
closes #5167
 2016-05-25 09:56:45 +02:00
Torkel Ödegaard
8f0240a295 Merge branch 'footer' 2016-05-24 07:53:13 +02:00
Torkel Ödegaard
fd08c821f9 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-24 07:52:27 +02:00
Torkel Ödegaard
c41c771e9a fix(home dashboard): fixed handling error when default dashboard is not found, fixes #5141 2016-05-24 07:39:58 +02:00
Torkel Ödegaard
9a7817a271 Merge branch 'master' into footer 
Conflicts:
	pkg/api/frontendsettings.go
 2016-05-23 20:59:23 +02:00
Torkel Ödegaard
c60d737928 Merge branch 'v3.0.x' 
Conflicts:
	package.json
 2016-05-23 09:29:14 +02:00
bergquist
45b2b4bc52 feat(alerting): add feature toggles for alerting functions 2016-05-23 08:00:42 +02:00
Torkel Ödegaard
43ba563a1c fix(logging): change log level to trace for plugin proxy logging call, fixes #5126 2016-05-23 07:55:55 +02:00
Mitsuhiro Tanda
1d27a7f93d (cloudwatch) fix wrong cache key of credentials (#5124) 2016-05-21 09:02:04 +02:00
Torkel Ödegaard
855e913bbd feat(dashboards): began work on dashboard list 2016-05-19 11:03:10 +02:00
Torkel Ödegaard
cac723dab3 Merge branch 'master' into export-dashboard 2016-05-19 08:48:24 +02:00
bergquist
ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard 
Conflicts:
	.floo
	.flooignore
 2016-05-18 08:08:15 +02:00
Mitsuhiro Tanda
07d355851e (cloudwatch) assume role support (#5065) 
* (cloudwatch) assume role support

* save godep

* (cloudwatch) add assumeRoleArn field

* (cloudwatch) set cred provider for sts

* (cloudwatch) fix test
 2016-05-18 07:54:24 +02:00
Torkel Ödegaard
83f5080274 feat(angular): disable debug in production for angular compiler 2016-05-17 15:00:48 +02:00
Torkel Ödegaard
c133a00125 feat(alerting): minor progress on scheduler 2016-05-17 14:31:52 +02:00
Torkel Ödegaard
77b7cdfadb feat(alerting): added few fields to alert rule 2016-05-16 15:39:09 +02:00
Torkel Ödegaard
7cd663bbe8 feat(import): more import work 2016-05-14 10:00:43 +02:00
Torkel Ödegaard
db664c61a4 Merge branch 'master' into export-dashboard 2016-05-10 16:46:58 +02:00
bergquist
1fe2055743 tech(alerting): disable DEL for alert rules in the api 2016-05-10 15:02:11 +02:00
bergquist
1bb8bc58b8 feat(alerting): add parameteters for filtering alerts 2016-05-10 09:45:56 +02:00
bergquist
1be513fabd feat(alerting): add support for alert page filter 2016-05-09 14:44:44 +02:00
bergquist
35c73902da Merge branch 'master' into alerting_definitions 2016-05-09 11:34:56 +02:00
bergquist
47070f2d1f chore(alerting): struct names and url refactoring 2016-05-09 11:25:21 +02:00
bergquist
27274f37e8 feat(alerting): update paths for alert state 2016-05-06 14:37:41 +02:00
Martin Häger
0764a4313b AWS Elasticsearch Service Dimensions (#4903) 2016-05-04 10:47:35 +02:00
bergquist
26941284da feat(alerting): add limit and since id options for alert logs 2016-05-04 09:57:53 +02:00
fg2it
303cd8a5af [RenderToPng fix] (#4901) 
* removing useless code

* fix various minor typo

* don't silence phantomjs timeout and allow more time

* fix gofmt
 2016-05-04 09:07:45 +02:00
Torkel Ödegaard
f4a013946f feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled 2016-05-03 19:00:42 +02:00
bergquist
1624dc9dfd feat(alerting): separate operator and level 2016-05-03 17:31:04 +02:00
bergquist
27c34745a6 feat(alerting): add link to alerts in side menu 2016-05-03 16:46:10 +02:00
Torkel Ödegaard
bb6f4fff87 feat(export/import): minor progress 2016-05-03 16:40:21 +02:00
Torkel Ödegaard
de26a17dc7 feat(footer): began work on page footer 2016-05-03 09:00:58 +02:00
bergquist
bac89775e2 tech(alerting): fixes broken refactoring 2016-05-02 18:00:10 +02:00
bergquist
743a6fa37c feat(alerting): add support for deleting alert rules 2016-05-02 16:07:19 +02:00
bergquist
6d66d9f42d feat(alerting): adds fearture toogle for alerting 2016-04-29 14:35:58 +02:00
bergquist
f442adca47 feat(alerting): adds api endpoints for alerts per dashboard and panel 2016-04-28 15:13:42 +02:00
bergquist
ecfbc2edca feat(alerting): adds alert history page 2016-04-28 11:42:03 +02:00
bergquist
0f0fa0c257 feat(alerting): adds endpoint for getting alert states log 2016-04-28 10:59:46 +02:00
bergquist
3ecc13506c feat(alerting): adds alert state go ui 2016-04-28 08:53:34 +02:00
bergquist
e7be7d2835 feat(alerting): add api endpoint for alert state 2016-04-28 08:23:50 +02:00
bergquist
6a5ecb3fca feat(alerting): adds basic page for listing alerts 2016-04-27 13:02:28 +02:00
bergquist
973db1ac38 feat(alerting): add api route for alert changes 2016-04-27 08:59:33 +02:00
bergquist
2e097f4af1 Merge branch 'master' into alerting_definitions 2016-04-26 17:38:29 +02:00
bergquist
9b50313f11 feat(alerting): add api endpoints for listing alerts 2016-04-26 17:36:50 +02:00
Torkel Ödegaard
bce5c447b3 fix(apps): app dashboards can now be updated, fixes #4817 2016-04-26 12:52:44 +02:00
bergquist
bb42579b0f Merge branch 'master' into alerting_definitions 2016-04-25 16:42:33 +02:00
Torkel Ödegaard
04a79175bf fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784 2016-04-25 14:00:49 +02:00
bergquist
bdd3e2ad73 Merge branch 'master' into alerting_definitions 2016-04-25 11:22:35 +02:00
Torkel Ödegaard
711992c8e2 fix(influxdb): minor fix for duplicated db param to proxied influxdb call, fixes #4703 2016-04-25 09:26:47 +02:00
bergquist
ba5978abd3 Merge branch 'master' into alerting_definitions 2016-04-22 15:52:56 +02:00
bergquist
51de894692 fix(snapshots): sets default value for snapshot name 
make it possible for < 3.0 instances to publish snapshots

ref #4778
 2016-04-21 09:59:48 +02:00
bergquist
7860a2a1b8 feat(alerting): make sure dashboard id exists 2016-04-20 09:55:32 +02:00
Mitsuhiro Tanda
8d1ac8c7f5 (cloudwatch) add kinesis metrics 2016-04-20 14:33:08 +09:00
bergquist
bcf10a6483 Merge branch 'master' into alerting_definitions 2016-04-18 10:28:40 +02:00
Torkel Ödegaard
d9ad4cf2fc fix(): made plugin settings api call accessable for viewer roles 2016-04-13 13:03:41 -04:00
Torkel Ödegaard
10131aa8a0 fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686 2016-04-13 12:23:29 -04:00
bergquist
91a1a823e2 feat(alerting): add basic tables for alerting definitions 2016-04-13 10:33:45 +02:00
Torkel Ödegaard
c518fdc155 Merge branch 'updatecheck' into pluginlist 2016-04-11 13:43:29 -04:00
Torkel Ödegaard
ab34b174f9 Added update notice to plugin list 2016-04-11 13:42:52 -04:00
Torkel Ödegaard
6ac3bd4c7c feat(): update checks starting to work 2016-04-11 12:47:04 -04:00
Torkel Ödegaard
b4a8c227cc feat(update checks): started work on update checks 2016-04-11 12:21:48 -04:00
Torkel Ödegaard
12800f831a Merge branch 'master' into pluginlist 2016-04-09 15:01:39 -04:00
Torkel Ödegaard
370589d6c0 fix(org switch): fixed issue with switching orgs, fixes #4614 2016-04-09 13:27:06 -04:00
Torkel Ödegaard
d70ef90bdd feat(): plugin list panel 2016-04-08 16:42:33 -04:00
Torkel Ödegaard
9b30634217 fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558 2016-04-05 11:24:21 -04:00
Torkel Ödegaard
43ebc172cb fix(profile): fixed change password link and page, fixes #4542 2016-04-04 13:52:41 -04:00
Torkel Ödegaard
cab859a0e4 Merge branch 'master' into preferences 2016-04-03 05:33:11 -07:00
Torkel Ödegaard
a2c6469d41 fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536 2016-04-03 05:32:15 -07:00
Torkel Ödegaard
ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 2016-04-02 13:54:06 -07:00
Torkel Ödegaard
38a10f8be4 progress 2016-04-01 17:34:30 -07:00
Torkel Ödegaard
6ed9164c9d Merge branch 'master' of github.com:grafana/grafana into preferences 2016-03-30 13:35:17 -07:00
Torkel Ödegaard
14326b626e ux(): checkbox now works in dark and white theme 2016-03-28 13:10:42 +02:00
Torkel Ödegaard
b7d198793f refactor(): minor refactoring of #4455 2016-03-23 15:09:48 +01:00
Torkel Ödegaard
c711fb67c8 Merge branch 'master' into websocket 2016-03-22 10:31:57 +01:00
Torkel Ödegaard
10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 2016-03-22 10:15:47 +01:00
Torkel Ödegaard
65c0937741 ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434 2016-03-21 19:07:08 +01:00
Torkel Ödegaard
5e431149cd feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399 2016-03-20 11:54:24 +01:00
Torkel Ödegaard
7023dedc05 feat(preferences): refactoring PR #4399 2016-03-20 11:52:19 +01:00
Torkel Ödegaard
9e98c86ae1 Merge branch 'master' into preferences 2016-03-20 11:27:49 +01:00
Torkel Ödegaard
e63ff1c762 feat(dataproxy): set flush interval, need a setting for this 2016-03-19 11:09:26 +01:00
utkarshcmu
9d4fa87914 Viewer not able to delete snapshot 2016-03-18 01:13:34 -07:00
utkarshcmu
cb42cfc6af Removed unwanted api, moved logic into backend 2016-03-17 02:29:34 -07:00
Torkel Ödegaard
9ddf22ea93 Merge branch 'master' into websocket 2016-03-17 10:16:05 +01:00
Torkel Ödegaard
b2fe7e518f ux(): added specific fallback logos for plugin depending on type, polished layout selector style 2016-03-17 10:15:16 +01:00
utkarshcmu
4fbe954a79 Home dashboard per user per org works 2016-03-17 01:38:18 -07:00
utkarshcmu
66621d762e Added getDashboardSlugById api 2016-03-17 01:01:58 -07:00
utkarshcmu
9dd6aefcec Minor corrections 2016-03-16 23:35:06 -07:00
utkarshcmu
749fd618a9 Saving home dashboard id in table 2016-03-16 23:22:27 -07:00
Torkel Ödegaard
0f6579801d Merge branch 'master' into websocket 
Conflicts:
	public/app/core/core.ts
 2016-03-16 15:19:32 +01:00
Torkel Ödegaard
a88176e060 feat(preferences): lots of refactoring and changes to #3214 2016-03-15 22:49:52 +01:00
Torkel Ödegaard
e06756bcab Merge branch 'preferences' of github.com:grafana/grafana into preferences 2016-03-15 22:15:27 +01:00
Torkel Ödegaard
9c222a445f Merge branch 'master' into preferences 2016-03-15 22:14:35 +01:00
Torkel Ödegaard
e4c0c39fbf ux(): began work on updating data source list to cards view 2016-03-15 20:29:35 +01:00
Torkel Ödegaard
1abdd170d3 ux(): fixes to cards and sorting plugin list, #4364 2016-03-15 15:52:29 +01:00
Torkel Ödegaard
2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 2016-03-14 22:26:43 +01:00
Torkel Ödegaard
3d5251d9a5 feat(websocket): more work websocket ds, # 4355 2016-03-14 17:32:48 +01:00
Torkel Ödegaard
195be2742c feat(live): wip work 2016-03-14 16:18:07 +01:00
Torkel Ödegaard
2adc4d12be feat(live): work on websocket data source, #3455 2016-03-14 13:20:55 +01:00
Torkel Ödegaard
8d7b7009c3 Merge branch 'master' into websocket 2016-03-14 12:01:43 +01:00
Torkel Ödegaard
ca5a34ad1e fix(datasource): filter out built in data sources from data source type dropdown 2016-03-14 12:00:56 +01:00
Torkel Ödegaard
fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
utkarshcmu
e371e03696 Able to save preference version, created, updated fields 2016-03-14 03:12:52 -07:00
Torkel Ödegaard
5b6754ce6c Merge branch 'master' into websocket 2016-03-14 10:33:11 +01:00
Torkel Ödegaard
581ffb862c feat(plugins): polish to plugin page, better handling for reading readme file contents 2016-03-13 19:21:44 +01:00
Torkel Ödegaard
0398face05 feat(plugins): dashboard import for data sources is working! #4298 2016-03-12 10:13:49 +01:00
Torkel Ödegaard
1f9f439acb lib(): added simplejson lib 2016-03-11 23:28:33 +01:00
Torkel Ödegaard
c5a817194a more work on dashboard importing and templating 2016-03-11 17:31:57 +01:00
utkarshcmu
43b474143c Preferences model updated 2016-03-11 06:30:05 -08:00
Torkel Ödegaard
ece8a925a6 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
 2016-03-11 12:39:10 +01:00
Torkel Ödegaard
fc54c01f01 feat(plugins): more work on plugin dashboard install, #4298 2016-03-11 12:31:56 +01:00
Torkel Ödegaard
2de439bd1e feat(plugins): progress on dashboard installs , #4298 2016-03-11 09:57:20 +01:00
Mitsuhiro Tanda
2c5abed2f1 (cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs 2016-03-11 12:11:01 +09:00
bergquist
c09d506245 feat(navigation): hide new and import for viewers 
closes #4326
 2016-03-10 16:38:16 +01:00
bergquist
43073da7eb feat(renderer): add timeout for the renderer api 
closes #4325
 2016-03-10 16:02:10 +01:00
utkarshcmu
4fbff99186 Implemented GetDataSourceIdByName API 2016-03-10 01:31:10 -08:00
utkarshcmu
8afd56575c Moved api in correct group 2016-03-10 00:48:38 -08:00
Torkel Ödegaard
dfaa6d8eb9 feat(plugins): a lot of work on #4298 2016-03-08 18:17:47 +01:00
Torkel Ödegaard
74ebc2d3b0 Merge branch 'master' of github.com:grafana/grafana 2016-03-08 15:32:15 +01:00
utkarshcmu
f20f4d130b Pulled out the common code 2016-03-08 02:51:03 -08:00
Torkel Ödegaard
f80c2406a8 feat(plugins): remove app bundled plugins from plugins list 2016-03-08 11:29:36 +01:00
utkarshcmu
1a39d93b4e Implemented GetDataSourceByName API 2016-03-08 01:54:10 -08:00
Torkel Ödegaard
2a557f67d2 Do not set remember me cookie when days are set to zero 2016-03-07 17:26:31 +01:00
Torkel Ödegaard
135679096b feat(plugins): progress on plugin details page, # 4275 2016-03-07 14:31:17 +01:00
utkarshcmu
9c8d508247 Made API handling better, removed unused components 2016-03-06 12:32:22 -08:00
utkarshcmu
8f42bec270 Implemented GetUserPreferences API 2016-03-06 11:42:15 -08:00
utkarshcmu
660d3fa1e9 Implemented savePreferences API 2016-03-06 03:47:39 -08:00
utkarshcmu
1ef332e82c preferences UI poc 2016-03-05 23:44:56 -08:00
utkarshcmu
cf926134ef Added savePreferencesAPI 2016-03-05 13:15:49 -08:00
bergquist
dd7e215e78 feat(dashslist): make sure dashbords exists in recently viewd dashboards 
closes #4249
 2016-03-05 12:27:37 +01:00
Torkel Ödegaard
fc877ae0f4 poc(websockets): websocket poc 2016-03-03 23:05:08 +01:00
Anthony Woods
91ca5b6f2a Merge pull request #4208 from raintank/suppressNav 
add supressNav property to plugin pages.
 2016-03-01 20:56:31 +08:00
bergquist
00dc078311 feat(playlist): render playlists if playlist id is invalid 
close #4209
 2016-03-01 13:50:55 +01:00
Anthony Woods
74949d306f add supressNav property to plugin pages. 
This allows pages to be registered that dont show up in the
Navigation menu when the App is pinned.
 2016-03-01 18:07:51 +08:00
Peggy Li
773a5631c5 Fix typo in function name 2016-02-29 10:52:57 -08:00
Anthony Woods
35f7a71f9a fix app->plugin renamin in more places 2016-02-29 19:54:36 +08:00
Anthony Woods
4741152f05 correct path for app page links. 2016-02-29 19:37:35 +08:00
Torkel Ödegaard
bd2e1ef67e feat(plugins): fixed failing api test 2016-02-26 20:27:29 +01:00
Torkel Ödegaard
c148d89004 feat(plugins): progress on plugins page 2016-02-26 18:25:39 +01:00
Torkel Ödegaard
c521182ceb feat(plugins): more work on plugins list/edit view 2016-02-25 15:56:28 +01:00
Torkel Ödegaard
8db7cf49a6 feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins 2016-02-25 14:55:31 +01:00
bergquist
75454b02c0 fix(dataproxy): remove partially used cache 
closes #4044
 2016-02-23 13:05:47 +01:00
Carl Bergquist
f788c8cb37 Merge pull request #3632 from mtanda/cloudwatch_annotation_describe_alarms 
(cloudwatch) multiple CloudWatch alarm annotation support
 2016-02-23 07:41:10 +01:00
Torkel Ödegaard
acfc119409 ux(): added New and Import under divider to dashboard subnav 2016-02-22 21:51:31 +01:00
Torkel Ödegaard
c94659f552 ux(color popover): refactored color popover to use drop lib 2016-02-22 18:46:58 +01:00
Torkel Ödegaard
08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
Torkel Ödegaard
4ab041f79e ux(): added sass linter, almost no rules enabled yet 2016-02-20 18:31:09 +01:00
Matt
1144988443 Merged trent's styles and added admin submenu 2016-02-19 22:00:29 -05:00
Torkel Ödegaard
2f2326006d Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory 2016-02-18 13:37:31 +01:00
bergquist
d183c11e69 feat(cloudwatch): add more metrics for Route53 
Thank you https://github.com/aruetten for helping
us find the new metrics

closes #4053
 2016-02-18 13:09:50 +01:00
Dmitry Smirnov
3fd6ae597d minor spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-16 12:12:04 +11:00
bergquist
da8782a9d0 remove unused imports 2016-02-15 10:34:47 +01:00
bergquist
d523d45124 fix(playlist): dont swallow errors 2016-02-15 10:09:15 +01:00
Torkel Ödegaard
e32ee9f02e ux(admin): admin pages overhaul 2016-02-14 17:37:05 +01:00
Torkel Ödegaard
6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 2016-02-12 11:21:42 +01:00
Torkel Ödegaard
e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 2016-02-12 10:14:06 +01:00
Torkel Ödegaard
53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 2016-02-12 10:01:52 +01:00
Torkel Ödegaard
2ea548850e Merge branch 'master' into style-changes-bulletfactory 
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
 2016-02-11 21:23:54 +01:00
Mitsuhiro Tanda
81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
Trent White
ff913333a2 update sidebar 2016-02-11 09:53:48 -05:00
Torkel Ödegaard
37c6a1ddf0 feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template 2016-02-10 16:43:35 +01:00
Torkel Ödegaard
ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
Torkel Ödegaard
f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard
18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
Torkel Ödegaard
99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Torkel Ödegaard
273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +01:00
Torkel Ödegaard
fcc960e9a2 Merge pull request #3792 from utkarshcmu/snapshot-view 
UI Review: Snapshot view
 2016-02-05 08:49:23 +01:00
Torkel Ödegaard
db27bbb162 Merge pull request #3918 from utkarshcmu/metadata 
Added metadata fields under Settings tab
 2016-02-05 08:47:57 +01:00
Mitsuhiro Tanda
e96d72d669 reuse credentials 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda
10016d9d38 add CloudWatch DescribeAlarms API support 2016-02-04 13:14:03 +09:00
Mitsuhiro Tanda
ccb063df06 (cloudwatch) add test for custom metrics 2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda
b90a078be0 (cloudwatch) change implementation to testable 2016-02-04 13:07:02 +09:00
Mitsuhiro Tanda
73ec486434 (cloudwatch) custom metrics support 2016-02-04 13:07:02 +09:00
utkarshcmu
00a6efa15e Excluded total calculations from backend 2016-02-01 23:26:11 -08:00
utkarshcmu
338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00
Torkel Ödegaard
3f945e886b merge sync with master 2016-01-31 19:51:23 +01:00
Torkel Ödegaard
12460af0ec Merge pull request #3830 from raintank/apiPlugin 
Add secureJsonData field to appSettings model
 2016-01-29 17:17:37 -05:00
bergquist
34eb5acee7 feat(dataproxy): remove 'SetCookie' from reponse 
set cookie could potentialll leak information about the
datasource if in proxy mode.

closes #3845
 2016-01-29 23:17:11 +01:00
Anthony Woods
2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin 2016-01-30 01:38:01 +08:00
bergquist
d27bb4d3fb style(playlist): move dashboard access to dashboard.go 2016-01-29 01:41:23 +01:00
bergquist
d66932a8a2 chore(playlist): extract playlist start into new file 2016-01-28 23:56:56 +01:00
utkarshcmu
972ac99b7c Added more metadata 2016-01-28 09:53:19 -08:00
utkarshcmu
b30dcce4bc Added dtos and UI for more metadata 2016-01-28 00:52:52 -08:00
utkarshcmu
58121d89fc Updated http_api docs 2016-01-27 22:02:33 -08:00
utkarshcmu
6a1192172d Api stores dashboard creator 2016-01-27 21:55:54 -08:00
utkarshcmu
753fd164d7 Added createdBy in metadata ui and dashboard table 2016-01-27 17:11:21 -08:00
Torkel Ödegaard
97ac81aa9c feat(panels): upgradede singlestat panel 2016-01-27 19:07:39 -05:00
Torkel Ödegaard
57d22fb93f Merge remote-tracking branch 'origin/master' into panelbase 2016-01-27 17:33:33 -05:00
Carl Bergquist
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats 
Grafana stats view as mentioned in #3812
 2016-01-27 19:41:10 +01:00
Torkel Ödegaard
11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 2016-01-25 10:00:25 -05:00
utkarshcmu
da67afa51e Fixed api bugs, stats endpoint working 2016-01-24 21:18:17 -08:00
Torkel Ödegaard
4f7fb40d9b feat(panel plugin): improving panel plugin model 2016-01-24 16:39:25 -05:00
utkarshcmu
c7fae5386d Added backend API for stats 2016-01-24 11:01:33 -08:00
Anthony Woods
32f78d465b add secureJsonData to appSettings model. 
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
 2016-01-23 06:17:22 +08:00
Anthony Woods
f94599cd29 merge apiPlugins with appPlugins 2016-01-22 01:15:04 +08:00
Anthony Woods
dcde1422b7 add support for apiPlugin headers. 
The header content uses text/Template.  If the apiPlugin is
bundled in an App, then the appSettings.JsonData is passed
to the header template.
 2016-01-21 11:41:59 +08:00
Anthony Woods
1bca28ad12 include the jsonData in the AppSettings DTO 2016-01-21 02:23:24 +08:00
utkarshcmu
aa1d28835d Fixed angularjs variable names 2016-01-19 23:23:44 -08:00
utkarshcmu
281ec60085 UI and backend working 2016-01-19 22:04:38 -08:00
utkarshcmu
09f5e6f4dc Merge branch 'master' of https://github.com/utkarshcmu/grafana into snapshot-view 2016-01-19 21:05:50 -08:00
Torkel Ödegaard
7a26d309b1 feat(apps): more work on apps and how apps can include panels 2016-01-19 18:18:53 +01:00
utkarshcmu
ca55d1f315 Minor bug fixes 2016-01-19 05:05:24 -08:00
utkarshcmu
41fd0ed467 Merge branch 'master' of https://github.com/grafana/grafana into snapshot-view 2016-01-19 05:05:03 -08:00
utkarshcmu
bcb44b7b31 UI and backend connectivity implemented 2016-01-19 05:02:22 -08:00
utkarshcmu
1ab1154010 Optimized backend queries 2016-01-19 04:09:57 -08:00
utkarshcmu
8f067a5ed2 Added backend functionality for searching snapshots 2016-01-19 01:37:36 -08:00
utkarshcmu
1952ebf7c4 Fixed failing gofmt tests 2016-01-19 00:33:30 -08:00
utkarshcmu
70481953fd Snapshot name is saved in DB now 2016-01-19 00:26:20 -08:00
Torkel Ödegaard
3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
Torkel Ödegaard
6fc972ab1e feat(playlists): merge sync with RP 2016-01-18 16:05:38 +01:00
Torkel Ödegaard
66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
Torkel Ödegaard
1adb7b286c updated 2016-01-18 07:28:01 +01:00
Torkel Ödegaard
38ddc88b20 fix(api): do not include null jsonData field in /api/datasources resource, closes #3755 2016-01-15 15:57:00 +01:00
Torkel Ödegaard
88a132b878 Merge branch 'dynamic-directives' 2016-01-14 18:57:34 +01:00
Torkel Ödegaard
e38e8c740f Merge pull request #3723 from schen59/master-schen 
fix mismatch api path introduced by commit to issue #3600
 2016-01-13 19:51:56 +01:00
Shaofeng Chen
4ceab4abc7 fix mismatch api path 2016-01-13 10:44:31 -08:00
Torkel Ödegaard
8ff48c126a fix(merge): minor merge fix 2016-01-13 15:51:47 +01:00
Torkel Ödegaard
6da3af5e89 Merge branch 'new_macaron' 2016-01-13 15:48:49 +01:00
Torkel Ödegaard
bdb67d4909 fix(build): fixed dependency and build issue 2016-01-13 15:38:54 +01:00
bergquist
4fe72ebf69 feat(macaron): upgrades macaron version 2016-01-13 15:11:23 +01:00
Torkel Ödegaard
534bc83173 temp work on dynamic directives 2016-01-13 14:03:50 +01:00
Shaofeng Chen
dc427d5a2c add get org by name api 2016-01-12 13:50:56 -08:00
Torkel Ödegaard
44f0242157 fix(build): fixed issue after merge 2016-01-12 15:45:55 +01:00
Torkel Ödegaard
e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard
a15984b663 feat(apps): pages work 2016-01-12 15:39:29 +01:00
Carl Bergquist
f7fecdc6de Merge pull request #3655 from grafana/playlist 
Persistable playlists

closes #515
closes #1137
 2016-01-12 15:20:43 +01:00
bergquist
1ec97e5199 feat(playlist): shortens urls 2016-01-12 14:36:04 +01:00
bergquist
458d15063d fix(playlist): remove invalid logging 2016-01-12 14:28:19 +01:00
bergquist
e8786b0747 feat(playlist): renames timespan to interval 2016-01-12 13:56:47 +01:00
Torkel Ödegaard
ffe1407217 feat(apps): minor progress 2016-01-12 10:20:04 +01:00
Mitsuhiro Tanda
7d8519f5f0 add seoul region 2016-01-12 18:15:29 +09:00
bergquist
b79f04493d style(playlist): abstract DTO creation 2016-01-12 08:36:25 +01:00
bergquist
07fdf6491c fix(playlist): new url for viewing playlist 2016-01-12 08:17:44 +01:00
bergquist
8a38991270 feat(playlist): changes to relation table 
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
 2016-01-12 08:17:44 +01:00
Torkel Ödegaard
e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
Torkel Ödegaard
c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 2016-01-10 21:37:11 +01:00
Torkel Ödegaard
3bb20dbf2e feat(plugins): changed plugin schema, pluginType -> type, type -> id 2016-01-08 23:15:44 +01:00
Torkel Ödegaard
7a8b3c419b feat(apps): lots of progress 2016-01-08 20:57:58 +01:00
Torkel Ödegaard
60e7c6d150 Merge branch 'master' into apps 
Conflicts:
	public/app/partials/sidemenu.html
 2016-01-08 18:10:53 +01:00
bergquist
0918063c55 fix(playlist): move dashboard uri cration to Backend 2016-01-08 16:13:49 +01:00
bergquist
22c001c8a6 fix(playlist): implement api according to new standard 2016-01-08 14:21:30 +01:00
Torkel Ödegaard
f67563e9ee feat(apps): moving things around 2016-01-08 12:45:12 +01:00
Mitsuhiro Tanda
f84737d7d4 (cloudwatch) reuse credentials 2016-01-08 18:13:36 +09:00
Torkel Ödegaard
41a0995db7 feat(apps): minor progress on app meta data 2015-12-22 16:32:17 +01:00
Torkel Ödegaard
ad94f99d57 refactor(apps): more WIP work on apps 2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff Resurrected nikita-graf's work and added playlistType for future use 2015-12-22 02:07:15 -08:00
Torkel Ödegaard
eacc46da6d feat(plugins): WIP on new apps concept 2015-12-21 23:09:27 +01:00
woodsaj
0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin 
Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go
 2015-12-22 00:23:24 +08:00
utkarshcmu
d8b90721b3 Able to display login Id of the user in Last Updated By 2015-12-18 03:38:49 -08:00
utkarshcmu
cb5c1bd24d Removed created_by and fixed gofmt 2015-12-18 02:30:20 -08:00
utkarshcmu
af371249f9 Successfully displayed userdId in UI 2015-12-18 01:52:05 -08:00
utkarshcmu
c433167950 Merged with master, resolved conflicts 2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e Added UI , DB settings 2015-12-18 00:20:23 -08:00
woodsaj
3d15ee6d74 allow app menu items to be selectivly pinned to the left nav menu 2015-12-18 15:10:52 +08:00
woodsaj
48cf56b69a more renaming. also moved apps and datasource menus 2015-12-18 13:46:40 +08:00
woodsaj
c35b51a268 refactor. 
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
 2015-12-17 23:53:58 +08:00
Carl Bergquist
25d93d1041 Merge pull request #3066 from mtanda/cloudwatch_annotation 
(cloudwatch) annotation support
 2015-12-15 13:43:02 +01:00
Torkel Ödegaard
5eab5dc47b feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch 2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7 Merge branch 'external-plugins' 2015-12-15 10:10:48 +01:00
Mitsuhiro Tanda
6fa5e681aa fix EC2RoleProvider parameter 2015-12-15 11:25:20 +09:00
Mitsuhiro Tanda
e631940d9e pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2 2015-12-15 11:25:19 +09:00
Mitsuhiro Tanda
6beb9be42c add CloudWatch Alarm API support 2015-12-15 11:25:15 +09:00
Carl Bergquist
280f9befae Merge pull request #2949 from shoonoise/master 
Add option to hide raintank share button

Fixes #2727
 2015-12-14 17:29:09 +01:00
Torkel Ödegaard
201f50b121 Merge branch 'master' into external-plugins 
Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts
 2015-12-14 17:28:57 +01:00
Carl Bergquist
548ee47aa7 Merge pull request #3122 from shoonoise/hide_signout 
Disable sign out button in case of auth proxy enabled
 2015-12-14 17:18:04 +01:00
carl bergquist
fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
 2015-12-11 15:16:57 +01:00
Mitsuhiro Tanda
c8e894e8f8 sort metrics and dimensions 2015-12-11 17:56:35 +09:00
Mitsuhiro Tanda
d9844350fe update supported metrics and dimensions 2015-12-11 17:42:40 +09:00
Mitsuhiro Tanda
2d9d11a89c reorder supported metrics and dimensions 2015-12-11 17:19:56 +09:00
Mitsuhiro Tanda
6edd6c8f03 add with_credentials to datasource model 2015-12-09 14:44:28 +09:00
Mitsuhiro Tanda
d1ccf83236 (cloudwatch) use paging 2015-12-06 21:35:20 +09:00
woodsaj
3c13901695 add ui elements for plugins. 
This includes support for cusom plugin config directives.
 2015-12-04 19:21:33 +08:00
woodsaj
c4a0fe0234 add pluginBundle backend api methods and SQL storage 2015-12-03 23:43:55 +08:00
woodsaj
bd4cb549d6 add pluginBundle support 
A plugnBundle is meta plugin that has a set of dependent plugins
to enable.  This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
 2015-12-03 15:52:37 +08:00
woodsaj
fd392a2422 Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin 
Conflicts:
	public/views/index.html
 2015-12-03 12:47:58 +08:00
woodsaj
13864853a8 support separate css files for light/dark themes. 2015-12-03 12:29:57 +08:00
Torkel Ödegaard
aa766e3e18 Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins 2015-12-02 18:31:05 +01:00
Torkel Ödegaard
ee0e4d2b69 Merge branch 'master' into external-plugins 
Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html
 2015-12-02 18:30:48 +01:00
woodsaj
1b5c40dd1f add role access limitions for menu items. 
This allows external-plugin menu items to conditionally
be added to the UI depending on the logged in users
current role.
 2015-11-27 16:27:14 +08:00
woodsaj
700b77c450 implement role access checks on external-plugin routes. 2015-11-27 16:26:30 +08:00
shoonoise
5cf3425b93 Disable sign out button in case of auth proxy enabled 2015-11-26 17:56:45 +03:00
Mitsuhiro Tanda
2aabb387b1 fix EC2RoleProvider parameter 2015-11-26 16:01:33 +09:00
Mitsuhiro Tanda
f972863f49 add credential setting to handleDescribeInstances 2015-11-26 13:21:38 +09:00
utkarshcmu
5559ad1238 Return correct updated+created timestamps to frontend 2015-11-21 05:03:00 -08:00
Torkel Ödegaard
4a69de1f30 feat(plugins): made panels work as plugins 2015-11-21 13:46:43 +01:00
Torkel Ödegaard
df0bc7bbc4 feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185 2015-11-20 09:43:10 +01:00
Torkel Ödegaard
69daede583 feat(external plugins): worked on supporting external plugins better 2015-11-19 18:44:07 +01:00
Torkel Ödegaard
f6772bb896 feat(plugins): began work on supporting having plugins outside grafana, for example in grafana data dir, next step is to be able to easily specify what plugins you waant to install 2015-11-19 12:55:13 +01:00
Torkel Ödegaard
b21fa2daa0 Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins 2015-11-19 11:05:27 +01:00
Torkel Ödegaard
7db38c80fc Merge branch 'aws-sdk-go' of https://github.com/mischief/grafana into mischief-aws-sdk-go 2015-11-18 17:16:42 +01:00
Torkel Ödegaard
f0087c93b8 fix(admin settings view): always censor provider_config for system info view, fixes #3268 2015-11-18 15:55:45 +01:00
Torkel Ödegaard
79313aa268 Merge pull request #3253 from mtanda/cloudwatch_ecs 
(cloudwatch) support ECS suggestion
 2015-11-17 14:00:31 +01:00
utkarshcmu
f5db9950f8 fixed gofmt tests 2015-11-16 07:28:38 -08:00
utkarshcmu
9485e8cfee /api/admin/users returns user ID 2015-11-16 06:55:02 -08:00
Mitsuhiro Tanda
22b139d9f8 (cloudwatch) support ECS suggestion 2015-11-16 23:21:43 +09:00
Torkel Ödegaard
32f9f8fcce fix(http api): correct return status code for /api/datasources/:id so it eturns 404 when not found, fixes #3217 2015-11-13 09:43:25 +01:00
woodsaj
d503c5d83d refer to plugins are ExternalPlugin instead of thirdParty 2015-11-11 14:30:07 +08:00
Mitsuhiro Tanda
02a37d670c sort namespaces by alphabetical order 2015-11-11 14:23:43 +09:00
Mitsuhiro Tanda
a7deca1df5 sort regions by alphabetical order 2015-11-11 14:23:38 +09:00
Torkel Ödegaard
5d8a51c307 Merge pull request #3129 from utkarshcmu/validity 
Default AWS Region selection from dropdown
 2015-11-09 22:25:30 +01:00
utkarshcmu
6325635fce Corrected the frontend filename 2015-11-09 12:31:35 -08:00
utkarshcmu
7612e47aee Select AWS region from dropdown 2015-11-09 12:08:40 -08:00
utkarshcmu
f55e24cd12 Added missing AWS Regions 2015-11-09 00:28:16 -08:00
Nick Owens
b0cb6d6d4c pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2 2015-11-07 18:17:05 -08:00
shoonoise
b4a2b96e32 Add options to manage snapshot publishing 2015-10-29 16:40:03 +03:00
Torkel Ödegaard
5d64568f3e refactoring: some minor refactoring and changes to AWS profile PR #3053 2015-10-29 11:44:34 +01:00
Jari Sukanen
23599814a3 cloudwatch: add support for defining AWS profile for CloudWatch datasource 
Add support for defining AWS profile for CloudWatch datasource to support
pulling information from multiple different AWS accounts to single dashboard.

With this change, it is possible to define multiple AWS credentials in
~/.aws/credentials file and connect different data sources to different
AWS accounts.
 2015-10-27 17:00:02 +02:00
Torkel Ödegaard
09b3433e32 change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567 2015-10-26 18:54:32 +01:00
Torkel Ödegaard
da7ae2b0ab fix(build/aws): updated aws dependency and fixed minor build issue, fixes #3026 2015-10-26 12:48:30 +01:00
Torkel Ödegaard
6fecb4bf3e fix(http route): fixed dashboard-solo route to not return 404, fixes #2979 2015-10-20 10:02:56 -04:00
Anthony Woods
cf89b565a6 initial import of thirdParty route support 2015-10-15 04:14:09 +08:00
Torkel Ödegaard
9fc91b7aa1 fixed gofmt issue 2015-10-08 17:30:13 +02:00
Torkel Ödegaard
fe46410c31 Merge branch 'cloudwatch' 2015-10-08 13:09:27 +02:00
Torkel Ödegaard
3d52095765 feat(cloudwatch): restored dimension keys lookup 2015-10-02 20:25:28 +02:00
Torkel Ödegaard
0912cec0e5 feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684 2015-10-02 11:54:35 +02:00
Torkel Ödegaard
180ba33ac8 feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684 2015-10-02 11:10:21 +02:00
Torkel Ödegaard
04f4454974 feat(cloudwatch): lots of code refactoring and cleanup, #684, dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value 2015-10-02 09:04:46 +02:00
Julius Volz
3cc69112c1 Fix "Link to Prometheus" button for proxied Prometheus sources. 2015-10-01 18:23:29 +02:00
Mitsuhiro Tanda
9ae6ac25f5 refactor dataproxy_cloudwatch 2015-09-26 02:33:53 +09:00
Mitsuhiro Tanda
9600b1f103 add ebs_volume_ids() for templating 2015-09-26 02:33:51 +09:00
Torkel Ödegaard
a23217cc6f fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778 2015-09-19 12:32:35 +02:00
woodsaj
3926226417 fix getting default quota as map[string]int64 2015-09-15 20:31:58 +08:00
woodsaj
6488324cf1 enhance quota support. 
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
 2015-09-11 23:17:10 +08:00
woodsaj
47bf1bd21a return 404 when quotas not enabled. 2015-09-11 01:51:12 +08:00
woodsaj
852f9bd277 refactor quota settings 2015-09-11 01:47:33 +08:00
woodsaj
555cbeffa5 allow all users to retrieve org and quota data. 2015-09-11 01:18:36 +08:00
woodsaj
3d4d822528 implement updateQuota function 2015-09-11 01:04:29 +08:00
woodsaj
76e9ebde36 always return after errors. 2015-09-11 01:03:58 +08:00
woodsaj
0688050552 add quota middleware to enforce quotas. issue #321 
Conflicts:
	pkg/api/api.go
 2015-09-11 01:03:47 +08:00
woodsaj
9023171940 inital backend suport for quotas. issue #321 
Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go
 2015-09-11 01:01:36 +08:00
Mehdi Abaakouk
6e532231dc Fix dataproxy_test.go tests 
This change fix dataproxy_test.go tests that was failing with:

pkg/api/dataproxy_test.go:17: not enough arguments in call to NewReverseProxy
pkg/api/dataproxy_test.go:39: not enough arguments in call to NewReverseProxy
FAIL	_/home/ubuntu/grafana/pkg/api [build failed]
 2015-09-10 13:27:49 +00:00
Torkel Ödegaard
9603dce469 feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626 2015-09-09 17:21:25 +02:00
Torkel Ödegaard
fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard
3ed63d09d9 Merge branch 'master' into cloudwatch 2015-09-01 17:25:36 +02:00
Torkel Ödegaard
aa89416bca fix(invite): fixes to org invite stuff, #2630 2015-09-01 12:35:06 +02:00
Torkel Ödegaard
ffbf70af25 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 2015-08-31 15:45:49 +02:00
Torkel Ödegaard
d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard
14884d5a2b feat(signup): progress on new signup flow, #2353 2015-08-30 18:56:53 +02:00
Torkel Ödegaard
de0f04ec3c feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 15:14:24 +02:00
Torkel Ödegaard
24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
Torkel Ödegaard
d25624a8ad feat(signup): began work on new / alternate signup flow that includes email verification, #2353 2015-08-27 13:59:58 +02:00
Torkel Ödegaard
3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
Haneysmith, Nathan
235bbc9c7e custom login hints via config file 2015-08-20 11:15:36 -07:00
Mitsuhiro Tanda
00f76ecaf6 CloudWatch proxy support 2015-08-20 00:51:23 +09:00
Torkel Ödegaard
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +02:00
Torkel Ödegaard
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +02:00
Torkel Ödegaard
6ee0f2c6a7 feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436 2015-08-17 17:07:33 +02:00
Torkel Ödegaard
4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
Torkel Ödegaard
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
Torkel Ödegaard
8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
Torkel Ödegaard
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Torkel Ödegaard
234d1291f9 Merge branch 'invite' 
Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html
 2015-08-11 11:22:43 +02:00
Torkel Ödegaard
1ea0b5371a feat(invite): new user invites are now also added to correct org after sign up is completed, #2353 2015-08-11 10:45:03 +02:00
Torkel Ödegaard
74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
Torkel Ödegaard
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
Torkel Ödegaard
775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
Torkel Ödegaard
19f64bc561 fix(data source proxy): clear proxies request from cookies, fixes #2470 2015-08-10 12:11:18 +02:00
Torkel Ödegaard
0ed4744a33 influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455 2015-08-07 11:02:32 +02:00
Torkel Ödegaard
9d25d2674b fix(invite): fixed link in email 2015-08-04 20:23:04 +02:00
Torkel Ödegaard
5a160f426e feat(invite): trying to get username to work as well 2015-07-29 09:30:23 +02:00
Torkel Ödegaard
6d6af09296 feat(invite): handling of existing org user case when inviting, #2353 2015-07-21 12:18:11 +02:00
Torkel Ödegaard
ab54971763 feat(invite): more progress on completing invite form and actually creating a real user, #2353 2015-07-20 17:46:48 +02:00
Torkel Ödegaard
d75f96fdd5 feat(invite): more progress on invited / sigup view, #2353 2015-07-20 15:52:49 +02:00
Torkel Ödegaard
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26:49 +02:00
Torkel Ödegaard
3242354a4b feat(invite): worked on pending invitations list, revoke invite now works, #2353 2015-07-20 10:57:39 +02:00
Torkel Ödegaard
4ac652b127 feat(invite): began work on invited signup view, also added backdrop to login view, #2353 2015-07-19 12:34:03 +02:00
Torkel Ödegaard
6088f83408 feat(invite): inital pass on sending new user invite email, #2353 2015-07-18 17:39:12 +02:00
Torkel Ödegaard
e92f2ecea1 feat(invite): existing grafana users now result in new org user directly, no temp user is created, #2353 2015-07-18 11:43:34 +02:00
Torkel Ödegaard
2724cf5db8 feat(invite): small progress 2015-07-17 14:42:49 +02:00
Torkel Ödegaard
0ffcce1b5d feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353 2015-07-17 09:51:34 +02:00
Torkel Ödegaard
0b5ba55131 feat(ldap): work on reading ldap config from toml file, #1450 2015-07-15 10:08:23 +02:00
Torkel Ödegaard
bfe7b77313 More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450 2015-07-13 14:23:59 +02:00
Torkel Ödegaard
0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
Dieter Plaetinck
66ba19b7ba clearer errors 
"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
 2015-07-08 08:55:31 +02:00
Donn Pebe
df33cbc8c5 Fix wrong metrics counter 2015-06-30 12:52:55 +07:00
Torkel Ödegaard
24bab47f14 fix(create org): Anonymous user can no longer create org, Fixes #2227 2015-06-25 17:06:43 +02:00
Torkel Ödegaard
3f917b0af5 Updated org creation view, after creating new org user is switched to that org and redirect to org details view, Closes #2198 2015-06-22 08:13:21 +02:00
Torkel Ödegaard
fb7b475457 Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163 2015-06-19 14:42:55 -04:00
Torkel Ödegaard
3675b3fcaa Fixed issue with clearing admin permissions, Fixes #2143 2015-06-11 08:29:12 +02:00
Torkel Ödegaard
5962bcbc6c Do not show create org link when allow_org_create is set to false, Fixes #2135 2015-06-11 08:16:09 +02:00