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
bergquist 8175783f93 go fmt 2017-09-24 18:59:21 +02:00
bergquist c927209447 Merge branch 'master' of https://github.com/BrandonArp/grafana into BrandonArp-master 2017-09-24 18:56:46 +02:00
Mengyang Li a1283212ed Use B/s instead Bps for Bytes per second 
Most places are using bps and B/s for bits and bytes,
ref: https://en.wikipedia.org/wiki/Data_rate_units
Bps (Bytes per second) isn't a really common used unit the in the wild.
 2017-09-23 21:05:43 -07:00
Patrick O'Carroll 3f1452fddb new page for text, needs more work 2017-09-22 17:14:39 +02:00
Patrick O'Carroll 1258dc1cbb replaced img in graph, created alert list page 2017-09-22 16:31:34 +02:00
Torkel Ödegaard ca0085f429 docs: update docs 2017-09-22 14:05:25 +02:00
Torkel Ödegaard a98124add7 Update CHANGELOG.md 2017-09-22 13:30:23 +02:00
ryan 967efea520 fix merge issue 2017-09-22 13:28:53 +02:00
ryan b4b3008a19 Merge remote-tracking branch 'grafana/master' into influx-db-query2 
* grafana/master: (112 commits)
  changelog: adds note about closing #5873
  Docs new updates (#9324)
  Update CHANGELOG.md
  Update latest.json
  cleanup: removed unused file
  tech: remove bower and moved remaining bower dependencies to npm
  tech: cleanup and fixed build issue
  tech: upgraded angularjs and moved dependency from bower to npm, closes #9327
  follow go idiom and return error as second param
  tech: updated tsconfig
  docker: adds alertmanager to prometheus fig
  tech: more tslint rules
  tech: removing unused variables from typescript files, and making tslint rules more strict
  context is reserved for go's context
  make ds a param for Query
  remove batch abstraction
  rename executor into tsdbqueryendpoint
  remove unused structs
  refactor response flow
  tech: removed test component
  ...
 2017-09-22 13:27:24 +02:00
bergquist ae249a623d changelog: adds note about closing #5873 2017-09-22 13:17:09 +02:00
Carl Bergquist 63f78c0b59 Merge pull request #9299 from seuf/grafana-cli-plugin-url 
Added --pluginUrl option to grafana-cli for local network plugin inst…
 2017-09-22 13:13:17 +02:00
Carl Bergquist 632ae0986c Merge pull request #9320 from xiahuibing/patch-1 
Update _navbar.scss
 2017-09-22 13:06:11 +02:00
Patrick O'Carroll 31243e7132 replaced image 2017-09-22 12:53:37 +02:00
Patrick O'Carroll 367acc37c7 Docs new updates (#9324) 
* replaced images, updating text(not finished)

* text uppdates for dashlist and singlestat(+img). updated the keyboard shortcuts

* deleted old shortcuts instruction

* another img update
 2017-09-22 10:49:47 +02:00
Torkel Ödegaard e695ce4aa5 Update CHANGELOG.md 2017-09-22 10:33:03 +02:00
Torkel Ödegaard dd0f4460cb Update latest.json 2017-09-22 10:08:56 +02:00
Torkel Ödegaard f22d1af9e0 cleanup: removed unused file 2017-09-22 10:07:22 +02:00
Torkel Ödegaard c0c86c1138 tech: remove bower and moved remaining bower dependencies to npm 2017-09-22 09:47:25 +02:00
Torkel Ödegaard 18337f610d Merge branch 'master' into develop 2017-09-22 08:42:07 +02:00
Torkel Ödegaard 6aad2a5b2d tech: cleanup and fixed build issue 2017-09-21 21:12:49 +02:00
Torkel Ödegaard f0e0e61809 tech: upgraded angularjs and moved dependency from bower to npm, closes #9327 2017-09-21 20:58:32 +02:00
bergquist ed661767f8 follow go idiom and return error as second param 2017-09-21 18:04:16 +02:00
Torkel Ödegaard 79b873e40e Merge branch 'stricter-ts-lint-rules' 2017-09-21 17:34:47 +02:00
Torkel Ödegaard 8fe21b43e9 tech: updated tsconfig 2017-09-21 17:34:22 +02:00
Daniel Lee 53d862143b docker: adds alertmanager to prometheus fig 
with an alert rule that will always fire
 2017-09-21 17:28:31 +02:00
Torkel Ödegaard 491fa6cad8 tech: more tslint rules 2017-09-21 17:23:31 +02:00
Patrick O'Carroll bf88242282 another img update 2017-09-21 16:58:25 +02:00
Torkel Ödegaard b8d9722b4f tech: removing unused variables from typescript files, and making tslint rules more strict 2017-09-21 16:40:18 +02:00
Patrick O'Carroll f6aefbd361 deleted old shortcuts instruction 2017-09-21 16:18:24 +02:00
Patrick O'Carroll fe05a996b7 text uppdates for dashlist and singlestat(+img). updated the keyboard shortcuts 2017-09-21 15:58:19 +02:00
bergquist a45e2ec9c3 context is reserved for go's context 2017-09-21 15:23:34 +02:00
bergquist 16b5b9f6be make ds a param for Query 2017-09-21 15:09:14 +02:00
bergquist c0260fd913 remove batch abstraction 2017-09-21 15:02:17 +02:00
bergquist 7f9f388293 rename executor into tsdbqueryendpoint 2017-09-21 15:02:17 +02:00
bergquist 0229d28d64 remove unused structs 2017-09-21 15:02:17 +02:00
bergquist 55f1b36e31 refactor response flow 2017-09-21 15:02:17 +02:00
Torkel Ödegaard adda84d124 tech: removed test component 2017-09-21 14:05:24 +02:00
Torkel Ödegaard 837beda155 Merge branch 'react-poc' 2017-09-21 13:59:26 +02:00
Torkel Ödegaard 9500eb8aaa ux: minor singlestat update 2017-09-21 13:59:21 +02:00
Torkel Ödegaard 1887c4f279 singlestat: minor change 2017-09-21 13:59:21 +02:00
Torkel Ödegaard 01fc37571e Update CHANGELOG.md 2017-09-21 13:58:48 +02:00
Patrick O'Carroll de17dcf3b0 Singlestat time (#9298) 
* Added a timestamp option to single stat

* can now choose last time as value

* Finished last_time so it formats correctly, updated value stat

* fixed som issues, but still issue with testing

* Clean up after fake clock in test

* timezone-issue fix, fake time for from now test

* fix for timedifference
 2017-09-21 13:34:51 +02:00
Torkel Ödegaard fed35909cc tech: progress on react poc 2017-09-21 13:32:57 +02:00
bergquist f1036a9382 adds note about closing #9213 2017-09-21 10:46:59 +02:00
Carl Bergquist 0db678e18f Merge pull request #9213 from grafana/dist_tracing 
Add support for distributed tracing with Jaeger
 2017-09-21 10:42:25 +02:00
xiahuibing 416510773b Update _navbar.scss 
line66 and line118 :  "min-height:: $navbarHeight;" has double “:”
 2017-09-21 16:40:49 +08:00
Patrick O'Carroll ece6588c03 replaced images, updating text(not finished) 2017-09-21 09:40:58 +02:00
Gordon McGuire 5e013f82b4 fix: close for 'Unsaved Changes' modal, #9284 (#9313) 
Missing reference to the controller instance.
 2017-09-21 09:05:59 +02:00
Alexander Zobnin f8b8907cc4 Initial graphite tags support (#9239) 
* graphite: initial seriesByTag() support

* graphite: groupByTags() function

* graphite: aliasByTags() function

* graphite: fix optional params update, issue #9238

* graphite: fix tag-related functions version

* graphite: add 1.1.x version to config

* graphite: fix seriesByTag() series parsing
 2017-09-21 08:22:56 +02:00
Torkel Ödegaard 84b1519480 tech: initial react poc 2017-09-20 17:44:23 +02:00