Commits · 597103a1f23f0a28d91fe46db95cc3c98015381e · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

12 Aug, 2016 5 commits
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 597103a1
  Torkel Ödegaard committed Aug 12, 2016
  
  597103a1 Browse Files
- feat(thresholds): refactoring and adding many unit tests · 06210a4a
  Torkel Ödegaard committed Aug 12, 2016
  
  06210a4a Browse Files
- chore(notifications): remove commented test · 1dcae464
  bergquist committed Aug 12, 2016
  
  1dcae464 Browse Files
- feat(alerting): add alert message to slack integration · 16e75a30
  bergquist committed Aug 12, 2016
  
  16e75a30 Browse Files
- fix(metrics): typo · e7613b8b
  bergquist committed Aug 12, 2016
  
  e7613b8b Browse Files
11 Aug, 2016 18 commits
- feat(thresholds): more work on thresholds, within and outside types no work · 895cff78
  Torkel Ödegaard committed Aug 11, 2016
  
  895cff78 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 7a5dda9e
  Torkel Ödegaard committed Aug 11, 2016
  
  7a5dda9e Browse Files
- feat(thresholds): dragging thresholds works again · 6793eed6
  Torkel Ödegaard committed Aug 11, 2016
  
  6793eed6 Browse Files
- feat(thresholds): updated design for grab handles · 224ceb0a
  Torkel Ödegaard committed Aug 11, 2016
  
  224ceb0a Browse Files
- feat(alerting): add global usage metrics for alerting · 93772649
```
closes #5786
```
  bergquist committed Aug 11, 2016
  93772649 Browse Files
- feat(thresholds): lots of progress on thresholds · 89ca15f3
  Torkel Ödegaard committed Aug 11, 2016
  
  89ca15f3 Browse Files
- Merge branch 'master' into alerting · ae15de11
  bergquist committed Aug 11, 2016
  
  ae15de11 Browse Files
- fix(metrics): hide none existing metrics settings · f07b2ac4
  bergquist committed Aug 11, 2016
  
  f07b2ac4 Browse Files
- test(alerting): fixes broken unit test · cb6fd4ca
  bergquist committed Aug 11, 2016
  
  cb6fd4ca Browse Files
- feat(alerting): add support for uploading images to webdav. · 99e99922
```
closes #5770
```
  bergquist committed Aug 11, 2016
  99e99922 Browse Files
- feat(thresholds): more work thresholds · 72a67b39
  Torkel Ödegaard committed Aug 11, 2016
  
  72a67b39 Browse Files
- Merge branch 'alerting' into thresholds_v3 · 6881db87
  Torkel Ödegaard committed Aug 11, 2016
  
  6881db87 Browse Files
- Merge branch 'master' into alerting · 8878a55d
  Torkel Ödegaard committed Aug 11, 2016
  
  8878a55d Browse Files
- Merge branch 'v3.1.x' · da6ac07b
  Torkel Ödegaard committed Aug 11, 2016
  
  da6ac07b Browse Files
- fix(graphite): minor fix/improvement to graphite error handling when doing… · 0d26bc63
```
fix(graphite): minor fix/improvement to graphite error handling when doing metric exploration in query editor, fixes #5778
```
  Torkel Ödegaard committed Aug 11, 2016
  0d26bc63 Browse Files
- fix(docs): fixed plugins docs, fixes #5777 · 780ec92d
  Torkel Ödegaard committed Aug 11, 2016
  
  780ec92d Browse Files
- Mac grafana wrapper script (#5779) · 7150571e
```
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
```
  Jeremy Bingham committed Aug 11, 2016
  7150571e Browse Files
- Mac grafana wrapper script (#5779) · 2c4ab4af
```
* One of the homebrew folks first asked for a wrapper script to make launching grafana easier. Later I was asked to remove it and submit it upstream, so here it is.

* add instructions for installing grafana HEAD from git with homebrew back to the docs
```
  Jeremy Bingham committed Aug 11, 2016
  2c4ab4af Browse Files
10 Aug, 2016 17 commits
- feat(alerting): making progress on alert handles · fbb8f8e6
  Torkel Ödegaard committed Aug 10, 2016
  
  fbb8f8e6 Browse Files
- fix(threshold): remove old threshold properties · 2639c389
  Torkel Ödegaard committed Aug 10, 2016
  
  2639c389 Browse Files
- feat(thresholds): migration from previous threshold schema · bdb8d775
  Torkel Ödegaard committed Aug 10, 2016
  
  bdb8d775 Browse Files
- Explicitly set charset to utf-8 in viewJson(), fixes #5719. (#5774) · 124961a9
  Alexander Zobnin committed Aug 10, 2016
  
  124961a9 Browse Files
- feat(thresholds): new thresholds options are looking ok · 7c067579
  Torkel Ödegaard committed Aug 10, 2016
  
  7c067579 Browse Files
- feat(thresholds): adding a new form of thresholds options · 0f8c8517
  Torkel Ödegaard committed Aug 10, 2016
  
  0f8c8517 Browse Files
- feat(alerting): implement more simple reducers · 95c1a4a9
  bergquist committed Aug 10, 2016
  
  95c1a4a9 Browse Files
- test(alerting): add tests for simple reducer · f2436fc7
  bergquist committed Aug 10, 2016
  
  f2436fc7 Browse Files
- Merge branch 'master' into alerting · 4fd8b2ac
  Torkel Ödegaard committed Aug 10, 2016
  
  4fd8b2ac Browse Files
- Merge branch 'v3.1.x' · a56cf9d6
  Torkel Ödegaard committed Aug 10, 2016
  
  a56cf9d6 Browse Files
- fix(dashboard): fixed drag and drop issue in chrome, fixes #5767 · 9a7e0eaf
  Torkel Ödegaard committed Aug 10, 2016
  
  9a7e0eaf Browse Files
- fix(metrics): make metrics cfg backwards compatible · 03f0bc46
  bergquist committed Aug 10, 2016
  
  03f0bc46 Browse Files
- Merge branch 'v3.1.x' · c5d0c9f0
  Torkel Ödegaard committed Aug 10, 2016
  
  c5d0c9f0 Browse Files
- docs(): update mac docs · c0301349
  Torkel Ödegaard committed Aug 10, 2016
  
  c0301349 Browse Files
- fix(docs): minor doc fixes, fixes #5751 · 624e30e7
  Torkel Ödegaard committed Aug 10, 2016
  
  624e30e7 Browse Files
- feat(graph tooltip): refactoring PR #3063 · d95545b5
  Torkel Ödegaard committed Aug 10, 2016
  
  d95545b5 Browse Files
- Merge branch 'issue-3063' of https://github.com/alexanderzobnin/grafana into… · 34804bda
```
Merge branch 'issue-3063' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-issue-3063
```
  Torkel Ödegaard committed Aug 10, 2016
  34804bda Browse Files