IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,124 Commits 5,454 Branches 554 Tags 1.9 GiB
100ab0ba23
Commit Graph

304 Commits

Author SHA1 Message Date
Torkel Ödegaard
1b6be031e5 ux: dashboard settings progress 2017-12-08 15:53:26 +01:00
Torkel Ödegaard
9369a87e93 Merge branch 'develop' into develop-settings 2017-12-08 14:32:15 +01:00
Torkel Ödegaard
2bc23d2063 tech: updated ngreact and with custom PR applied 2017-12-08 12:26:19 +01:00
Torkel Ödegaard
87ceeb0898 fix: v5 sidemenu & link to shortcuts now works, fixes #10087 2017-12-07 16:58:57 +01:00
Torkel Ödegaard
68dab71275 refactor: sidemenu toggle & hiding logic 2017-12-07 16:25:21 +01:00
Marcus Efraimsson
d0a9770b8b dashboard: fix edge case with keyboard nav in dashboard search. #10100 
If expanding a folder using mouse, unselect current keyboard selection
 2017-12-07 11:14:43 +01:00
Marcus Efraimsson
cb0dac11a3 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-06 20:35:16 +01:00
Marcus Efraimsson
f87b9aaa8a dashboard: keyboard nav in dashboard search - closes #10100 
Pressing enter/return for a folder toggles it.
Pressing enter/return for a dashboard navigates to it.
 2017-12-06 20:34:41 +01:00
Johannes Schill
e8807f4bce Fixing tabs for Grafana 5 - #10082 (#10103) 
* ux: Make new tabs responsive #10082

* ux: Add possibility to manipulate url in angular router outside of angular - and use it in the responsive navigation #10082
 2017-12-06 17:36:44 +01:00
Marcus Efraimsson
dd3c9da009 dashboard: Dashboard folder page wip #10083 2017-12-06 14:11:25 +01:00
Daniel Lee
781349d360 dashboard: dashboard search results component. closes #10080 2017-12-05 14:20:44 +01:00
Daniel Lee
66657d24b8 sidemenu: responsive sidemenu view for smallest breakpoint 
For the smallest breakpoint, expands the sidemenu to be width 100% and
to be toggled on or off rather than visible all the time.
 2017-12-04 12:37:00 +01:00
Torkel Ödegaard
d7337432ac ux: progress on time picker dropdown version 2017-12-03 07:53:47 +01:00
Marcus Efraimsson
8f4ad1e496 dashlist: handle recent dashboards removed from backend 2017-11-28 09:07:28 +01:00
Torkel Ödegaard
7f3a3b9e55 search fix and update buttons on dashboard list page 2017-11-27 14:49:31 +01:00
Torkel Ödegaard
00df24b348 ux: search progress 2017-11-24 16:54:55 +01:00
Torkel Ödegaard
bc81298d4c worked on search 2017-11-24 16:18:56 +01:00
Daniel Lee
41a3431c4e dashlist: starred filter search 2017-11-22 18:44:57 +01:00
Daniel Lee
bd2b26e9f5 dashlist: fix tag filtering and some css 2017-11-21 14:47:19 +01:00
Daniel Lee
8daff73ba2 dashlist: started fixing js/css after design changes 2017-11-20 18:15:59 +01:00
Torkel Ödegaard
a8552bac21 more work on search 2017-11-20 16:21:50 +01:00
Torkel Ödegaard
c1539b90b7 minor update to dashboard search 2017-11-20 15:46:16 +01:00
Torkel Ödegaard
9ace21b689 improved search srv 2017-11-20 15:11:32 +01:00
Torkel Ödegaard
6c5e19c1e0 dashboard search 2017-11-20 13:37:26 +01:00
Torkel Ödegaard
fc1d8416a7 working on dashboard search 2017-11-20 12:47:03 +01:00
Torkel Ödegaard
0fe4229023 Merge branch 'develop' into develop-search 2017-11-17 16:37:09 +01:00
Torkel Ödegaard
0e44fe082b Merge branch 'master' into develop 2017-11-17 15:49:17 +01:00
Torkel Ödegaard
3ae0cfa1d0 graphite: minor changes 2017-11-16 14:16:37 +01:00
Torkel Ödegaard
c1fcfdb536 search: began writing test for new search 2017-11-02 16:54:33 +01:00
Torkel Ödegaard
10fcf2f5be Merge branch 'master' into develop 2017-11-02 15:56:09 +01:00
Patrick O'Carroll
c8f7361e3f converted ng_model_on_blur.js to ts, deletedkeyboard_manager.js (#9676) 2017-11-01 07:51:40 +01:00
Torkel Ödegaard
3e3cef28ec fix: undefined is not an object evaluating this., #9538 2017-10-28 13:28:06 +02:00
Torkel Ödegaard
9605ab4475 Merge branch 'master' into develop 2017-10-26 15:59:50 +02:00
Patrick O'Carroll
c84e3c00fe converted analytics.js to ts, minor code formatting fix to timer.ts (#9663) 2017-10-26 13:22:45 +02:00
Torkel Ödegaard
74fcb2494a prometheus: fixed unsaved changes warning when changing time range due to step option on query model was changed in datasource.query code, fixes #9675 2017-10-26 11:46:33 +02:00
Patrick O'Carroll
4b5929d577 converted timer.js to timer.ts (#9656) 2017-10-25 12:32:19 +02:00
Torkel Ödegaard
68562a2077 Merge branch 'master' into develop 2017-10-24 11:02:48 +02:00
Patrick O'Carroll
a8285d0eb4 shore: migrating config/settings.js to typescript 2017-10-24 10:45:46 +02:00
Torkel Ödegaard
0c31d23086 grid: fixed grid width issues 2017-10-13 15:11:05 +02:00
Daniel Lee
0f6270098b dashboard: fixes for panels without rows 2017-10-11 16:09:05 +02:00
Torkel Ödegaard
d38c891fac merge with master 2017-10-02 14:14:45 +02:00
Torkel Ödegaard
0c86241c5b Webpack (#9391) 
* webpack poc, this is not going to work for plugins, dam

* tech: webpack and systemjs for plugins starting to work

* tech: webpack and systemjs combo starting to work

* tech: webpack + karma tests progress

* tech: webpack + karma progress

* tech: working on tests

* tech: webpack

* tech: webpack + karma, all tests pass

* tech: webpack + karma, all tests pass

* tech: webpack all tests pass

* webpack: getting closer

* tech: webpack progress

* webpack: further build refinements

* webpack: ng annotate fixes

* webpack: optimized build fix

* tech: minor fix for elasticsearch

* tech: webpack + ace editor

* tech: restored lodash move mixin compatability

* tech: added enzyme react test and upgraded to react v16

* tech: package version fix

* tech: added testdata to built in bundle

* webpack: sass progress

* tech: prod & dev build is working for the sass

* tech: clean up unused grunt stuff and moved to scripts folder

* tech: added vendor and manifest chunks, updated readme and docs

* tech: webpack finishing touches
 2017-10-01 20:02:25 +02:00
Torkel Ödegaard
7aa753a25f tech: migrating elasticsearch to typescript 2017-09-28 12:52:39 +02:00
Torkel Ödegaard
18337f610d Merge branch 'master' into develop 2017-09-22 08:42:07 +02:00
Torkel Ödegaard
b8d9722b4f tech: removing unused variables from typescript files, and making tslint rules more strict 2017-09-21 16:40:18 +02:00
Torkel Ödegaard
a9e3130ef6 Merge branch 'master' into develop 2017-09-13 16:06:34 +02:00
Torkel Ödegaard
f6100dd8eb ux: success/error alerts refactoring, #9214 2017-09-12 09:05:32 +02:00
Patrick O'Carroll
90602942f5 New alert design (#9214) 
* ux: updated alert design

* fixed bg-color for alerts

* more changes to alerts, index fixed
 2017-09-12 08:01:44 +02:00
Torkel Ödegaard
a38ded9e7e Merge branch 'master' into develop-newgrid-row-design2 2017-09-07 15:05:41 +02:00
Carl Bergquist
62979916ad Merge pull request #8876 from mtanda/shortcut_new_dashboard 
add new dashboard shortcut
 2017-09-07 14:26:05 +02:00
Torkel Ödegaard
4f9fbcc211 dataproxy: added caching of datasources when doing data proxy requests, #9078 2017-08-23 13:31:26 +02:00
Daniel Lee
bbf9d7677b Merge branch 'v4.4.x' 2017-08-21 21:05:43 +02:00
Daniel Lee
a31d0df897 shortcuts: fixes expand/collapse all rows 
Fixes #9069
 2017-08-21 21:04:20 +02:00
Torkel Ödegaard
4dd4631b87 ux: sidemenu toggling 2017-08-17 14:00:41 +02:00
Torkel Ödegaard
a4da0adf38 ux: switching orgs now works through modal 2017-08-16 15:37:13 +02:00
Torkel Ödegaard
1dab313ca3 Merge branch 'master' into develop 2017-08-14 10:30:36 +02:00
Torkel Ödegaard
68c4ce34d5 fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510 2017-08-08 17:08:35 +02:00
Jesse White
f547c93a4f fix: hide modals when pressing Esc, fixes #8988 (#8994) 2017-08-07 09:23:33 +02:00
Torkel Ödegaard
9fb60c2fc8 Merge branch 'develop' into panel-title-menu-ux 2017-08-02 09:56:08 +02:00
Mitsuhiro Tanda
e8157f01ec add new dashboard shortcut 2017-07-19 17:54:34 +09:00
Jesse White
1940b33dc1 fix: handling of http errors without any data (#8777) 2017-07-04 22:55:13 +02:00
Torkel Ödegaard
fc69d59cae dashboard folder search fix 2017-06-23 16:00:26 -04:00
Torkel Ödegaard
a4910c7aea merging new-sidenav 2017-06-22 18:11:29 -04:00
Daniel Lee
1e064f6c19 WIP: first draft of permissionlist panel 
for folder home page
 2017-06-21 22:28:10 +02:00
Torkel Ödegaard
e63fa9c83c Merge branch 'master' into dashboard_folders 2017-06-15 16:23:10 -04:00
Torkel Ödegaard
3e8937e53b Merge branch 'master' into new-sidemenu 2017-06-14 10:00:43 -04:00
Torkel Ödegaard
9ff4ab1236 Merge branch 'master' into query_troubleshooting 2017-06-13 16:47:04 -04:00
Torkel Ödegaard
5061b3c691 ux: nav experiments 2017-06-12 21:11:22 +02:00
Daniel Lee
5c89c4b2bd WIP: dashlist in template for new folder 2017-06-12 15:49:09 +02:00
Daniel Lee
1e865211c9 WIP: Create new dashboard button in dash search 2017-06-12 15:49:09 +02:00
Daniel Lee
06a15eec5c WIP: permissions moved to settings tab. Adds folder dropdown to general settings tab 2017-06-12 15:49:09 +02:00
Torkel Ödegaard
fdfcd5cbf0 refactoring:: dashboard save modal and save as modal needed an update 2017-06-05 14:56:11 +02:00
Torkel Ödegaard
f3980504e2 Merge branch 'master' into walmartlabs-master 2017-06-05 13:43:00 +02:00
Torkel Ödegaard
e9d5e037e8 ux: merge branch navbarv2, new navbar with dashboard search available on all pages, closes #6475 2017-06-02 14:00:42 +02: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
Torkel Ödegaard
d840645dd7 feat: metrics tab, minor change 2017-05-20 23:03:04 +02:00
Torkel Ödegaard
86ce3d5e45 feat: in app query request & response troubleshooting 2017-05-17 17:02:50 +02:00
Konstantin Koniev
9566197620 Internationalise keybindings. (#8311) 2017-05-12 14:59:56 +02:00
Vladimir Gordiychuk
deab4a378a bug: MetricSegment lost information about type (#8278) 
Fixed #8277
 2017-05-03 08:22:30 +02:00
Torkel Ödegaard
f1276774a0 typescript: updated tslint and fixed new warnings 2017-04-20 11:16:37 +02:00
Torkel Ödegaard
60ef7d8768 Merge branch 'master' into create-annotations 2017-04-14 22:36:34 +02:00
Torkel Ödegaard
aa47b9bf5c refactoring: simplified backend_srv and subUrl handling, #8122 2017-04-14 19:01:08 +02:00
Torkel Ödegaard
b77991f69b refactoring: minor changes to #8122 2017-04-14 16:00:52 +02:00
Dan Cech
f490c5f12c use X-Grafana-Org-Id header to ensure backend uses correct org (#8122) 2017-04-14 15:47:39 +02:00
Torkel Ödegaard
ea92ddccb3 create annotations progress 2017-04-14 12:46:02 +02:00
Torkel Ödegaard
ff426ae9a3 more work on annotations 2017-04-14 12:23:32 +02:00
Torkel Ödegaard
dbe5480edc create annotations work 2017-04-14 11:41:02 +02:00
Torkel Ödegaard
2f61fc6afe ux: made progress on popover forms 2017-04-13 18:39:49 +02:00
Torkel Ödegaard
dbeeb32ab6 Merge branch 'master' into popover-forms 2017-04-13 16:22:08 +02:00
Torkel Ödegaard
752b42798a annotations: added new options hide toggle, and show option 2017-04-12 15:01:17 +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
48c4e549f5 Revert "support panel repeat for datasource template variable (#7711)" 
This reverts commit 554f972a25.
 2017-04-04 09:28:33 +02:00
Torkel Ödegaard
f77f8ebfc6 heatmap: changes to color spectrum, inverted some on dark theme 2017-03-31 17:12:50 +02:00
Mitsuhiro Tanda
554f972a25 support panel repeat for datasource template variable (#7711) 
* support panel repeat for datasource template variable

* support All option
 2017-03-31 07:31:15 +02:00
bergquist
9ed1d12cc0 style: use for loops over _.each in typescript 2017-02-22 10:36:30 +01:00
bergquist
e828f3a97b shortcuts: change init bind key to d 2017-02-22 10:32:30 +01:00
Mitsuhiro Tanda
5a30b08b14 add keyboard shotcuts for collapse/expand rows 2017-02-22 09:30:56 +01:00
Daniel Lee
e5f5c1724a templating: check for default data source (#7636) 
For data source template variables, check if the
selected value is default and if so load the
default data source.

Fixes #7586
 2017-02-21 17:27:21 +01:00
Torkel Ödegaard
902cf5f889 fix(): google analytics fix 2017-02-15 14:26:57 +01:00
Daniel Lee
8aa5b62d6d fix(panel): case insensitive sort metric sources 
Sorts the list of metric sources that is used in dropdown for Panel
Data Source on the Metrics tab so that it is case insensitive and
so that the built data sources are last in the list.
 2017-02-08 00:01:42 +01:00
jifwin
9e7df648b5 Fix requests cancelling (#7457) 
* fix backendSrv request cancelling

* revert imports

* formatting
 2017-02-06 06:42:26 +01:00
Torkel Ödegaard
49fe74228b fix(browser history): fixes and enhancements to browser history, it now works properly again AND it can restore previous time ranges in dashboards, closes #7259 2017-01-13 17:37:53 +01:00
Mitsuhiro Tanda
4b567e35d5 suppress refresh when user is inactive (#7219) 2017-01-11 19:46:34 +01:00
Torkel Ödegaard
9c0f7f547b fix(alerts): added alert listener for appEvents 2017-01-11 19:40:05 +01:00
Torkel Ödegaard
e72a60bbf5 feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894 2016-12-14 14:33:33 +01:00
Torkel Ödegaard
faf6a5fd36 fixed issue in metric segment and option lookup, #6912 2016-12-14 10:50:48 +01:00
Gabriel Nepomuceno
f3ebd2d849 upgrading bases and correcting identation missing tslint 2016-12-09 14:57:25 +00:00
Torkel Ödegaard
dee6b7d150 Merge branch 'master' into getting-started-panel 2016-12-08 08:51:40 +01:00
Torkel Ödegaard
fa393c282a feat(graph): refactoring shared tooltip PR #6274 2016-12-06 11:55:20 +01:00
Torkel Ödegaard
f9fba0e935 fix(timerange): fixed time range zoom out shortcut, fixes #6837 2016-12-06 07:42:22 +01: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
Torkel Ödegaard
d38de2cc8b ux(view/kiosk mode): added view mode and kiosk mode, #6476 2016-11-05 14:23:37 +01:00
Torkel Ödegaard
3cc4a194a9 ux(keybindings): polish help modal with keybindings, #6465 2016-11-04 17:19:03 +01:00
Torkel Ödegaard
2fa7100c3b ux(dashboard): lots of tweaks and polish to row menu, added remove X to add panel and row option views, #6442 2016-11-04 11:43:49 +01:00
Torkel Ödegaard
abf1f6a163 ux(dashboard): added back hide controls toggle and shortcut, #6442 2016-11-03 22:39:59 +01:00
Torkel Ödegaard
98be1734fa ux(dashboard): refining new row slide out menu, #6442 2016-11-03 22:14:29 +01:00
Torkel Ödegaard
82592f0c13 ux(help): began work on new help modal 2016-11-03 20:32:36 +01:00
Torkel Ödegaard
3e712178cc ux(dashboard): began removing build mode and adding new slide out row menu 2016-11-03 15:50:11 +01:00
Torkel Ödegaard
f91e067235 ux(dashboard): keybinding changes / new, #6442 2016-11-03 15:14:44 +01:00
Torkel Ödegaard
e80241b5f4 ux(dashboard): minor tweaks 2016-11-03 13:19:40 +01:00
Torkel Ödegaard
e23f898418 ux(dashboard): minor tweaks and polish, added g a shortcut for go to alerting list 2016-11-02 22:08:17 +01:00
Torkel Ödegaard
cdea420285 ux(dashboard): fixes for changing panel tabs, #6442 2016-11-02 21:45:46 +01:00
Torkel Ödegaard
47aae7f1f2 ux(dashboard): added more shortcusts to v/edit panel, #6442 2016-11-02 17:03:14 +01:00
Torkel Ödegaard
95e7ead89b ux(dashboard): varius dashboard ux fixes and keybinding improvements, press 'e' while hovering over panel will open dashboard in edit mode, pressing 'd' will remove panel, #6442 2016-11-02 15:16:48 +01:00
Torkel Ödegaard
19509d1e7a ux(dashboard): minor fix, #6442 2016-11-02 13:49:12 +01:00
Torkel Ödegaard
40ea014fa8 ux(dashboar): added shortcut for build mode, switched keybinding lib to mousetrap, supports sequences so also added for Go to home dashboard, open search with starred dashbords prefiltered, go to profile, #6442 2016-11-02 12:55:58 +01:00
Torkel Ödegaard
3bbc940b88 Merge branch 'master' into graph-panel-non-timeseries 2016-09-23 14:22:44 +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
Torkel Ödegaard
f3d4a97f49 Merge branch 'master' into graph-panel-non-timeseries 2016-09-22 14:03:06 +02:00
Torkel Ödegaard
5ded88fa4d feat(templating): progress on variable system refactoring, #6048 2016-09-19 11:34:08 +02:00
Torkel Ödegaard
e2f5bf1666 feat(alerting): fixed confirm delete dashboard issue 2016-09-05 13:38:25 +02:00
Torkel Ödegaard
395213abd7 feat(graph panel): more refactoring of #5917 2016-09-05 11:46:16 +02:00
Torkel Ödegaard
05697d5ecd Merge branch 'master' into alerting 
Conflicts:
	conf/sample.ini
 2016-08-17 10:03:33 +02:00
Torkel Ödegaard
a5f0f508ea feat(inspector): fixed error handling, showing response body when data proxy returns text/html body 2016-08-16 22:31:26 +02:00
Torkel Ödegaard
8878a55dc6 Merge branch 'master' into alerting 2016-08-11 10:31:15 +02:00
Torkel Ödegaard
0d26bc63ae fix(graphite): minor fix/improvement to graphite error handling when doing metric exploration in query editor, fixes #5778 2016-08-11 10:29:28 +02:00
Torkel Ödegaard
f6a160b270 feat(alerting): testing alert is starting to work 2016-07-21 13:09:12 +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
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
d44325affd feat(apps): progress on app dashboard imports 2016-07-08 09:35:06 +02:00
Torkel Ödegaard
ae8fabdad3 fix(modal): fixed duplicate confirm modal issue 2016-06-29 14:26:21 -07:00
Torkel Ödegaard
b275fa8109 fix(alerts): fixed login and other alert popups not showing, fixes #5435 2016-06-25 17:42:08 +02:00
bergquist
8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +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
6d3521c240 Merge branch 'cancel-in-flight-repeats' of https://github.com/stuartnelson3/grafana into stuartnelson3-cancel-in-flight-repeats 2016-06-16 08:57:31 +02:00
stuart nelson
8797be9f89 Add existence check for canceler. 2016-06-09 15:16:53 +02:00
stuart nelson
cc64d65c2f Rename cacheKey to exprID/requestID 
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
 2016-06-09 12:57:55 +02:00
stuart nelson
efdb990e56 Return an error for a canceled request. 
Allow the datasource to decide how to handle a
canceled request.
 2016-06-09 12:13:17 +02:00
stuart nelson
6da7ed9706 Add support for canceling in-flight requests 
Repeat requests, if they already exist in the
in-flight request map, will cause the previous
request to cancel.

The implementation of the unique key is the
responsibility of individual datasources.
 2016-06-08 18:04:31 +02:00