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
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
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
Torkel Ödegaard
82feeff3aa
tech(emails): small update to grunt watch for emails
2015-08-11 16:40:23 +02:00
Torkel Ödegaard
43ef9f909a
feat(admin): admin page for all grafana organizations (list / edit view), #2457
2015-08-11 15:20:50 +02:00
Torkel Ödegaard
e01c68dcea
fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488
2015-08-11 11:26:28 +02:00
Torkel Ödegaard
234d1291f9
Merge branch 'invite'
...
Conflicts:
public/css/less/gfbox.less
public/emails/reset_password.html
public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
Torkel Ödegaard
90169d6a05
Bumped master version to 2.2.0-pre1
2015-08-11 11:18:39 +02:00
Torkel Ödegaard
809562c874
updated install docs for 2.1.1 release
2015-08-11 11:12:06 +02:00
Torkel Ödegaard
be7a3a0940
pumped version to 2.1.1
2015-08-11 10:48:19 +02:00
Torkel Ödegaard
1ea0b5371a
feat(invite): new user invites are now also added to correct org after sign up is completed, #2353
2015-08-11 10:45:03 +02:00
Torkel Ödegaard
74932e6311
feat(invite): added specific email for invites to existing grafana users
2015-08-11 10:35:10 +02:00
Torkel Ödegaard
b0b96aa410
Moved reset password and welcome on sign up email to new email build template system
2015-08-11 10:01:52 +02:00
Torkel Ödegaard
4439545428
feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353
2015-08-10 21:24:47 +02:00
Torkel Ödegaard
835fd383ad
fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896
2015-08-10 20:25:01 +02:00
Torkel Ödegaard
dfd1bff389
feat(invite): began work on email template build system, and css inlining
2015-08-10 17:50:02 +02:00
Torkel Ödegaard
e53c1e39d3
feat(invite): can now add org user with sername again, #2353
2015-08-10 14:03:08 +02:00
Torkel Ödegaard
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +02:00
Torkel Ödegaard
4f3a3329e2
added postgres test docker fig block
2015-08-10 12:56:11 +02:00
Torkel Ödegaard
19f64bc561
fix(data source proxy): clear proxies request from cookies, fixes #2470
2015-08-10 12:11:18 +02:00
Torkel Ödegaard
1b2c1270a8
updated changelog with info about merged PR #2483
2015-08-10 09:14:45 +02:00
Torkel Ödegaard
4b849243ce
Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns
2015-08-10 09:11:19 +02:00
Torkel Ödegaard
e7fc72067a
refactor(influxdb): refactoring of PR 2477, added unit tests, #2477
2015-08-10 09:09:39 +02:00
Torkel Ödegaard
ca6476a57f
Merge branch 'influxdb_operators' of https://github.com/thuck/grafana into thuck-influxdb_operators
2015-08-10 08:45:16 +02:00
Denis Doria
696f8451cf
Update documentation with $col alias
2015-08-10 08:12:12 +02:00
Torkel Ödegaard
fb9f954882
fix(graphite): Fix for bug when using series ref (#A-Z) and referenced series is hidden in query editor. fixes #2484
2015-08-10 07:59:27 +02:00
Denis Doria
a4af30675d
Included $col as an option for the "Alias pattern" on influxdb
...
With this patch it's possible to use the column name as an identifier.
This can help when we have multiple columns as it would be possible to automatic generate a legend.
Also this would help in future when grafana could support the "AS" in the query builder.
2015-08-10 00:22:08 +02:00
Torkel Ödegaard
95cad91bae
Merge pull request #2482 from thuck/influxdb_fill
...
Including more special options for fill
2015-08-09 20:18:45 +02:00
Denis Doria
166a56828d
Including more special options for fill
...
Included "previous" and "none" as possible values for fill.
From the influxdb documentation:
- "previous" means the values of the previous window is used.
- "none" means that all null values are removed.
2015-08-09 19:17:01 +02:00
Torkel Ödegaard
3d197abf83
Merge pull request #2480 from swoop-inc/mb_log_file_permissions
...
Change log file permissions from 0660 to 0644
2015-08-09 12:05:40 +02:00
Denis Doria
950d4bb24e
Code style correction
2015-08-09 12:03:51 +02:00
Denis Doria
42caf02fb0
Include context for operators
...
Depending of the value a different set of operators will show up.
If regex only =~ and !~ will show up.
Any other value will show =, <>, <, >.
2015-08-09 11:58:08 +02:00
Mark Bell
e59ea1aa02
Change log file permissions from 0660 to 0644
2015-08-08 23:06:30 -04:00
Denis Doria
4bd83443f8
Fixing issue for missing tag.operator
...
This should fix the case from when we migrate from a version that doesn't contain tag.operator.
2015-08-08 17:00:10 +02:00
Denis Doria
5a906e0f3e
Fix small corner case
2015-08-08 14:40:55 +02:00
Denis Doria
a51d900da0
Fix code style and included missed semicolon
2015-08-08 13:54:01 +02:00
Denis Doria
9a9902cea9
Includes more comparators/operators for influxdb
...
This patch includes some missing comparators/operators for influxdb:
> - greater than
< - less than
<> - not equal
!~ - doesn't match against
It includes the tag.operator fields to facilitate identification of the operators on the segments.
It keeps the logic for the regex syntax; although it changes the way to validate it, to handle the new operators use case.
2015-08-08 13:31:37 +02:00
Torkel Ödegaard
81790aed13
tech(lib upgrade): updated angularjs to 1.4.3
2015-08-08 12:31:37 +02:00
Torkel Ödegaard
1f7ac11baa
feat(ldap): added support for compound search filter expressions, closes #2472
2015-08-08 10:00:49 +02:00
Torkel Ödegaard
0ed4744a33
influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455
2015-08-07 11:02:32 +02:00
Torkel Ödegaard
776ca86a60
Merge pull request #2458 from thuck/influxdb_non_negative_derivative
...
Including non_negative_derivative function on influxdb
2015-08-07 10:20:25 +02:00
Torkel Ödegaard
90400bf5ad
fix(ldap): fix for ldap users with empty email address, fixes #2461
2015-08-07 10:14:36 +02:00
Torkel Ödegaard
c43f2bbb86
fix(singlestat): fix to handle series with no data points, fixes #2460
2015-08-07 10:03:21 +02:00
Denis Doria
f3fc128ec3
Including non_negative_derivative function on influxdb
...
Since version 0.9.0 of influxdb the non_negative_derivative function
is merged, this small patch includes it as an option on grafana.
2015-08-06 10:23:52 +02:00
Torkel Ödegaard
862e52a830
Merge pull request #2453 from blt04/read-only-default-role
...
Allow default org role to be Read Only Editor
2015-08-06 06:59:17 +02:00
Brandon Turner
1e2e65b40d
Allow default org role to be Read Only Editor
2015-08-05 23:04:47 -05:00
Torkel Ödegaard
41e13fab55
fix(influxdb): fix for using template variables in side alias field in influxdb 0.9 editor, fixes #2446
2015-08-05 18:42:03 +02:00
Torkel Ödegaard
f62d743407
fix(ldap): another fix for ldap and empty bindDN and bind password, #2339
2015-08-05 16:34:39 +02:00
