public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard c5e6344a2c fixes 2017-09-28 11:05:14 +02:00
Torkel Ödegaard 5849fbf04e Merge branch 'master' of github.com:grafana/grafana into develop 2017-09-28 10:37:57 +02:00
Torkel Ödegaard 487c475a1e tech: systemjs upgrade 2017-09-28 10:37:33 +02:00
Patrick O'Carroll 0a65100eaf made a text-panel page, maybe we don't need it 2017-09-28 10:05:28 +02:00
Patrick O'Carroll 0d5540ca09 cleaned up html/sass and added final touches 2017-09-28 09:41:33 +02:00
Ivan Babrou 9a4ae30227 Enable dualstack in every net.Dialer, fixes #9364 
Default transport enables it:

* https://github.com/golang/go/blob/d2826d3e06/src/net/http/transport.go#L42-L46

```
    DialContext: (&net.Dialer{
	Timeout:   30 * time.Second,
	KeepAlive: 30 * time.Second,
	DualStack: true,
    }).DialContext,
```

See also: https://github.com/golang/go/issues/15324
 2017-09-27 22:29:48 -07:00
bergquist 2ec7bbb2bd jaeger: capitalize tracer name 2017-09-27 16:38:00 +02:00
bergquist 2ae74bf13d jaeger: logging improvement 2017-09-27 16:36:42 +02:00
Torkel Ödegaard 9ee343f33d tech: systemjs upgrade 2017-09-27 15:42:06 +02:00
Alin Sinpalean bb8849785a Have include intervalFactor in its calculation, so always equal to the step query parameter. 2017-09-27 14:20:51 +02:00
Alin Sinpalean 25a6ed8718 Merge remote-tracking branch 'upstream/master' into adjust_interval_variable_with_min_step 2017-09-27 11:37:14 +02:00
Alin Sinpalean 1543dc4234 Merge remote-tracking branch 'upstream/master' 2017-09-27 11:36:50 +02:00
bergquist 5373a6027c alertlist: toggle play/pause button 
closes #9355
 2017-09-27 10:49:39 +02:00
Patrick O'Carroll 8615912018 updated css and html for recent state changes for alert lists 2017-09-27 10:38:01 +02:00
chrisrd 0e5e2f3fb9 Fix export_modal message (#9353) 
Remove duplicate "to", and "others" is plural not possessive.
 2017-09-27 09:46:56 +02:00
Torkel Ödegaard eaefa3c1fa s3: minor fix for PR #9223 2017-09-27 09:43:32 +02:00
Torkel Ödegaard 50d82155ed Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master 2017-09-27 09:37:26 +02:00
Alin Sinpalean f25aeadf21 Resolve merge conflicts with remote/master. 2017-09-26 17:55:30 +02:00
Alin Sinpalean 7366d7eae0 Merge branch 'master' of git+ssh://github.com/alin-amana/grafana 2017-09-26 17:44:37 +02:00
bergquist 2ed753232f internal metrics: add grafana version 2017-09-26 15:25:44 +02:00
bergquist 0778f31828 changelog: adds note about closing 5765 2017-09-26 14:40:43 +02:00
Carl Bergquist da3aea5e0a Merge pull request #9186 from mtanda/prometehus_instant_query2 
(prometheus) instant query support
 2017-09-26 14:37:10 +02:00
Torkel Ödegaard 5b3e6e67ea Update latest.json 2017-09-26 11:58:37 +02:00
Torkel Ödegaard 7b42e13c79 typescript: stricter typescript option 2017-09-26 11:24:58 +02:00
bergquist ff108bd871 prom_docker: give targets correct job name 2017-09-25 08:55:54 +02:00
bergquist 3641e85233 testdata: add bucket scenarios for heatmap 
these scenarios makes it easier debug panels based
on the same numbers without sharing datasource

ref #9332
 2017-09-24 22:08:28 +02:00
bergquist 7eec60ec2e dev-docker: add grafana as target 2017-09-24 21:58:33 +02:00
Carl Bergquist dd7f42ba03 changelog: add note ablout closing #9319 2017-09-24 21:46:51 +02:00
Carl Bergquist 9aa4f5c42a Merge pull request #9341 from thz/smtp_ehlo_identity 
introduce smtp config option for EHLO identity
 2017-09-24 21:41:57 +02:00
Tobias Hintze af79d046db introduce smtp config option for EHLO identity 2017-09-24 20:48:20 +02:00
bergquist 3fac31e808 changelog: note about closing #9250 2017-09-24 19:02:25 +02:00
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