IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,871 Commits 5,462 Branches 554 Tags 1.9 GiB
feb222f633
Commit Graph

13871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dobrosław Żybort
5a368f99ec
Fix urls in plugin update_checker logs 2018-03-12 14:38:37 +01:00
bergquist
1a781fcee1 changelog: adds note about closing #10029 
[ci skip]
 2018-03-12 14:26:28 +01:00
Carl Bergquist
e94d23e5ff
Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter 
Cloudwatch dimension_values add dimension filter.
 2018-03-12 14:24:26 +01:00
Marcus Efraimsson
34d9983da2 docs: add team api link from http api reference page 2018-03-12 13:57:32 +01:00
Carl Bergquist
74602b1077
Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +01:00
bergquist
4362a73dd2 changelog: adds note about closing #9859 2018-03-12 09:23:59 +01:00
Carl Bergquist
4edc49bfab
Merge pull request #9859 from mtanda/prometheus_post 
(prometheus) support POST for query and query_range
 2018-03-12 09:21:45 +01:00
ilgizar
8152b9d6fe Refactoring 2018-03-12 10:54:03 +05:00
Mitsuhiro Tanda
4e1501b172 set default value of httpMethod 2018-03-12 13:53:05 +09:00
Mitsuhiro Tanda
a83ede0193 support POST for query and query_range 2018-03-12 13:25:05 +09:00
Jiri Tyr
6bfed903c4 Adding Timeticks unit 2018-03-09 17:20:24 +00:00
Marcus Efraimsson
f1fc1672be docs: minor fix for dashboard http api documentation 
Reported in #11176
 2018-03-09 10:39:50 -05:00
Leonard Gram
d3f54f941d build: cleanup 2018-03-09 12:19:52 +01:00
Leonard Gram
f72eea186d build: removes custom work dir in deploy. 2018-03-09 11:55:56 +01:00
Leonard Gram
49de4ed28b
build: upgrades build pipeline from CircleCI 1.0 -> 2.0 (#11162) 
build: upgrades build pipeline from CircleCI 1.0 -> 2.0
 2018-03-09 11:27:00 +01:00
bergquist
77cd7f34c7 github: test new issue tempalte 
My hope is that headers will make it easier to read
when people post issues.
 2018-03-09 09:33:28 +01:00
bergquist
e5b9219f13 dev: update dev prometheus2 to 2.2.0 2018-03-08 23:01:03 +01:00
bergquist
64aedbf492 Merge branch 'mayli-master' 
* mayli-master:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:51:45 +01:00
bergquist
0ee6a5216b Merge branch 'master' of https://github.com/mayli/grafana into mayli-master 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:50:02 +01:00
bergquist
c80d346417 changelog: adds note about closing #10925 2018-03-08 18:12:15 +01:00
bergquist
ad15c5405d Merge branch 'master' of github.com:grafana/grafana 
* 'master' of github.com:grafana/grafana: (24 commits)
  docs: update latest to 5.0.1
  push 5.0.1 to package cloud
  changelog: adds release date for 5.0.1
  bump master build to 5.1.0-pre1
  move quota to dedicated service
  rename Context to ReqContext
  changelog: note about closing #11145 and #11127
  docs: adds note about closing #10632
  removes commented code
  removes unused variables
  upgrade to go 1.10
  alerting: fixes validation error when saving alerts in dash
  add csv templating format
  docs: note about closing #11046
  docs: adds note about #10942
  Documentation: path "~/go" to "$GOPATH"
  Update ROADMAP.md
  move Context and session out of middleware
  only use jwt token if it contains an email address
  hide row actions for viewers
  ...
 2018-03-08 18:09:15 +01:00
Carl Bergquist
a589f701ad
Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
bergquist
71df2760a1 Merge branch 'cw_high_resolution' of https://github.com/mtanda/grafana 
* 'cw_high_resolution' of https://github.com/mtanda/grafana:
  fix, set default highResolution setting
  support cloudwatch high resolution query
 2018-03-08 18:02:35 +01:00
Carl Bergquist
5153d8e535
Merge pull request #11161 from DanCech/quota-refactor 
move quota to dedicated service
 2018-03-08 15:21:16 +01:00
bergquist
e11437ff56 docs: update latest to 5.0.1 2018-03-08 11:06:21 +01:00
bergquist
d539905517 push 5.0.1 to package cloud 2018-03-08 10:59:57 +01:00
bergquist
d1f5f209c5 changelog: adds release date for 5.0.1 2018-03-08 10:43:40 +01:00
Daniel Lee
8563c12548
Merge pull request #11157 from chaintng/fix-query-condition 
fix query condition docs
 2018-03-08 10:40:35 +01:00
Carl Bergquist
87db2d1183
Merge pull request #11130 from DanCech/context-refactor 
move Context and session out of middleware
 2018-03-08 10:21:34 +01:00
bergquist
7784e8a829 bump master build to 5.1.0-pre1 2018-03-08 09:51:25 +01:00
Dan Cech
bbd6adabbf
move quota to dedicated service 2018-03-07 17:19:35 -05:00
Alexander Zobnin
425d2cfd3a docker: add prometheus/example-golang-random to docker-compose blocks 2018-03-07 21:20:22 +03:00
Carl Bergquist
e3b86637f9
Merge pull request #11146 from grafana/go1.10 
Upgrade golang to 1.10
 2018-03-07 18:00:37 +01:00
Dan Cech
c0ecdee375
rename Context to ReqContext 2018-03-07 11:54:50 -05:00
Carl Bergquist
687179809e
Merge pull request #11139 from jonyrock/patch-1 
Documentation fix: "~/go" to "$GOPATH"
 2018-03-07 17:51:21 +01:00
Mitsuhiro Tanda
eecbdc89eb fix, set default highResolution setting 2018-03-08 01:18:11 +09:00
bergquist
e9c64a6631 changelog: note about closing #11145 and #11127 2018-03-07 17:18:03 +01:00
Carl Bergquist
d220516664
Merge pull request #11145 from grafana/alerting-invalid-data 
alerting: fixes validation error when saving alerts in dash
 2018-03-07 17:06:19 +01:00
Carl Bergquist
d07aff8991
Merge pull request #11127 from DanCech/oauth-jwt-email 
only use jwt token if it contains an email address
 2018-03-07 17:01:12 +01:00
bergquist
d9308a0325 docs: adds note about closing #10632 2018-03-07 16:58:27 +01:00
Carl Bergquist
b1494637d1
Merge pull request #11141 from mtanda/templating_comma_join 
add comma templating format
 2018-03-07 16:49:19 +01:00
bergquist
cb223ee563 removes commented code 2018-03-07 16:40:24 +01:00
bergquist
ff6108051d removes unused variables 2018-03-07 16:40:24 +01:00
bergquist
8ed12aa298 upgrade to go 1.10 2018-03-07 16:40:24 +01:00
Daniel Lee
d96fbb486f alerting: fixes validation error when saving alerts in dash 
If a panelId in the dashboard json is set to zero then the validation
silently fails. Instead of returning an error, it just ignores alerts and
saves the dashboard.
 2018-03-07 16:20:05 +01:00
Mitsuhiro Tanda
244cbe8cbd add csv templating format 2018-03-08 00:13:58 +09:00
bergquist
1dd9ee7d3d docs: note about closing #11046 2018-03-07 15:50:13 +01:00
Carl Bergquist
c39e68de24
Merge pull request #11046 from llamashoes/master 
Add metrics that triggered alert to description in OpsGenie.
 2018-03-07 15:48:30 +01:00
bergquist
9d74e1c35b docs: adds note about #10942 2018-03-07 15:43:04 +01:00
Carl Bergquist
3f6e525755
Merge pull request #10942 from grafana/pausing_alerts_updates_timestamp 
Pausing/un alerts now updates new_state_date
 2018-03-07 15:40:12 +01:00