 Torkel Ödegaard
|
a2bf3e056d
Merge branch 'prometheus'
|
10 years ago |
|
Torkel Ödegaard
|
318af9b418
small docs structure change, moved build from source into install section and CLA into project, and about into project
|
10 years ago |
|
Torkel Ödegaard
|
0bcda4a2eb
minor elasticsearch fix
|
10 years ago |
|
Torkel Ödegaard
|
bddcc6491a
Merge pull request #2870 from ctdk/strip-format
|
10 years ago |
 ctdk
|
d37e18fdcf
Add config option to strip (most) colors from console logs
|
10 years ago |
|
Torkel Ödegaard
|
7dc923a292
fix(timepicker): fixed displaying of customk time ranges, #2861
|
10 years ago |
|
Torkel Ödegaard
|
f0f791d226
Merge pull request #2859 from tmonk42/graphite_multiplySeries
|
10 years ago |
 Haneysmith, Nathan
|
7ca261e33e
add graphite multiplySeries function
|
10 years ago |
|
Torkel Ödegaard
|
42e7a70d99
Merge pull request #2845 from sbouchex/master
|
10 years ago |
|
Torkel Ödegaard
|
ee85eb2779
Updated prometheus config
|
10 years ago |
 sbouchex
|
6c1adf9187
Missing carriage return when displaying usage
|
10 years ago |
|
Torkel Ödegaard
|
81a660eae4
fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows
|
10 years ago |
|
Torkel Ödegaard
|
8b029388a5
Merge branch 'phantomjs' of https://github.com/fg2it/grafana into fg2it-phantomjs
|
10 years ago |
|
Torkel Ödegaard
|
c816ed2527
feat(usage stats): added data source count stats
|
10 years ago |
|
Torkel Ödegaard
|
866ea7f942
added prometheus docker block
|
10 years ago |
|
Torkel Ödegaard
|
d9d3da4def
Merge branch 'prometheus-datasource' of https://github.com/jimmidyson/grafana into prometheus
|
10 years ago |
 Jimmi Dyson
|
bf98cfeadc
Add prometheus datasource
|
10 years ago |
|
Torkel Ödegaard
|
8a39b32b5c
refactor: moved elasticsearch specs to plugin folder and to typescript
|
10 years ago |
|
Torkel Ödegaard
|
7d2646f60a
refactor: moved influxdb specs to plugins folder
|
10 years ago |
|
Torkel Ödegaard
|
1a8bc1dd60
fix(dashbard save as): fixed wonky behavior in save as modal, cursor to the end randomly, fixes #2837
|
10 years ago |
|
Torkel Ödegaard
|
7e434fc019
refactor: moved graphite specs into plugins directory
|
10 years ago |
|
Torkel Ödegaard
|
cb7424ce5e
fix(playlist ui): minor polish / fix to playlist ui, fixes #2831, other minor css / markup fixes
|
10 years ago |
|
Torkel Ödegaard
|
a567939f78
fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828
|
10 years ago |
|
Torkel Ödegaard
|
b80dc92ca5
Merge branch 'master' of github.com:grafana/grafana
|
10 years ago |
|
Torkel Ödegaard
|
57dee76c88
feat(elasticsearch): templating terms query should have size set to zero to return all terms, fixes #2827
|
10 years ago |
 fg2it
|
2513639499
fix for relative path
|
10 years ago |
|
Torkel Ödegaard
|
38bf07f4da
Merge pull request #2817 from utkarshcmu/axes
|
10 years ago |
|
fg2it
|
189796891e
adding phantomjs task to default and build
|
10 years ago |
|
fg2it
|
8134905a86
new grunt task for setting phantomjs binary
|
10 years ago |
|
fg2it
|
45fb760a35
removing default phantomjs binary
|
10 years ago |
