Torkel Ödegaard
e916f93787
feat(mixed datasource): fixed failing unit tests
2015-08-16 10:06:36 +02:00
Torkel Ödegaard
1332ddbc93
feat(mixed datasources): updated OpenTSDB data source query editor to new model, #436
2015-08-16 09:52:45 +02:00
Torkel Ödegaard
b30dfcf28a
feat(datasource): added new mixed data source
2015-08-16 01:34:09 +02:00
Torkel Ödegaard
b9cfade18c
feat(mutli db query): major changes to query editor and data source handling, looks promising
2015-08-15 23:11:37 +02:00
Torkel Ödegaard
ad1fa110ff
change(search): opening search dropdown should not take you out of fullscreen view or edit
2015-08-15 21:57:41 +02:00
Torkel Ödegaard
ed49962120
refactor(): began work on big design change for how data source query editors are loaded
2015-08-15 21:49:30 +02:00
Matt Toback
0651f134e4
Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go.
2015-08-14 15:21:51 -04:00
Torkel Ödegaard
16fa5c4df3
fix(mysql): fix for migration in newly added temp_user table, fixes #2509
2015-08-14 09:41:07 +02:00
Torkel Ödegaard
2f849be9d8
docs(): minor tweaks to new tutorial
2015-08-14 09:41:07 +02:00
Torkel Ödegaard
6c49ab932e
Merge pull request #2511 from pivotal-cloudops/patch
...
fix test connection bug
2015-08-14 09:23:14 +02:00
Pivotal
dc9c2773cb
fix test connection bug
2015-08-14 13:50:01 +08:00
Matt Toback
60eec49e95
Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner
2015-08-13 17:57:58 -04:00
Torkel Ödegaard
f784551e20
docs(): Began work on stack install and config tutorial
2015-08-13 08:52:50 +02:00
Torkel Ödegaard
a3d9169930
docs(): minor update
2015-08-13 08:00:27 +02:00
Torkel Ödegaard
e87502285b
Merge pull request #2502 from mtanda/stack_override_tooltip
...
don't calculate cumulative value if series overrides stack to false
2015-08-13 07:44:27 +02:00
Mitsuhiro Tanda
caccacf52b
don't calculate cumulative value if series overrides stack to false
2015-08-13 13:40:16 +09:00
Torkel Ödegaard
5aee981590
Merge branch 'master' of https://github.com/mattttt/grafana
...
Conflicts:
docs/sources/installation/debian.md
docs/sources/installation/ldap.md
2015-08-12 16:30:48 +02:00
Torkel Ödegaard
e6d09b3266
fix(db): remove stars and tags when removing user or dashboard, fixes #2016
2015-08-12 09:23:46 +02:00
Torkel Ödegaard
8fcaa4997d
feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457
2015-08-12 08:59:39 +02:00
Torkel Ödegaard
7370af9a82
Merge pull request #2492 from agilgur5/master
...
docs(ldap): Clarify LDAP features and sample config
2015-08-12 08:20:00 +02:00
Anton Gilgur
e4baef94bc
docs(ldap): Clarify LDAP features and sample config
...
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
2015-08-11 19:57:53 -07:00
Trent White
8c05f9cf3e
Merge pull request #11 from mattttt/trent-update
...
add text panel page
2015-08-11 16:52:15 -04:00
Trent White
ebcab0f26e
add text panel page
2015-08-11 16:50:33 -04:00
Matt
14996bd08b
Update templating.md
2015-08-11 15:57:36 -04:00
Matt
dd9fb9d526
Update templating.md
2015-08-11 15:56:18 -04:00
Matt
f3ffed673b
Merge pull request #10 from mattttt/build-patch-1
...
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:47:38 -04:00
Matt Toback
5b342dd229
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:41:12 -04:00
Trent White
e626bbf415
Merge pull request #9 from mattttt/trent-update
...
formatting tweak, added datasource overview blurb.
2015-08-11 15:31:03 -04:00
Trent White
04795709a3
formatting tweak, added datasource overview blurb.
2015-08-11 15:30:13 -04:00
Torkel Ödegaard
745162c589
fix(graphite): Import dashboard from graphite is working again, fixes #2490
2015-08-11 21:20:20 +02:00
Torkel Ödegaard
089508db8e
fix(influxdb 0.9): removed function from function dropdown as this function does not exist in InfluxDB 0.9
2015-08-11 21:10:15 +02:00
Matt
a912323d01
Merge pull request #8 from mattttt/ct-additions
...
Added patch from ct
2015-08-11 14:59:59 -04:00
Matt Toback
511a592ec8
Added patch from ct
2015-08-11 14:58:30 -04:00
Matt
d132d3abfd
Merge pull request #7 from mattttt/mattttt-docs
...
Mattttt docs
2015-08-11 14:41:21 -04:00
Trent White
fb9b5e4274
Merge pull request #6 from mattttt/trent-docs-update
...
openTSDB image was broken
2015-08-11 14:32:03 -04:00
Trent White
8dcc5645db
openTSDB image was broken
2015-08-11 14:26:32 -04:00
raj dutt
c6798892b8
Update screencasts.md
...
tweaks
2015-08-11 14:26:04 -04:00
Matt Toback
eea5b026ce
Sanity checked and verified for merge
2015-08-11 14:17:56 -04:00
raj dutt
331e858ed3
Update gettingstarted.md
2015-08-11 14:04:14 -04:00
Trent White
3d602a2558
Merge remote-tracking branch 'origin/master'
2015-08-11 14:01:03 -04:00
Trent White
14386a2f62
Merge branch 'trent-docs'
...
Conflicts:
docs/sources/reference/templating.md
2015-08-11 13:59:46 -04:00
raj dutt
4e91e05470
Update gettingstarted.md
2015-08-11 13:58:44 -04:00
Trent White
ea0bec8bf2
update content on annotations
2015-08-11 13:51:27 -04:00
raj dutt
c2e8a1d733
Update singlestat.md
2015-08-11 13:49:24 -04:00
raj dutt
c6155723a1
Update playlist.md
2015-08-11 13:43:36 -04:00
Trent White
8c64afc81e
update to templating doc
2015-08-11 13:42:40 -04:00
raj dutt
eafd1d8c53
Update templating.md
2015-08-11 13:33:01 -04:00
raj dutt
df0673f907
Update templating.md
2015-08-11 13:31:49 -04:00
Torkel Ödegaard
fe093c6385
feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186
2015-08-11 19:16:45 +02:00
raj dutt
ed536f18ee
Update basic_concepts.md
2015-08-11 13:07:30 -04:00
