public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zobnin b97cede054 docs: update heatmap and prometheus docs, #10009 2018-03-26 17:12:25 +03:00
bergquist d6faa3d06f provisioning: improve UX when saving provisioned dashboards 2018-03-26 15:08:46 +02:00
Patrick O'Carroll ff62036f15 styled login page for ie11 2018-03-26 14:14:57 +02:00
Penghan Wang a21afbe9a6 Merge branch 'master' into feature/add_es_alerting 2018-03-26 19:51:03 +08:00
wph95 63a200686e - pipeline aggs support 
- add some test
 2018-03-26 19:48:57 +08:00
Sven Klemm 12600a0e95 support non-nested menu entries 2018-03-26 13:19:14 +02:00
bergquist b61bc72e2a provisioning: removes id from dashboard.json 
if dashboard json files contains `id` we
will just remove it form the dashboard model
before importing it into the database.

closes #11138
 2018-03-26 13:17:39 +02:00
wph95 d6cdc2497c Handle Interval Date Format similar to the JS variant 
https://github.com/grafana/grafana/pull/10343/commits/7e14e272fa37df5b4d412c16845d1e525711f726
 2018-03-26 16:13:14 +08:00
Julian Kornberger 391868c5d6 Use net.SplitHostPort to support IPv6 
- Add some tests
- Make error message more helpful
 2018-03-26 02:48:25 +02:00
Carl Bergquist a20f3d196c Merge pull request #11375 from svenklemm/graphite_docs 
doc: add missing word to graphite docs
 2018-03-25 21:20:41 +02:00
Sven Klemm f2249a5bcc add missing word to graphite docs 2018-03-25 15:49:06 +02:00
wph95 1e275d0cd1 set right series name 
Signed-off-by: wph95 <wph657856467@gmail.com>
 2018-03-25 02:18:28 +08:00
Tobias Wolf 03b2561af2 Missed the 'p d' hint in the popup-menu 2018-03-24 14:49:06 +01:00
Tobias Wolf 02f84e0c74 Add hints for the 'pd' Duplicate Panel command from PR #11264 2018-03-24 14:41:41 +01:00
ryan 71ef9b6db5 Merge remote-tracking branch 'grafana/master' into annotations-created 
* grafana/master: (26 commits)
  notes about closing #11306
  cleanup
  changelog: unix socket permissions
  Adjust permissions of unix socket
  docs: tweaks
  changelog: adds note about closing #5855
  legend: small refactoring
  Make golint happier
  mysql: skip tests by default
  mssql: update query editor help
  mysql: fix precision for the time column in table/annotation query mode
  postgres: fix precision for the time column in table/annotation query mode
  mssql: fix precision for the time column in table/annotation query mode
  mssql: remove UTC conversion in macro functions
  mssql: fix timeGroup macro so that it properly creates correct groups
  small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under
  fixed so legend right works like legend under on small screens
  Alerting: move getNewState to EvalContext
  graphite: adds more traces for alerting
  sql datasource: extract common logic for converting time column to epoch time in ms
  ...
 2018-03-24 11:39:35 +01:00
ryan eabcbcda88 remove README changes 2018-03-24 11:39:20 +01:00
wph95 bc5b59737c finished CODING PHASE 1 
Signed-off-by: wph95 <wph657856467@gmail.com>
 2018-03-24 13:06:21 +08:00
Carl Bergquist 980e078222 Merge pull request #11326 from bergquist/more_traces 
dataproxy: adds dashboardid and panelid as tags
 2018-03-23 17:13:15 +01:00
wph95 8e7d23cdeb wip 
Signed-off-by: wph95 <wph657856467@gmail.com>
 2018-03-23 23:50:16 +08:00
Marcus Efraimsson da83964a7e notes about closing #11306 
[skip ci]
 2018-03-23 16:41:08 +01:00
Leonard Gram f223e99875 cleanup 2018-03-23 16:25:20 +01:00
Patrick O'Carroll bd7964d549 Merge pull request #11367 from grafana/graph_51_docs 
Update graph panel documentation
 2018-03-23 16:21:39 +01:00
Penghan Wang fa72c4fea4 Merge pull request #1 from grafana/master 
upgrade from grafana/grafana
 2018-03-23 23:18:27 +08:00
Leonard Gram 97fa5361ff changelog: unix socket permissions 2018-03-23 16:13:59 +01:00
Julian Kornberger 6f363153d7 Adjust permissions of unix socket 
fixes #8358
 2018-03-23 16:09:04 +01:00
Marcus Efraimsson 13d0bd5815 Merge branch 'docs-5.1' into graph_51_docs 2018-03-23 15:51:32 +01:00
Marcus Efraimsson 0a487c484d docs: fix typos 2018-03-23 15:49:54 +01:00
Marcus Efraimsson 403c64ab20 docs: update postgres, mysql and mssql documentation 
Due to changes closing #11306
 2018-03-23 15:48:04 +01:00
Marcus Efraimsson c318f7bb31 Merge branch 'master' into docs-5.1 2018-03-23 15:15:57 +01:00
Marcus Efraimsson 1b8103f0ea docs: update graph panel documentation 
Added new versions of images and new images to better highlight the possible
configuration options.
Documentation was very outdated so tried to fix that to better reflect the
current state/latest release.
 2018-03-23 14:43:57 +01:00
Daniel Lee e84f746d1d Merge pull request #11348 from grafana/11306-sql-table-time 
Postgres, MySQL, MSSQL minor refactoring/unification
 2018-03-23 14:23:31 +01:00
Carl Bergquist 8d7fa644de Merge pull request #11352 from digineo/golint 
Make golint happier
 2018-03-23 13:35:11 +01:00
Daniel Lee 7b141280e5 docs: tweaks 2018-03-23 13:31:02 +01:00
bergquist e2ba6fbb00 changelog: adds note about closing #5855 2018-03-23 13:20:02 +01:00
Carl Bergquist 8db09d7556 Merge pull request #11290 from Thib17/retry 
Alerting: Add retry mechanism
 2018-03-23 13:17:24 +01:00
ryan 7defb1adf5 remove dashboardId check... i can't figure out how the tests work 2018-03-23 12:54:53 +01:00
Daniel Lee 78d314a9c1 Merge pull request #11140 from grafana/11131_right_legend_responsive 
added media breakpoint to legend-right
 2018-03-23 12:49:35 +01:00
ryan e92ea79524 get circle to run tests again 2018-03-23 12:48:03 +01:00
ryan 2116152295 add dashboardId to test 2018-03-23 12:35:39 +01:00
ryan a58b4ff2d6 remove api tests 2018-03-23 12:13:38 +01:00
ryan 14b737e662 update CHANGELOG 2018-03-23 12:08:32 +01:00
ryan b39fb7fdd5 fix operator 2018-03-23 12:01:21 +01:00
ryan a0a6fa6fa5 remove constraint from sqlstore 2018-03-23 11:47:07 +01:00
ryan a5588b6957 Merge remote-tracking branch 'origin/annotations-created' into annotations-created 
* origin/annotations-created:
  dooh
 2018-03-23 11:44:21 +01:00
ryan 4ed1ec5174 Merge remote-tracking branch 'grafana/master' into annotations-created 
* grafana/master: (30 commits)
  changelog: adds note about closing #11278
  docs: spelling
  docs: add intro paragraph to provisioning page
  Cleanup CircleCI V2 Conversion
  changelog: notes for #1271 and #2740
  graph: minor fixes to y-axes alignment feature
  added save icon to save buttons
  removed trash can icon from save buttons
  Return actual user ID in UserProfileDTO
  dashboard version cleanup: more tests and refactor
  minor refactor of dashboard version cleanup
  refactor: dashboard version cleanup
  limit number of rows deleted by dashboard version cleanup
  fix dashboard version cleanup on large datasets
  Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
  Fixed unit test.
  Changed the way this feature was activated. And changed tolltip.
  Added validation of input parameters.
  Resolved conflict
  Corrected work for graphs created before this feature.
  ...
 2018-03-23 11:38:43 +01:00
ryan db92a96067 move dashboard error to API (not sql) 2018-03-23 11:36:44 +01:00
Daniel Lee 4f38d237cb legend: small refactoring 2018-03-23 11:08:24 +01:00
bergquist 09df38d9f4 changelog: adds note about closing #11278 2018-03-23 11:01:32 +01:00
Carl Bergquist f0d77804da Merge pull request #11329 from alexanderzobnin/fix-11278 
fix dashboard version cleanup on large datasets
 2018-03-23 10:53:51 +01:00
Marcus Efraimsson 1d515bb52c Merge branch 'master' into docs-5.1 2018-03-23 10:40:12 +01:00