Commits · 63a283b4bc76a90c00f6a9f6b3c649fbfc3f29c2 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

17 Aug, 2016 10 commits
- feat(alerting): working on alert state filters for alert list · 63a283b4
  Torkel Ödegaard committed Aug 17, 2016
  
  63a283b4 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 17 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
- Merge branch 'query_part_refactor' into alerting · 9f29c541
```
Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go
```
  Torkel Ödegaard committed Aug 15, 2016
  9f29c541 Browse Files
- feat(alerting): can now change reducer · d8d951c8
  Torkel Ödegaard committed Aug 15, 2016
  
  d8d951c8 Browse Files
- feat(query_part): refactoring query part · 1418cbbd
  Torkel Ödegaard committed Aug 15, 2016
  
  1418cbbd Browse Files
- feat(alerting): doing schema changes · 0392fde3
  Torkel Ödegaard committed Aug 15, 2016
  
  0392fde3 Browse Files
- tech(circle): rearrange build order · 31952098
  bergquist committed Aug 15, 2016
  
  31952098 Browse Files
- feat(query parts): refactoring query part component to support actions · befca9bb
  Torkel Ödegaard committed Aug 15, 2016
  
  befca9bb Browse Files
- feat(metrics): improve graphite settings · f7a91025
```
Fixes the broken support for overriding settings with ENV variables.
closes #5769
```
  bergquist committed Aug 15, 2016
  f7a91025 Browse Files
- fix(metrics): add ending dot for graphite prefix · cf6736d4
  bergquist committed Aug 15, 2016
  
  cf6736d4 Browse Files
- fix(metrics): hide none existing metrics settings · 41790c67
  bergquist committed Aug 15, 2016
  
  41790c67 Browse Files
- fix(metrics): make metrics cfg backwards compatible · ebecc5e5
  bergquist committed Aug 15, 2016
  
  ebecc5e5 Browse Files
- feat(metrics): minor fix for internal metrics fix PR #5758 · 2c1b893c
  Torkel Ödegaard committed Aug 15, 2016
  
  2c1b893c Browse Files
- fix(metrics): replaces . with _ in instance name · 0524d0c6
```
closes #5739
```
  bergquist committed Aug 15, 2016
  0524d0c6 Browse Files
- feat(cli): add default plugin folder for MAC OS · 2b2e015d
```
closes #5806
```
  bergquist committed Aug 15, 2016
  2b2e015d Browse Files
- Update CHANGELOG.md · cd9bd5be
  Torkel Ödegaard committed Aug 15, 2016
  
  cd9bd5be Browse Files