Commits · 5cf97118624deac7fc3dcb032577478e8061b6aa · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

18 Aug, 2016 7 commits
- feat(alerting): added eval match to test results · 5cf97118
  Torkel Ödegaard committed Aug 18, 2016
  
  5cf97118 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 2f953d75
  Torkel Ödegaard committed Aug 18, 2016
  
  2f953d75 Browse Files
- feat(alerting): alert list fixes · 9028d489
  Torkel Ödegaard committed Aug 18, 2016
  
  9028d489 Browse Files
- feat(alerting): only show available queries in alert query · 631acc2b
  bergquist committed Aug 18, 2016
  
  631acc2b Browse Files
- feat(alerting): added alert howto text, closes #5784 · 9b5a7b5e
  Torkel Ödegaard committed Aug 18, 2016
  
  9b5a7b5e Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 902314d3
  Torkel Ödegaard committed Aug 18, 2016
  
  902314d3 Browse Files
- feat(alerting): added validation that checks valid data source and checks for… · 75a6c2b6
```
feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841
```
  Torkel Ödegaard committed Aug 18, 2016
  75a6c2b6 Browse Files
17 Aug, 2016 17 commits
- tech(alerting): empty string does not update database · 6d080904
  bergquist committed Aug 17, 2016
  
  6d080904 Browse Files
- feat(alerting): handle all results, even due they have errors · 4154a406
```
DON'T SWALLOW THE ERR CARL
```
  bergquist committed Aug 17, 2016
  4154a406 Browse Files
- fix(alerting): cleanup alerting example dashboard · 158ce061
  bergquist committed Aug 17, 2016
  
  158ce061 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · eabba50b
  Torkel Ödegaard committed Aug 17, 2016
  
  eabba50b Browse Files
- feat(alerting): some final changes to alert list #5784 · 2e7cb044
  Torkel Ödegaard committed Aug 17, 2016
  
  2e7cb044 Browse Files
- feat(alerting): working on alert state filters for alert list · 63a283b4
  Torkel Ödegaard committed Aug 17, 2016
  
  63a283b4 Browse Files
- tech(alerting): remove old crit/warn properties from dashboard · 7d1e5b63
  bergquist committed Aug 17, 2016
  
  7d1e5b63 Browse Files
- tech(alerting): add example dashboard with many alerts · d8cfe223
  bergquist committed Aug 17, 2016
  
  d8cfe223 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · da59d654
  Torkel Ödegaard committed Aug 17, 2016
  
  da59d654 Browse Files
- Merge branch 'master' into alerting · 05697d5e
```
Conflicts:
	conf/sample.ini
```
  Torkel Ödegaard committed Aug 17, 2016
  05697d5e Browse Files
- Merge branch 'v3.1.x' · 6fae5a3b
  Torkel Ödegaard committed Aug 17, 2016
  
  6fae5a3b Browse Files
- fix(metrics): restored prefix default to prod.grafana.. · 093563ac
  Torkel Ödegaard committed Aug 17, 2016
  
  093563ac Browse Files
- Merge branch 'v3.1.x' · f9b628ad
```
Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go
```
  Torkel Ödegaard committed Aug 17, 2016
  f9b628ad Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 2b2b6486
  Torkel Ödegaard committed Aug 17, 2016
  
  2b2b6486 Browse Files
- fix(OpenTSDB): correct content-type, fixes #4965 · 159ea69e
  Torkel Ödegaard committed Aug 17, 2016
  
  159ea69e Browse Files
- feat(alerting): save execution error upon state changed · 6497b307
  bergquist committed Aug 17, 2016
  
  6497b307 Browse Files
- feat(alerting): adds sql layer for saving execution errors · 9915f15e
  bergquist committed Aug 17, 2016
  
  9915f15e Browse Files
16 Aug, 2016 13 commits
- Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x · 0951da9c
  Torkel Ödegaard committed Aug 16, 2016
  
  0951da9c Browse Files
- feat(inspector): fixed error handling, showing response body when data proxy returns text/html body · a5f0f508
  Torkel Ödegaard committed Aug 16, 2016
  
  a5f0f508 Browse Files
- feat(alerting): changed fontsize in alert list · 434332f0
  Torkel Ödegaard committed Aug 16, 2016
  
  434332f0 Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · 15c11fdb
  Torkel Ödegaard committed Aug 16, 2016
  
  15c11fdb Browse Files
- feat(alerting): minor progress on alert list, #5784 · 0b7fa3c1
  Torkel Ödegaard committed Aug 16, 2016
  
  0b7fa3c1 Browse Files
- tech(docker): add default db for postgres · de714e33
  bergquist committed Aug 16, 2016
  
  de714e33 Browse Files
- style(alerting): improve codestyle for evaluators · c7cb93a3
  bergquist committed Aug 16, 2016
  
  c7cb93a3 Browse Files
- feat(alerting): adds within_range and outside_range evaluators · fb7f2ae2
```
closes #5829
```
  bergquist committed Aug 16, 2016
  fb7f2ae2 Browse Files
- test(alerting): fix broken tests · b5d92b61
  bergquist committed Aug 16, 2016
  
  b5d92b61 Browse Files
- feat(alerting): fixing failing go unit test · 6b90587d
  Torkel Ödegaard committed Aug 16, 2016
  
  6b90587d Browse Files
- feat(alerting): fixing failing typescript build · 65ce01fb
  Torkel Ödegaard committed Aug 16, 2016
  
  65ce01fb Browse Files
- Merge branch 'alerting' of github.com:grafana/grafana into alerting · fe9d591b
```
Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
```
  Torkel Ödegaard committed Aug 16, 2016
  fe9d591b Browse Files
- feat(alerting): making progress on alerting list, #5784 · f934081b
  Torkel Ödegaard committed Aug 16, 2016
  
  f934081b Browse Files
15 Aug, 2016 3 commits
- feat(alerting): make post execution fields nullable · aaabdbe3
  bergquist committed Aug 15, 2016
  
  aaabdbe3 Browse Files
- fix(alerting): rename events to evalMatches · 2c2157f3
  bergquist committed Aug 15, 2016
  
  2c2157f3 Browse Files
- InfluxDB data source: Removed 'required' attribute from User/Password (#5820) · 08932b8e
  Claudius Zingerli committed Aug 15, 2016
  
  08932b8e Browse Files