Torkel Ödegaard
4f7587492d
docs(changelog): fixed minor wording issue in changelog
2015-08-18 08:24:08 +02:00
Torkel Ödegaard
9a9c9b2b12
Merge branch 'query-editor-breakout'
...
Conflicts:
CHANGELOG.md
2015-08-18 08:23:13 +02:00
Torkel Ödegaard
d4432ddd64
feat(mixed datasources): feature ready to merge to master, closes #436
2015-08-18 08:22:00 +02:00
Torkel Ödegaard
5c2d49f7ce
feat(mixed datasource): updated Elasticsearch so it uses new way to define annotations editor
2015-08-18 07:58:44 +02:00
Michaël Lhomme
0dc263d919
Disable load timeout in requirejs
2015-08-17 21:41:04 +02:00
Torkel Ödegaard
3de041a411
feat(mixed datasource): added datasource name to left of query hamburger #436
2015-08-17 21:25:08 +02:00
Torkel Ödegaard
00f5f8b2a0
feat(mixed datasource): polishing feature, making sure everything works, #436
2015-08-17 21:20:09 +02:00
Torkel Ödegaard
95f1343a59
feat(mixed datasource): fixing varios issues with the query editor changes, updated kariosdb data source editor to work with the new model, #436
2015-08-17 20:53:40 +02:00
Torkel Ödegaard
b4115b0362
feat(query editor): updated influxdb 0.8.x data source query editors to new abstraction
2015-08-17 17:28:03 +02:00
Torkel Ödegaard
6ee0f2c6a7
feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436
2015-08-17 17:07:33 +02:00
Torkel Ödegaard
af39e4de3e
Merge branch 'v2.1.x'
...
Conflicts:
CHANGELOG.md
2015-08-17 15:02:47 +02:00
Torkel Ödegaard
0d8303cf5d
fix(templating): fix for setting template variable value via url and having repeated panels or rows, fixes #2534
2015-08-17 15:01:16 +02:00
Torkel Ödegaard
4a6b5274bc
feat(invite): fixes for org invite enhancement story, #2353
2015-08-17 10:55:52 +02:00
Torkel Ödegaard
f7ea420a3f
Merge pull request #2521 from mattttt/email-tweaks
...
Email tweaks
2015-08-17 10:33:06 +02:00
Torkel Ödegaard
56d5b0b12a
feat(mixed datasource): minor progress
2015-08-17 10:31:54 +02:00
Torkel Ödegaard
bb81248eaa
Merge pull request #2528 from thuck/permissions
...
Fixing permission issues for new installations
2015-08-17 10:13:12 +02:00
Torkel Ödegaard
0e18eafcfb
Merge pull request #2535 from raintank/logging
...
close all existing loggers before re-initializing loggers. fixes #2533
2015-08-17 10:05:42 +02:00
woodsaj
c138f390ac
close all existing loggers before re-initilizing loggers. fixes #2533
2015-08-17 15:59:40 +08:00
Torkel Ödegaard
a16c63a43e
feat(mixed datasources): continued work on editor design change
2015-08-16 20:52:30 +02:00
Denis Doria
9e21a089d2
Fixing permission issues for new installations
...
The umask as 0027 will generates permissions like:
0640 - for files
0750 - for directories
This should solve the grafana.db being accesable by any user for new installations.
2015-08-16 18:43:27 +02:00
Torkel Ödegaard
3105215425
feat(mixed datasource): changed how query ref ids (letters) are assigned, now they are persisted
2015-08-16 11:24:32 +02:00
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
