Torkel Ödegaard
b25b31e4a0
Merge branch 'master' into develop
2015-11-09 11:25:22 +01:00
Torkel Ödegaard
88d27fe649
log(color): disabled console log formating by default
2015-11-09 09:48:02 +01:00
Torkel Ödegaard
8f81c97aaa
Merge pull request #3170 from utkarshcmu/opentsdb-ctrl
...
Fixed opentsdb queryctrl uncheck Rate UI bug
2015-11-09 09:43:25 +01:00
Torkel Ödegaard
b5f35261a0
Merge pull request #3171 from utkarshcmu/aws-regions
...
Added missing AWS Regions
2015-11-09 09:41:57 +01:00
utkarshcmu
f55e24cd12
Added missing AWS Regions
2015-11-09 00:28:16 -08:00
utkarshcmu
efc0b60d41
Fixed opentsdb queryctrl uncheck Rate UI bug
2015-11-08 21:44:58 -08:00
Torkel Ödegaard
56e2082205
Merge pull request #3157 from utkarshcmu/postgres
...
Fixed user deletion in Postgres SQL
2015-11-07 15:37:28 +01:00
utkarshcmu
fe2d8f1ea0
Used dialect for postgres
2015-11-07 05:21:22 -08:00
utkarshcmu
2676f24e0a
Fixed user deletion in Postgres SQL
2015-11-06 20:17:27 -08:00
Torkel Ödegaard
d7ee7cb88f
Merge pull request #3119 from utkarshcmu/docs
...
Dashboard JSON Docs
2015-11-03 13:33:15 +01:00
Utkarsh Bhatnagar
74b10a42ee
Fixed broken links in the doc page
2015-11-02 10:29:42 -08:00
Utkarsh Bhatnagar
f14ef22bb6
Fixed doc links
2015-11-02 10:25:33 -08:00
Utkarsh Bhatnagar
e8c9b0806a
Added templating, timepicker, panel docs
2015-11-02 10:15:40 -08:00
Torkel Ödegaard
e51d403420
rename: moved test file
2015-11-02 15:14:35 +01:00
Utkarsh Bhatnagar
f54615ed46
Included rows JSON and TODO headers
2015-11-02 00:21:59 -08:00
utkarshcmu
4c1b6f3059
Fixed a typo
2015-11-01 23:55:03 -08:00
Utkarsh Bhatnagar
ada641090f
Explained basic JSON fields
2015-11-01 23:53:24 -08:00
Torkel Ödegaard
eb6c8a3521
Merge pull request #3118 from utkarshcmu/angular-native
...
Removed unnecessary components.
2015-11-02 08:23:02 +01:00
utkarshcmu
3a021a87a1
Added JSON of new dashboard
2015-11-01 23:17:23 -08:00
utkarshcmu
5100339604
Initialized dashboard JSON doc.
2015-11-01 22:58:14 -08:00
utkarshcmu
8448e3970b
Removed unnecessary components.
2015-11-01 09:48:27 -08:00
Torkel Ödegaard
dbed679904
Merge pull request #3116 from vitaliyf/patch-1
...
Fixed typo in OpenTSDB's "metasync" documentation
2015-11-01 14:47:28 +01:00
Vitaliy Fuks
acb5340ffb
Fixed typo in OpenTSDB's "metasync" documentation
2015-10-31 18:07:24 -04:00
Torkel Ödegaard
6a01cd56ca
Merge pull request #3085 from mtanda/cloudwatch_template_doc
...
Add templating explanation to CloudWatch docs.
2015-10-31 11:37:01 +01:00
Torkel Ödegaard
ae38705bed
Merge pull request #3112 from utkarshcmu/docs
...
Update opentsdb.md
2015-10-31 11:35:30 +01:00
Torkel Ödegaard
db083c43dd
Merge pull request #3111 from felixbuenemann/fix-npm-3-phantomjs-build-failure
...
Fix npm 3 build failure in phantomjs task
2015-10-31 11:35:17 +01:00
Utkarsh Bhatnagar
03130e1217
Update opentsdb.md
...
As we merged, changes with auto suggestions in the master branch. Update docs respectively.
2015-10-30 22:11:17 -07:00
Felix Bünemann
2ca6acc1e9
Fix npm 3 build failure in phantomjs task
...
npm v3.0+ by default dedupes node modules and stores them in a flat
tree, which means the hardcoded path to the location.js will no longer
be nested under the karma-phantomjs-launcher module.
This fixes issue #2999 .
2015-10-31 05:36:35 +01:00
Torkel Ödegaard
d8f68eb118
refactoring: moving and renaming things
2015-10-30 16:06:29 +01:00
Torkel Ödegaard
97697b93ed
refactoring: moving and renaming things
2015-10-30 15:58:20 +01:00
Torkel Ödegaard
152b484eb5
refactoring: moved app/controllers -> app/core/controllers
2015-10-30 15:16:05 +01:00
Torkel Ödegaard
97de8c1cc2
refactoring: move moving stuff around
2015-10-30 15:04:27 +01:00
Torkel Ödegaard
6cf46b1635
refactoring: more moving stuff around
2015-10-30 14:44:40 +01:00
Torkel Ödegaard
1665cb4282
refactoring: moving components -> core
2015-10-30 14:24:04 +01:00
Torkel Ödegaard
1113081aab
refactoring: moving components -> core
2015-10-30 14:19:02 +01:00
Torkel Ödegaard
39bc3cb532
refactoring: moving stuff around
2015-10-30 14:04:25 +01:00
Torkel Ödegaard
0a0a0776e4
Merge pull request #3088 from utkarshcmu/suggest-opentsdb
...
Tag suggestions fixed for v2.1.1 & above by using Suggest Api.
2015-10-30 10:34:44 +01:00
Torkel Ödegaard
59d199a148
Merge pull request #3098 from utkarshcmu/typos
...
Fixed some more typos in docs
2015-10-30 10:32:51 +01:00
utkarshcmu
8b9d13491f
Fixed some more typos in docs
2015-10-30 02:07:08 -07:00
Torkel Ödegaard
4dcd2ceb01
fix(graph): fixed for color picker layout issue when right side legend was used, fixes #3093
2015-10-30 09:31:04 +01:00
Torkel Ödegaard
6004ba6554
Merge pull request #3095 from itsmrwave/correct_object_key_typo
...
Correct object key typo
2015-10-30 09:15:27 +01:00
King'ori Maina
f1847d4501
Correct object key typo
...
Should be ‘message’ not ‘messsage’.
2015-10-30 09:52:33 +02:00
utkarshcmu
a27186e34f
Cleaned the codebase :D
2015-10-29 11:28:38 -07:00
utkarshcmu
2a8904f844
Fixed queryCtrl to use suggest API
2015-10-29 11:13:38 -07:00
Torkel Ödegaard
59fc72d37e
Merge branch 'prometheus-fix_step_calculation' of https://github.com/dan-cleinmark/grafana into dan-cleinmark-prometheus-fix_step_calculation
2015-10-29 16:50:18 +01:00
Torkel Ödegaard
34e3683ded
fix(cloudwatch): fixed limiting of cloudwatch period so it works for long time ranges in all cases, fixes #3086
2015-10-29 16:46:58 +01:00
Torkel Ödegaard
13760b1bdd
fix(influxdb): fixed handling of relative time ranges like last x years, or last x months, fixes #3067
2015-10-29 15:53:15 +01:00
Mitsuhiro Tanda
8a252774ce
Update cloudwatch.md, add explanation about templating
2015-10-29 23:51:27 +09:00
Dan Cleinmark
963f9fdf40
Ensure Promtheus step interval is always < 11000
...
Using a 2 week window (1209600 seconds) and a 60s step, Math.floor()
recalculates a step of 109 and results in 11097 data points in the
Prometheus query (> the 11000 max set by Prometheus). Math.ceil()
returns a step of 110 and 10996 data points.
2015-10-29 07:24:42 -07:00
Torkel Ödegaard
299a2457cd
Merge branch 'master' of github.com:grafana/grafana
2015-10-29 14:05:19 +01:00
